From 0f48a7f20be8e0b4fbf964595ee39f53eb9f2a4e Mon Sep 17 00:00:00 2001 From: krnowak Date: Mon, 20 Nov 2023 07:12:41 +0000 Subject: [PATCH] Update calico to v3.26.4 --- kola/tests/kubeadm/templates.go | 4 ++-- kola/tests/kubeadm/testdata/master-calico-script.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kola/tests/kubeadm/templates.go b/kola/tests/kubeadm/templates.go index 09492f441..a1db03203 100644 --- a/kola/tests/kubeadm/templates.go +++ b/kola/tests/kubeadm/templates.go @@ -399,7 +399,7 @@ EOF {{ if eq .CNI "calico" }} cat << EOF > calico.yaml -# Source: https://raw.githubusercontent.com/projectcalico/calico/v3.26.3/manifests/custom-resources.yaml +# Source: https://raw.githubusercontent.com/projectcalico/calico/v3.26.4/manifests/custom-resources.yaml # This section includes base Calico installation configuration. # For more information, see: https://projectcalico.docs.tigera.io/master/reference/installation/api#operator.tigera.io/v1.Installation apiVersion: operator.tigera.io/v1 @@ -442,7 +442,7 @@ EOF chown -R core:core /home/core/.kube; chmod a+r /home/core/.kube/config; {{ if eq .CNI "calico" }} - kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.26.3/manifests/tigera-operator.yaml + kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.26.4/manifests/tigera-operator.yaml # calico.yaml uses Installation and APIServer CRDs, so make sure that they are established. kubectl -n tigera-operator wait --for condition=established --timeout=60s crd/installations.operator.tigera.io kubectl -n tigera-operator wait --for condition=established --timeout=60s crd/apiservers.operator.tigera.io diff --git a/kola/tests/kubeadm/testdata/master-calico-script.sh b/kola/tests/kubeadm/testdata/master-calico-script.sh index 36f5086c5..13d56d55b 100644 --- a/kola/tests/kubeadm/testdata/master-calico-script.sh +++ b/kola/tests/kubeadm/testdata/master-calico-script.sh @@ -74,7 +74,7 @@ EOF cat << EOF > calico.yaml -# Source: https://raw.githubusercontent.com/projectcalico/calico/v3.26.3/manifests/custom-resources.yaml +# Source: https://raw.githubusercontent.com/projectcalico/calico/v3.26.4/manifests/custom-resources.yaml # This section includes base Calico installation configuration. # For more information, see: https://projectcalico.docs.tigera.io/master/reference/installation/api#operator.tigera.io/v1.Installation apiVersion: operator.tigera.io/v1 @@ -117,7 +117,7 @@ EOF chown -R core:core /home/core/.kube; chmod a+r /home/core/.kube/config; - kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.26.3/manifests/tigera-operator.yaml + kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.26.4/manifests/tigera-operator.yaml # calico.yaml uses Installation and APIServer CRDs, so make sure that they are established. kubectl -n tigera-operator wait --for condition=established --timeout=60s crd/installations.operator.tigera.io kubectl -n tigera-operator wait --for condition=established --timeout=60s crd/apiservers.operator.tigera.io