K8S-275 nginx-ingress deployment cleanup

addons/upgrade.jps

@@ -49,6 +49,7 @@ actions:
     - cmd[${nodes.k8sm.master.id}]: |-
         kubectl get daemonset traefik-ingress-controller -n kube-system &>/dev/null && echo "traefik" ||:
         kubectl get deployment nginx-ingress-controller -n ingress-nginx &>/dev/null && echo "nginx" ||:
+        kubectl get daemonset nginx-ingress-controller -n ingress-nginx &>/dev/null && echo "nginx" ||:
         kubectl get daemonset haproxy-ingress -n ingress-controller &>/dev/null && echo "haproxy" ||:
     - setGlobals:
         ingress-dir: ${response.out}
@@ -61,9 +62,10 @@ actions:
           kubectl -n kube-system wait --for=condition=Ready pod -l name=traefik-ingress-lb --timeout=-1s
           ;;
          xnginx)
+          kubectl -n ingress-nginx delete deployment nginx-ingress-controller
           kubectl apply -f ${baseUrl}/addons/nginx/mandatory.yaml
           kubectl apply -f ${baseUrl}/addons/nginx/cloud-generic.yaml
-          wait-deployment.sh nginx-ingress-controller ingress-nginx 1 720
+          kubectl -n ingress-nginx wait --for=condition=Ready pod -l app.kubernetes.io/name=ingress-nginx --timeout=-1s
           ;;
          xhaproxy)
           kubectl apply -f ${baseUrl}/addons/haproxy/haproxy-deployment.yaml
@@ -147,7 +149,7 @@ actions:
     - cmd[${this}]: |-
         service kubelet restart
         helm repo update
-        wget -qO- https://github.com/derailed/k9s/releases/download/v0.17.6/k9s_Linux_x86_64.tar.gz | tar xz -C /usr/bin k9s
+        wget -qO- https://github.com/derailed/k9s/releases/download/v0.17.7/k9s_Linux_x86_64.tar.gz | tar xz -C /usr/bin k9s
         wget -qO- https://github.com/derailed/popeye/releases/download/v0.7.1/popeye_Linux_x86_64.tar.gz | tar xz -C /usr/bin popeye
         wget -nv https://github.com/wercker/stern/releases/download/1.11.0/stern_linux_amd64 -O /usr/bin/stern
         chmod +x /usr/bin/stern

manifest.jps

@@ -163,7 +163,7 @@ actions:
       mkdir -p $HOME/.kube
       cp -i /etc/kubernetes/admin.conf $HOME/.kube/config
       chown root:root $HOME/.kube/config
-      wget -qO- https://github.com/derailed/k9s/releases/download/v0.17.6/k9s_Linux_x86_64.tar.gz | tar xz -C /usr/bin k9s
+      wget -qO- https://github.com/derailed/k9s/releases/download/v0.17.7/k9s_Linux_x86_64.tar.gz | tar xz -C /usr/bin k9s
       wget -qO- https://github.com/derailed/popeye/releases/download/v0.7.1/popeye_Linux_x86_64.tar.gz | tar xz -C /usr/bin popeye
       wget -nv https://github.com/wercker/stern/releases/download/1.11.0/stern_linux_amd64 -O /usr/bin/stern
       chmod +x /usr/bin/stern