K8S-657 custom deployment workaround for 1.22+

Author: dfateyev

configs/settings.yaml

@@ -15,12 +15,10 @@ fields:
         required: true
         hideLabel: true
         default: |-
-          OPERATOR_NAMESPACE=open-liberty
-          kubectl create namespace "$OPERATOR_NAMESPACE"
-          kubectl apply -f https://raw.githubusercontent.com/OpenLiberty/open-liberty-operator/master/deploy/releases/0.7.1/openliberty-app-crd.yaml
-          curl -L https://raw.githubusercontent.com/OpenLiberty/open-liberty-operator/master/deploy/releases/0.7.1/openliberty-app-cluster-rbac.yaml | sed -e "s/OPEN_LIBERTY_OPERATOR_NAMESPACE/${OPERATOR_NAMESPACE}/"  | kubectl apply -f -
-          curl -L https://raw.githubusercontent.com/OpenLiberty/open-liberty-operator/master/deploy/releases/0.7.1/openliberty-app-operator.yaml  | sed -e "s/OPEN_LIBERTY_WATCH_NAMESPACE/${OPERATOR_NAMESPACE}/"  | kubectl apply -n ${OPERATOR_NAMESPACE} -f -
-          kubectl apply -f https://raw.githubusercontent.com/jelastic-jps/kubernetes/v1.22.4/addons/open-liberty.yaml
+          # k8s 1.22+ doesn't support openliberty-operator yet
+          declare -l ingress_dir="${settings.ingress-controller}"
+          kubectl apply -f https://raw.githubusercontent.com/jelastic-jps/kubernetes/v1.22.4/addons/helloworld.yaml
+          kubectl apply -f https://raw.githubusercontent.com/jelastic-jps/kubernetes/v1.22.4/addons/ingress/${ingress_dir}/helloworld-ingress.yaml
 
   - name: label
     caption: Topology

manifest.jps

@@ -520,7 +520,7 @@ actions:
               Credentials - admin / ${this.jaeger_secret}
 
   check-health:
-      cmd[${nodes.k8sm.master.id}]: /usr/local/sbin/check-install.sh -i=${settings.ingress-controller} -app=${settings.deploy} -dash=${settings.dashboard:none} -m=${settings.monitoring:false} -r=${settings.api} -s=${settings.storage} -j=${settings.jaeger:false} -d=${env.domain} &> /var/log/kubernetes/k8s-health-check.log ||
+      cmd[${nodes.k8sm.master.id}]: /usr/local/sbin/check-install.sh -i=${settings.ingress-controller} -app=cc -dash=${settings.dashboard:none} -m=${settings.monitoring:false} -r=${settings.api} -s=${settings.storage} -j=${settings.jaeger:false} -d=${env.domain} &> /var/log/kubernetes/k8s-health-check.log ||
          echo "> **Note:** Some cluster components have not yet been initialized, and it may take some time for pods to start. If you encounter problems with your cluster, please check K8s logs in /var/log/kubernetes on control-plane node and contact support."
       setGlobals:
          check_message: ${response.out}