Skip to content
Merged
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
5 changes: 3 additions & 2 deletions cni-plugin/integration/manifests/calico/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ then
exit 1
fi

kubectl apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.31.0/manifests/tigera-operator.yaml
calico_ver=v3.33.0
kubectl apply -f "https://raw.githubusercontent.com/projectcalico/calico/${calico_ver}/manifests/tigera-operator.yaml"
kubectl --namespace tigera-operator rollout status --timeout=5m deploy/tigera-operator

until kubectl apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.31.0/manifests/custom-resources.yaml 1>/dev/null 2>&1; do
until kubectl apply -f "https://raw.githubusercontent.com/projectcalico/calico/${calico_ver}/manifests/custom-resources.yaml" 1>/dev/null 2>&1; do
echo "retrying calico custom resources installation..."
sleep 2
done
Expand Down
5 changes: 3 additions & 2 deletions cni-repair-controller/integration/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ cni_image_version=${BASH_REMATCH[2]}
cd "${BASH_SOURCE[0]%/*}"

step 'Installing Calico'
calico_ver=v3.33.0
# Install calico per instructions from https://k3d.io/v5.8.3/usage/advanced/calico/#1-create-the-cluster-without-flannel
kubectl apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.31.0/manifests/tigera-operator.yaml
kubectl apply -f "https://raw.githubusercontent.com/projectcalico/calico/${calico_ver}/manifests/tigera-operator.yaml"
kubectl --namespace tigera-operator rollout status --timeout=5m deploy/tigera-operator
until kubectl apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.31.0/manifests/custom-resources.yaml; do
until kubectl apply -f "https://raw.githubusercontent.com/projectcalico/calico/${calico_ver}/manifests/custom-resources.yaml"; do
echo "retrying calico custom resources installation..."
sleep 5
done
Expand Down
Loading