Skip to content

Commit 8c753e7

Browse files
authored
Merge pull request #499 from NVIDIA/defaultcalicoexistingerror
Fix default exist error for tigera and custom-resource
2 parents 58f7104 + d9993be commit 8c753e7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

pkg/provisioner/templates/kubernetes.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,15 +127,15 @@ with_retry 10 30s kubectl --kubeconfig $KUBECONFIG version
127127
# Install Calico
128128
# based on https://docs.tigera.io/calico/latest/getting-started/kubernetes/quickstart
129129
echo "Installing Calico ${CALICO_VERSION}..."
130-
with_retry 3 10s kubectl get installation default -n tigera-operator || kubectl --kubeconfig $KUBECONFIG create -f https://raw.githubusercontent.com/projectcalico/calico/${CALICO_VERSION}/manifests/tigera-operator.yaml
130+
with_retry 3 10s kubectl --kubeconfig $KUBECONFIG create -f https://raw.githubusercontent.com/projectcalico/calico/${CALICO_VERSION}/manifests/tigera-operator.yaml
131131
132132
# Wait for Tigera operator to be ready
133133
echo "Waiting for Tigera operator to be ready..."
134134
with_retry 10 30s kubectl --kubeconfig $KUBECONFIG wait --for=condition=available --timeout=300s deployment/tigera-operator -n tigera-operator
135135
136136
# Install Calico custom resources
137137
echo "Installing Calico custom resources..."
138-
with_retry 3 10s kubectl get installation default -n tigera-operator || kubectl --kubeconfig $KUBECONFIG create -f https://raw.githubusercontent.com/projectcalico/calico/${CALICO_VERSION}/manifests/custom-resources.yaml
138+
with_retry 3 10s kubectl --kubeconfig $KUBECONFIG get installations.operator.tigera.io default -n tigera-operator || kubectl --kubeconfig $KUBECONFIG apply -f https://raw.githubusercontent.com/projectcalico/calico/${CALICO_VERSION}/manifests/custom-resources.yaml
139139
140140
# Wait for Calico to be ready
141141
echo "Waiting for Calico to be ready..."

0 commit comments

Comments
 (0)