Skip to content

Commit

Permalink
Merge pull request #563 from flatcar/calico-update-v3.29.0
Browse files Browse the repository at this point in the history
Update calico to v3.29.0
  • Loading branch information
tormath1 authored Nov 5, 2024
2 parents 6719820 + 8f7792a commit 370c103
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions kola/tests/kubeadm/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ EOF
{{ if eq .CNI "calico" }}
cat << EOF > calico.yaml
# Source: https://raw.githubusercontent.com/projectcalico/calico/v3.28.2/manifests/custom-resources.yaml
# Source: https://raw.githubusercontent.com/projectcalico/calico/v3.29.0/manifests/custom-resources.yaml
# This section includes base Calico installation configuration.
# For more information, see: https://docs.tigera.io/calico/latest/reference/installation/api#operator.tigera.io/v1.Installation
apiVersion: operator.tigera.io/v1
Expand Down Expand Up @@ -258,7 +258,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.28.2/manifests/tigera-operator.yaml
kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.29.0/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
Expand Down
4 changes: 2 additions & 2 deletions kola/tests/kubeadm/testdata/master-calico-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ EOF


cat << EOF > calico.yaml
# Source: https://raw.githubusercontent.com/projectcalico/calico/v3.28.2/manifests/custom-resources.yaml
# Source: https://raw.githubusercontent.com/projectcalico/calico/v3.29.0/manifests/custom-resources.yaml
# This section includes base Calico installation configuration.
# For more information, see: https://docs.tigera.io/calico/latest/reference/installation/api#operator.tigera.io/v1.Installation
apiVersion: operator.tigera.io/v1
Expand Down Expand Up @@ -87,7 +87,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.28.2/manifests/tigera-operator.yaml
kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.29.0/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
Expand Down

0 comments on commit 370c103

Please sign in to comment.