K8S-554 skip unknown components upgrade

Author: dfateyev

addons/upgrade.jps

@@ -146,7 +146,6 @@ actions:
            ;;
           *)
            echo "Invalid ingress controller used!"
-           exit 1
            ;;
           esac
     - cmd[${nodes.k8sm.master.id}]: |-
@@ -386,21 +385,23 @@ actions:
     - if (${this.master}):
         - cmd[${this.id}]: |-
             # drop in k8s-1.20+
-            kubectl get ingress kubernetes-api -n default && {
-             kubectl apply -f ${baseUrl}/addons/ingress/${globals.ingress-dir}/api-ingress.yaml; } ||:
-            kubectl get deployment kubernetes-dashboard -n kubernetes-dashboard && {
-             kubectl apply -f ${baseUrl}/addons/ingress/${globals.ingress-dir}/dashboard-ingress.yaml; } ||:
-            kubectl get deployment kubernetes-k8dash -n kubernetes-k8dash && {
-             kubectl -n kube-system delete ingress kubernetes-k8dash;
-             kubectl apply -f ${baseUrl}/addons/ingress/${globals.ingress-dir}/k8dash-ingress.yaml; } ||:
-            kubectl get deployment hello-kubernetes && {
-             kubectl apply -f ${baseUrl}/addons/ingress/${globals.ingress-dir}/helloworld-ingress.yaml; } ||:
-            kubectl get secret --namespace kubernetes-monitoring monitoring-grafana && {
+            if [ -n "${globals.ingress-dir}" ]; then
+             kubectl get ingress kubernetes-api -n default && {
+              kubectl apply -f ${baseUrl}/addons/ingress/${globals.ingress-dir}/api-ingress.yaml; }
+             kubectl get deployment kubernetes-dashboard -n kubernetes-dashboard && {
+              kubectl apply -f ${baseUrl}/addons/ingress/${globals.ingress-dir}/dashboard-ingress.yaml; }
+             kubectl get deployment kubernetes-k8dash -n kubernetes-k8dash && {
+              kubectl -n kube-system delete ingress kubernetes-k8dash;
+              kubectl apply -f ${baseUrl}/addons/ingress/${globals.ingress-dir}/k8dash-ingress.yaml; }
+             kubectl get deployment hello-kubernetes && {
+              kubectl apply -f ${baseUrl}/addons/ingress/${globals.ingress-dir}/helloworld-ingress.yaml; }
+             kubectl get secret --namespace kubernetes-monitoring monitoring-grafana && {
               kubectl apply -f ${baseUrl}/addons/monitoring/${globals.ingress-dir}/prometheus-ingress.yaml;
               kubectl apply -f ${baseUrl}/addons/monitoring/${globals.ingress-dir}/alert-ingress.yaml;
-              kubectl apply -f ${baseUrl}/addons/monitoring/${globals.ingress-dir}/grafana-ingress.yaml; } ||:
-            kubectl get secret --namespace observability observability-jaeger-plain && {
-              kubectl apply -f ${baseUrl}/addons/ingress/${globals.ingress-dir}/jaeger-ingress.yaml; } ||:
+              kubectl apply -f ${baseUrl}/addons/monitoring/${globals.ingress-dir}/grafana-ingress.yaml; }
+             kubectl get secret --namespace observability observability-jaeger-plain && {
+              kubectl apply -f ${baseUrl}/addons/ingress/${globals.ingress-dir}/jaeger-ingress.yaml; }
+            fi
 
   upgrade-workers:
     - cmd[${nodes.k8sm.master.id}]: |-