Skip to content

Commit

Permalink
Merge pull request #490 from flatcar/calico-update-v3.27.0
Browse files Browse the repository at this point in the history
Update calico to v3.27.0
  • Loading branch information
tormath1 authored Dec 19, 2023
2 parents 46dbc15 + a9198c4 commit 0a8e29f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions kola/tests/kubeadm/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -408,9 +408,9 @@ EOF
{{ if eq .CNI "calico" }}
cat << EOF > calico.yaml
# Source: https://raw.githubusercontent.com/projectcalico/calico/v3.26.4/manifests/custom-resources.yaml
# Source: https://raw.githubusercontent.com/projectcalico/calico/v3.27.0/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
# For more information, see: https://docs.tigera.io/calico/latest/reference/installation/api#operator.tigera.io/v1.Installation
apiVersion: operator.tigera.io/v1
kind: Installation
metadata:
Expand Down Expand Up @@ -439,7 +439,7 @@ spec:
---
# This section configures the Calico API server.
# For more information, see: https://projectcalico.docs.tigera.io/master/reference/installation/api#operator.tigera.io/v1.APIServer
# For more information, see: https://docs.tigera.io/calico/latest/reference/installation/api#operator.tigera.io/v1.APIServer
apiVersion: operator.tigera.io/v1
kind: APIServer
metadata:
Expand All @@ -457,7 +457,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.4/manifests/tigera-operator.yaml
kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.27.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
8 changes: 4 additions & 4 deletions kola/tests/kubeadm/testdata/master-calico-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ EOF


cat << EOF > calico.yaml
# Source: https://raw.githubusercontent.com/projectcalico/calico/v3.26.4/manifests/custom-resources.yaml
# Source: https://raw.githubusercontent.com/projectcalico/calico/v3.27.0/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
# For more information, see: https://docs.tigera.io/calico/latest/reference/installation/api#operator.tigera.io/v1.Installation
apiVersion: operator.tigera.io/v1
kind: Installation
metadata:
Expand All @@ -103,7 +103,7 @@ spec:
---
# This section configures the Calico API server.
# For more information, see: https://projectcalico.docs.tigera.io/master/reference/installation/api#operator.tigera.io/v1.APIServer
# For more information, see: https://docs.tigera.io/calico/latest/reference/installation/api#operator.tigera.io/v1.APIServer
apiVersion: operator.tigera.io/v1
kind: APIServer
metadata:
Expand All @@ -121,7 +121,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.4/manifests/tigera-operator.yaml
kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.27.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 0a8e29f

Please sign in to comment.