From 383763a940588d680a57c244baaf5c27b5794c68 Mon Sep 17 00:00:00 2001
From: Ilya Buziuk <ibuziuk@redhat.com>
Date: Thu, 17 Dec 2020 14:16:29 +0100
Subject: [PATCH] che #18552 Adding internal URL for che api, keycloak, plugin
 & devfile registries

Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
---
 dev-scripts/deploy_custom_rh-che.sh | 4 ++++
 openshift/rh-che.config.yaml        | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/dev-scripts/deploy_custom_rh-che.sh b/dev-scripts/deploy_custom_rh-che.sh
index 563c30608..9a96706c8 100755
--- a/dev-scripts/deploy_custom_rh-che.sh
+++ b/dev-scripts/deploy_custom_rh-che.sh
@@ -376,6 +376,7 @@ fi
 # APPLY CHE CONFIGMAP
 CHE_CONFIG_YAML=$(yq ".\"data\".\"CHE_KEYCLOAK_REALM\" = \"NULL\" |
                       .\"data\".\"CHE_KEYCLOAK_AUTH__SERVER__URL\" = \"NULL\" |
+                      .\"data\".\"CHE_KEYCLOAK_AUTH__INTERNAL__SERVER__URL\" = \"NULL\" |
                       .\"data\".\"CHE_KEYCLOAK_USE__NONCE\" = \"false\" |
                       .\"data\".\"CHE_KEYCLOAK_CLIENT__ID\" = \"740650a2-9c44-4db5-b067-a3d1b2cd2d01\" |
                       .\"data\".\"CHE_KEYCLOAK_OIDC__PROVIDER\" = \"https://auth.prod-preview.openshift.io/api\" |
@@ -391,6 +392,7 @@ CHE_CONFIG_YAML=$(yq ".\"data\".\"CHE_KEYCLOAK_REALM\" = \"NULL\" |
 CHE_CONFIG_YAML=$(echo "$CHE_CONFIG_YAML" | \
                   yq ".\"data\".\"CHE_HOST\" = \"rhche-$RH_CHE_PROJECT_NAMESPACE.apps.che-dev.x6e0.p1.openshiftapps.com\" |
                       .\"data\".\"CHE_API\" = \"http$SECURE://rhche-$RH_CHE_PROJECT_NAMESPACE.apps.che-dev.x6e0.p1.openshiftapps.com/api\" |
+                      .\"data\".\"CHE_API_INTERNAL\" = \"http$SECURE://rhche-$RH_CHE_PROJECT_NAMESPACE.apps.che-dev.x6e0.p1.openshiftapps.com/api\" |
                       .\"data\".\"CHE_WEBSOCKET_ENDPOINT\" = \"ws$SECURE://rhche-$RH_CHE_PROJECT_NAMESPACE.apps.che-dev.x6e0.p1.openshiftapps.com/api/websocket\" |
                       .\"data\".\"CHE_WEBSOCKET_ENDPOINT__MINOR\" = \"ws$SECURE://rhche-$RH_CHE_PROJECT_NAMESPACE.apps.che-dev.x6e0.p1.openshiftapps.com/api/websocket-minor\" |
                       .\"metadata\".\"name\" = \"rhche\" |
@@ -399,6 +401,8 @@ CHE_CONFIG_YAML=$(echo "$CHE_CONFIG_YAML" | \
 if [ "$RH_CHE_USE_CUSTOM_REGISTRIES" == "true" ]; then
   CHE_CONFIG_YAML=$(echo "$CHE_CONFIG_YAML" | \
                     yq ".\"data\".\"CHE_WORKSPACE_PLUGIN__REGISTRY__URL\" = \"http$SECURE://che-plugin-registry-${RH_CHE_PROJECT_NAMESPACE}.apps.che-dev.x6e0.p1.openshiftapps.com/v3\" |
+                        .\"data\".\"CHE_WORKSPACE_PLUGIN__REGISTRY__INTERNAL__URL\" = \"http$SECURE://che-plugin-registry-${RH_CHE_PROJECT_NAMESPACE}.apps.che-dev.x6e0.p1.openshiftapps.com/v3\" |
+                        .\"data\".\"CHE_WORKSPACE_DEVFILE__REGISTRY__INTERNAL__URL\" = \"http$SECURE://che-devfile-registry-${RH_CHE_PROJECT_NAMESPACE}.apps.che-dev.x6e0.p1.openshiftapps.com/\" |
                         .\"data\".\"CHE_WORKSPACE_DEVFILE__REGISTRY__URL\" = \"http$SECURE://che-devfile-registry-${RH_CHE_PROJECT_NAMESPACE}.apps.che-dev.x6e0.p1.openshiftapps.com/\" ")
 fi
 
diff --git a/openshift/rh-che.config.yaml b/openshift/rh-che.config.yaml
index 156504583..7b57e862b 100644
--- a/openshift/rh-che.config.yaml
+++ b/openshift/rh-che.config.yaml
@@ -15,12 +15,14 @@ data:
   CHE_FABRIC8_ANALYTICS_WOOPRA__DOMAIN: 'NULL'
   CHE_FABRIC8_END2END_PROTECT_VERIFY__WITH__IP: "false"
   CHE_API: "https://che.prod-preview.openshift.io/api"
+  CHE_API_INTERNAL: "https://che.prod-preview.openshift.io/api"
   CHE_CORS_ENABLED: "true"
   CHE_FABRIC8_AUTH_ENDPOINT: "https://auth.prod-preview.openshift.io"
   CHE_FABRIC8_MULTICLUSTER_OSO_PROXY_URL: "https://osoproxy.prod-preview.openshift.io"
   CHE_FABRIC8_MULTITENANT: "true"
   CHE_HOST: "che.prod-preview.openshift.io"
   CHE_KEYCLOAK_AUTH__SERVER__URL: "NULL"
+  CHE_KEYCLOAK_AUTH__INTERNAL__SERVER__URL: "NULL"
   CHE_KEYCLOAK_CLIENT__ID: "740650a2-9c44-4db5-b067-a3d1b2cd2d01"
   CHE_KEYCLOAK_JS__ADAPTER__URL: "/api/fabric8-end2end/files/RhCheKeycloak.js"
   CHE_KEYCLOAK_OIDC__PROVIDER: "https://auth.prod-preview.openshift.io/api"
@@ -57,7 +59,9 @@ data:
   CHE_LOGS_APPENDERS_IMPL: "json"
   CHE_MULTIUSER: "true"
   CHE_WORKSPACE_PLUGIN__REGISTRY__URL: 'https://che-plugin-registry.prod-preview.openshift.io/v3'
+  CHE_WORKSPACE_PLUGIN__REGISTRY__INTERNAL__URL: 'https://che-plugin-registry.prod-preview.openshift.io/v3'
   CHE_WORKSPACE_DEVFILE__REGISTRY__URL: 'https://che-devfile-registry.prod-preview.openshift.io/'
+  CHE_WORKSPACE_DEVFILE__REGISTRY__INTERNAL__URL: 'https://che-devfile-registry.prod-preview.openshift.io/'
   CHE_PORT: "8080"
   CHE_DEBUG_SERVER: "false"
   SENTRY_ENVIRONMENT: 'dev'