Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update calico to v3.28.0 #531

Merged
merged 1 commit into from
May 22, 2024
Merged

Update calico to v3.28.0 #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions kola/tests/kubeadm/templates.go
View file
Open in desktop
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.27.3/manifests/custom-resources.yaml
# Source: https://raw.githubusercontent.com/projectcalico/calico/v3.28.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 All @@ -228,9 +228,9 @@ spec:
nodeAddressAutodetectionV4:
interface: eth0
{{ end }}
# Note: The ipPools section cannot be modified post-install.
ipPools:
- blockSize: 26
- name: default-ipv4-ippool
blockSize: 26
cidr: {{ .PodSubnet }}
encapsulation: VXLANCrossSubnet
natOutgoing: Enabled
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.27.3/manifests/tigera-operator.yaml
kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.28.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
View file
Open in desktop
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.27.3/manifests/custom-resources.yaml
# Source: https://raw.githubusercontent.com/projectcalico/calico/v3.28.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 All @@ -57,9 +57,9 @@ spec:
# Configures Calico networking.
calicoNetwork:

# Note: The ipPools section cannot be modified post-install.
ipPools:
- blockSize: 26
- name: default-ipv4-ippool
blockSize: 26
cidr: 192.168.0.0/17
encapsulation: VXLANCrossSubnet
natOutgoing: Enabled
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.27.3/manifests/tigera-operator.yaml
kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.28.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