Skip to content

Commit 4eb4002

Browse files
committed
K8S-562 add nginx admission check
1 parent 5c3d914 commit 4eb4002

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

addons/upgrade.jps

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ actions:
138138
kubectl delete ns ingress-nginx
139139
for i in {1..5}; do sleep 5; echo "Attempt ${i}/5: "; kubectl apply -f ${baseUrl}/addons/nginx/nginx-deployment.yaml && break; done;
140140
while [[ $(kubectl -n ingress-nginx get pods -l app.kubernetes.io/name=ingress-nginx,app.kubernetes.io/component=controller -o 'jsonpath={..status.conditions[?(@.type=="Ready")].status}') != "True"* ]]; do sleep 5; done
141+
while true; do kubectl get -A ValidatingWebhookConfiguration && break; sleep 5; done
142+
while true; do kubectl -n ingress-nginx get svc ingress-nginx-controller-admission && break; sleep 5; done
141143
;;
142144
xhaproxy)
143145
kubectl delete ns ingress-controller

manifest.jps

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,8 @@ actions:
310310
cmd[${nodes.k8sm.master.id}]: |-
311311
kubectl apply -f ${baseUrl}/addons/nginx/nginx-deployment.yaml
312312
while [[ $(kubectl -n ingress-nginx get pods -l app.kubernetes.io/name=ingress-nginx,app.kubernetes.io/component=controller -o 'jsonpath={..status.conditions[?(@.type=="Ready")].status}') != "True"* ]]; do sleep 5; done
313+
while true; do kubectl get -A ValidatingWebhookConfiguration && break; sleep 5; done
314+
while true; do kubectl -n ingress-nginx get svc ingress-nginx-controller-admission && break; sleep 5; done
313315

314316
install-haproxy:
315317
cmd[${nodes.k8sm.master.id}]: |-

0 commit comments

Comments
 (0)