From 981d349eba51e87d47dcb84047b723fadde5eee4 Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Wed, 9 Dec 2020 14:52:28 +0200 Subject: [PATCH] Add missing internal api urls Signed-off-by: Anatolii Bazko --- deploy/kubernetes/helm/che/templates/configmap.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/deploy/kubernetes/helm/che/templates/configmap.yaml b/deploy/kubernetes/helm/che/templates/configmap.yaml index 6fc5b997599..be490fc2992 100644 --- a/deploy/kubernetes/helm/che/templates/configmap.yaml +++ b/deploy/kubernetes/helm/che/templates/configmap.yaml @@ -19,10 +19,12 @@ data: CHE_PORT: "8080" {{- if and .Values.global.tls .Values.global.tls.enabled }} CHE_API: https://{{ template "cheHost" . }}/api + CHE_API_INTERNAL: https://{{ template "cheHost" . }}/api CHE_WEBSOCKET_ENDPOINT: wss://{{ template "cheHost" . }}/api/websocket CHE_INFRA_KUBERNETES_BOOTSTRAPPER_BINARY__URL: https://{{ template "cheHost" . }}/agent-binaries/linux_amd64/bootstrapper/bootstrapper {{ else }} CHE_API: http://{{ template "cheHost" . }}/api + CHE_API_INTERNAL: http://{{ template "cheHost" . }}/api CHE_WEBSOCKET_ENDPOINT: ws://{{ template "cheHost" . }}/api/websocket CHE_WEBSOCKET_ENDPOINT__MINOR: ws://{{ template "cheHost" . }}/api/websocket-minor CHE_INFRA_KUBERNETES_BOOTSTRAPPER_BINARY__URL: http://{{ template "cheHost" . }}/agent-binaries/linux_amd64/bootstrapper/bootstrapper @@ -42,6 +44,7 @@ data: {{- if .Values.global.multiuser }} CHE_KEYCLOAK_CLIENT__ID: {{ .Values.cheKeycloakClientId | quote}} CHE_KEYCLOAK_AUTH__SERVER__URL: {{ template "keycloakAuthUrl" . }} + CHE_KEYCLOAK_AUTH__INTERNAL__SERVER__URL: {{ template "keycloakAuthUrl" . }} CHE_KEYCLOAK_REALM: {{ .Values.cheKeycloakRealm }} {{- end }} {{- if (and .Values.global.multiuser .Values.customOidcProvider) }} @@ -94,7 +97,7 @@ data: CHE_LIMITS_WORKSPACE_IDLE_TIMEOUT: '{{ .Values.global.workspaceIdleTimeout }}' {{- if .Values.che.limits.userWorkspacesRunCount }} CHE_LIMITS_USER_WORKSPACES_RUN_COUNT: {{ .Values.che.limits.userWorkspacesRunCount | quote }} -{{- end }} +{{- end }} {{- if .Values.workspaceDefaultRamRequest }} CHE_WORKSPACE_DEFAULT_MEMORY_REQUEST_MB: {{ .Values.workspaceDefaultRamRequest | quote }} {{- end }} @@ -103,13 +106,17 @@ data: {{- end }} {{- if .Values.che.workspace.devfileRegistryUrl }} CHE_WORKSPACE_DEVFILE__REGISTRY__URL: {{ .Values.che.workspace.devfileRegistryUrl | quote }} + CHE_WORKSPACE_DEVFILE__REGISTRY__INTERNAL__URL: {{ .Values.che.workspace.devfileRegistryUrl | quote }} {{- else if .Values.cheDevfileRegistry.deploy }} CHE_WORKSPACE_DEVFILE__REGISTRY__URL: {{ template "devfileRegistryUrl" . }} + CHE_WORKSPACE_DEVFILE__REGISTRY__INTERNAL__URL: {{ template "devfileRegistryUrl" . }} {{- end }} {{- if .Values.che.workspace.pluginRegistryUrl }} CHE_WORKSPACE_PLUGIN__REGISTRY__URL: {{ .Values.che.workspace.pluginRegistryUrl | quote }} + CHE_WORKSPACE_PLUGIN__REGISTRY__INTERNAL__URL: {{ .Values.che.workspace.pluginRegistryUrl | quote }} {{- else if .Values.chePluginRegistry.deploy }} CHE_WORKSPACE_PLUGIN__REGISTRY__URL: {{ template "pluginRegistryUrl" . }} + CHE_WORKSPACE_PLUGIN__REGISTRY__INTERNAL__URL: {{ template "pluginRegistryUrl" . }} {{- end }} {{- if .Values.che.workspace.pluginBroker }} {{- if .Values.che.workspace.pluginBroker.waitTimeoutMin }}