From cfff60ec10a6c386f38db79bb9f59a552c2b032f Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Thu, 1 Feb 2024 10:37:50 -0600 Subject: [PATCH] Bump Calico version to v3.27.0 Change-Id: I8daa54e70c66cec41733d6b9fd5c9dd4597ff9c1 --- roles/deploy-env/defaults/main.yaml | 3 ++- roles/deploy-env/tasks/common_k8s.yaml | 2 +- zuul.d/jobs.yaml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/deploy-env/defaults/main.yaml b/roles/deploy-env/defaults/main.yaml index 67107f9f1..9ff9ee10f 100644 --- a/roles/deploy-env/defaults/main.yaml +++ b/roles/deploy-env/defaults/main.yaml @@ -14,7 +14,8 @@ kube_version_repo: "v1.28" # the list of k8s package versions are available here # https://pkgs.k8s.io/core:/stable:/{{ kube_version_repo }}/deb/Packages kube_version: "1.28.4-1.1" -calico_version: "v3.25" +calico_version: "v3.27.0" +calico_manifest_url: "https://raw.githubusercontent.com/projectcalico/calico/{{ calico_version }}/manifests/calico.yaml" helm_version: "v3.6.3" crictl_version: "v1.26.1" diff --git a/roles/deploy-env/tasks/common_k8s.yaml b/roles/deploy-env/tasks/common_k8s.yaml index 9b0015e1f..2fa4f0350 100644 --- a/roles/deploy-env/tasks/common_k8s.yaml +++ b/roles/deploy-env/tasks/common_k8s.yaml @@ -111,7 +111,7 @@ # Calico images BEFORE deploying it - name: Download Calico manifest shell: | - curl -LSs https://docs.projectcalico.org/archive/{{ calico_version }}/manifests/calico.yaml -o /tmp/calico.yaml + curl -LSs {{ calico_manifest_url }} -o /tmp/calico.yaml sed -i -e 's#docker.io/calico/#quay.io/calico/#g' /tmp/calico.yaml args: executable: /bin/bash diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index cb3f59455..309142040 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -100,7 +100,7 @@ loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img" ceph_osd_data_device: /dev/loop100 kube_version: "1.28.4-1.1" - calico_version: "v3.25" + calico_version: "v3.27.0" helm_version: "v3.6.3" yq_version: "v4.6.0" crictl_version: "v1.26.1"