Add cni for dev stack

enix · Nov 28, 2023 · 846daad · 846daad
1 parent 1e3dcd4
commit 846daad
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -46,10 +46,12 @@ services:
     extends:
       file: docker-compose.yaml
       service: tests
-  terraform_apply:
+  terraform_dev:
     extends:
       file: docker-compose.yaml
       service: terraform
+    environment:
+      TF_VAR_inventory_dir: "${PWD}/tests/dev"
     command: ["apply", "-auto-approve"]
     depends_on:
       terraform:
@@ -61,7 +63,7 @@ services:
     environment:
       ANSIBLE_HOST_KEY_CHECKING: false
     depends_on:
-      terraform_apply:
+      terraform_dev:
         condition: service_completed_successfully
     entrypoint:
       - "${PWD}/scripts/detect-user.sh"
@@ -71,10 +73,11 @@ services:
         poetry install --with ansible &&
         poetry run ansible-galaxy install -r tests/ansible.requirements.yml &&
         poetry run ansible-playbook
-        -i tests/terraform/openstack/kubeadm-hosts.cfg
+        -i tests/dev/kubeadm-hosts.cfg
         tests/playbooks/prepare.yml
         playbooks/00_apiserver_proxy.yml
         playbooks/01-site.yml
+        tests/playbooks/cni.yml
         $$@
       - "--"
     command: []
diff --git a/tests/dev/.gitignore b/tests/dev/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/tests/dev/group_vars/all/main.yml b/tests/dev/group_vars/all/main.yml
@@ -0,0 +1,7 @@
+action_reasons_review_skip: true
+cluster_config:
+ networking:
+   podSubnet: 10.95.0.0/16
+ controllerManager:
+   extraArgs:
+     "allocate-node-cidrs": "true"