Fix debugger for openshift cluster. (#488)

Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
eclipse-che · Oct 9, 2020 · 2ec4908 · 2ec4908
1 parent c5ab66b
commit 2ec4908
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -174,6 +174,7 @@
         "CHE_POSTGRES_SECRET": "che-postgres-secret",
         "CHE_SERVER_TRUST_STORE_CONFIGMAP_NAME": "ca-certs"
       },
+      "envFile": "/tmp/che-operator-debug.env",
       "cwd": "${workspaceFolder}",
       "args": [
         "--defaults-path",

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -26,7 +26,6 @@
                 "reveal": "always"
             },
             "group": "build"
-        }    
+        }
     ]
 }
-
diff --git a/local-debug.sh b/local-debug.sh
@@ -12,11 +12,6 @@
 
 set -e
 
-if [ $# -ne 1 ]; then
-    echo -e "Wrong number of parameters.\nUsage: ./loca-debug.sh <custom-resource-yaml>\n"
-    exit 1
-fi
-
 command -v delv >/dev/null 2>&1 || { echo "operator-sdk is not installed. Aborting."; exit 1; }
 command -v operator-sdk >/dev/null 2>&1 || { echo -e $RED"operator-sdk is not installed. Aborting."$NC; exit 1; }
 
@@ -28,8 +23,26 @@ set +e
 kubectl create namespace $CHE_NAMESPACE
 set -e
 
+CR="${1}"
+if [ -z "${CR}" ]; then
+    CR="./deploy/crds/org_v1_che_cr.yaml"
+    echo "[INFO] First argument is an empty. Set up default CR file: ${CR}"
+fi
+
 kubectl apply -f deploy/crds/org_v1_che_crd.yaml
-kubectl apply -f $1 -n $CHE_NAMESPACE
+kubectl apply -f "${CR}" -n $CHE_NAMESPACE
 cp templates/keycloak_provision /tmp/keycloak_provision
+cp templates/oauth_provision /tmp/oauth_provision
+
+ENV_FILE=/tmp/che-operator-debug.env
+rm -rf "${ENV_FILE}"
+touch "${ENV_FILE}"
+CLUSTER_API_URL=$(oc whoami --show-server=true) || true
+if [ -n "${CLUSTER_API_URL}" ]; then 
+    echo "CLUSTER_API_URL='${CLUSTER_API_URL}'" > "${ENV_FILE}"
+    echo "[INFO] Set up cluster api url: ${CLUSTER_API_URL}"
+fi
+
+echo "[WARN] Make sure that your CR contains valid ingress domain!"
 
 operator-sdk up local --namespace=${CHE_NAMESPACE} --enable-delve
diff --git a/pkg/util/util.go b/pkg/util/util.go
@@ -190,11 +190,15 @@ func IsTestMode() (isTesting bool) {
 }
 
 func GetClusterPublicHostname(isOpenShift4 bool) (hostname string, err error) {
+	// Could be set for debug scripts.
+	CLUSTER_API_URL := os.Getenv("CLUSTER_API_URL")
+	if CLUSTER_API_URL != "" {
+		return CLUSTER_API_URL, nil
+	}
 	if isOpenShift4 {
 		return getClusterPublicHostnameForOpenshiftV4()
-	} else {
-		return getClusterPublicHostnameForOpenshiftV3()
 	}
+	return getClusterPublicHostnameForOpenshiftV3()
 }
 
 // getClusterPublicHostnameForOpenshiftV3 is a hacky way to get OpenShift API public DNS/IP