Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions kola/tests/kubeadm/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ EOF

{{ if eq .CNI "calico" }}
cat << EOF > calico.yaml
# Source: https://raw.githubusercontent.com/projectcalico/calico/v3.32.1/manifests/custom-resources.yaml
# Source: https://raw.githubusercontent.com/projectcalico/calico/v3.32.2/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 @@ -278,7 +278,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.32.1/manifests/tigera-operator.yaml
kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.32.2/manifests/tigera-operator.yaml
# calico.yaml uses Installation and APIServer CRDs, so make sure that they are established.
kubectl -n tigera-operator wait --for create --timeout=60s crd/installations.operator.tigera.io
kubectl -n tigera-operator wait --for condition=established --timeout=60s crd/installations.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 @@ -42,7 +42,7 @@ EOF


cat << EOF > calico.yaml
# Source: https://raw.githubusercontent.com/projectcalico/calico/v3.32.1/manifests/custom-resources.yaml
# Source: https://raw.githubusercontent.com/projectcalico/calico/v3.32.2/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 @@ -98,7 +98,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.32.1/manifests/tigera-operator.yaml
kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.32.2/manifests/tigera-operator.yaml
# calico.yaml uses Installation and APIServer CRDs, so make sure that they are established.
kubectl -n tigera-operator wait --for create --timeout=60s crd/installations.operator.tigera.io
kubectl -n tigera-operator wait --for condition=established --timeout=60s crd/installations.operator.tigera.io
Expand Down