Skip to content

Commit 2db4bc1

Browse files
committed
K8S-562 add nginx admission check
1 parent 66c2598 commit 2db4bc1

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
@@ -108,6 +108,8 @@ actions:
108108
kubectl delete ns ingress-nginx
109109
for i in {1..5}; do sleep 5; echo "Attempt ${i}/5: "; kubectl apply -f ${baseUrl}/addons/nginx/nginx-deployment.yaml && break; done;
110110
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
111+
while true; do kubectl get -A ValidatingWebhookConfiguration && break; sleep 5; done
112+
while true; do kubectl -n ingress-nginx get svc ingress-nginx-controller-admission && break; sleep 5; done
111113
;;
112114
xhaproxy)
113115
kubectl apply -f ${baseUrl}/addons/haproxy/haproxy-deployment.yaml

manifest.jps

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,8 @@ actions:
258258
cmd[${nodes.k8sm.master.id}]: |-
259259
kubectl apply -f ${baseUrl}/addons/nginx/nginx-deployment.yaml
260260
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
261+
while true; do kubectl get -A ValidatingWebhookConfiguration && break; sleep 5; done
262+
while true; do kubectl -n ingress-nginx get svc ingress-nginx-controller-admission && break; sleep 5; done
261263

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

0 commit comments

Comments
 (0)