openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Bump Calico version to v3.27.0"

Browse Source
This commit is contained in:
Zuul 2024-02-03 00:06:33 +00:00 committed by Gerrit Code Review
commit 010c21cfc9
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/deploy-env/defaults/main.yaml
View File

@ -14,7 +14,8 @@ kube_version_repo: "v1.28"
# the list of k8s package versions are available here # the list of k8s package versions are available here
# https://pkgs.k8s.io/core:/stable:/{{ kube_version_repo }}/deb/Packages # https://pkgs.k8s.io/core:/stable:/{{ kube_version_repo }}/deb/Packages
kube_version: "1.28.4-1.1" 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" helm_version: "v3.6.3"
crictl_version: "v1.26.1" crictl_version: "v1.26.1"

2
roles/deploy-env/tasks/common_k8s.yaml
View File

@ -111,7 +111,7 @@
# Calico images BEFORE deploying it # Calico images BEFORE deploying it
- name: Download Calico manifest - name: Download Calico manifest
shell: | 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 sed -i -e 's#docker.io/calico/#quay.io/calico/#g' /tmp/calico.yaml
args: args:
executable: /bin/bash executable: /bin/bash

2
zuul.d/jobs.yaml
View File

@ -99,7 +99,7 @@
loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img" loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img"
ceph_osd_data_device: /dev/loop100 ceph_osd_data_device: /dev/loop100
kube_version: "1.28.4-1.1" kube_version: "1.28.4-1.1"
calico_version: "v3.25" calico_version: "v3.27.0"
helm_version: "v3.6.3" helm_version: "v3.6.3"
yq_version: "v4.6.0" yq_version: "v4.6.0"
crictl_version: "v1.26.1" crictl_version: "v1.26.1"