Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

port #7212 to master #7236

Merged
merged 1 commit into from
Nov 7, 2017
Merged

port #7212 to master #7236

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions dockerfiles/init/modules/openshift/files/scripts/deploy_che.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,15 @@ CHE_FABRIC8_USER__SERVICE_ENDPOINT=${CHE_FABRIC8_USER__SERVICE_ENDPOINT:-"https:
CHE_FABRIC8_WORKSPACES_ROUTING__SUFFIX=${CHE_FABRIC8_WORKSPACES_ROUTING__SUFFIX:-"8a09.starter-us-east-2.openshiftapps.com"}
if [ "${CHE_FABRIC8_MULTITENANT}" == "true" ]; then
CHE_DOCKER_ENABLE__CONTAINER__STOP__DETECTOR=false
DEFAULT_CHE_MULTI_USER=true
DEFAULT_CHE_MULTIUSER=true
else
CHE_DOCKER_ENABLE__CONTAINER__STOP__DETECTOR=true
DEFAULT_CHE_MULTI_USER=false
DEFAULT_CHE_MULTIUSER=false
fi

CHE_MULTI_USER=${CHE_MULTI_USER:-${DEFAULT_CHE_MULTI_USER}}
CHE_MULTIUSER=${CHE_MULTIUSER:-${DEFAULT_CHE_MULTIUSER}}

if [ "${CHE_MULTI_USER}" == "true" ]; then
if [ "${CHE_MULTIUSER}" == "true" ]; then
DEFAULT_CHE_KEYCLOAK_DISABLED="false"

if [ "${CHE_FABRIC8_MULTITENANT}" == "true" ]; then
Expand All @@ -130,7 +130,8 @@ else
DEFAULT_CHE_IMAGE_REPO="docker.io/eclipse/che-server"
DEFAULT_CHE_IMAGE_TAG="nightly"
fi

CHE_OAUTH_GITHUB_CLIENTID=${CHE_OAUTH_GITHUB_CLIENTID:-}
CHE_OAUTH_GITHUB_CLIENTSECRET=${CHE_OAUTH_GITHUB_CLIENTSECRET:-}
CHE_IMAGE_REPO=${CHE_IMAGE_REPO:-${DEFAULT_CHE_IMAGE_REPO}}
CHE_IMAGE_TAG=${CHE_IMAGE_TAG:-${DEFAULT_CHE_IMAGE_TAG}}
DEFAULT_CHE_LOG_LEVEL="INFO"
Expand Down Expand Up @@ -292,7 +293,7 @@ fi

COMMAND_DIR=$(dirname "$0")

if [ "${CHE_MULTI_USER}" == "true" ]; then
if [ "${CHE_MULTIUSER}" == "true" ]; then
if [ "${CHE_DEDICATED_KEYCLOAK}" == "true" ]; then
"${COMMAND_DIR}"/multi-user/deploy_postgres_and_keycloak.sh
else
Expand Down Expand Up @@ -381,7 +382,7 @@ CHE_IMAGE="${CHE_IMAGE_REPO}:${CHE_IMAGE_TAG}"
# e.g. docker.io/rhchestage => docker.io\/rhchestage
CHE_IMAGE_SANITIZED=$(echo "${CHE_IMAGE}" | sed 's/\//\\\//g')

MULTI_USER_REPLACEMENT_STRING=" - name: \"CHE_WORKSPACE_LOGS\"
CHE_SERVER_CONFIGURATION=" - name: \"CHE_WORKSPACE_LOGS\"
value: \"${CHE_WORKSPACE_LOGS}\"
- name: \"CHE_KEYCLOAK_AUTH__SERVER__URL\"
value: \"${CHE_KEYCLOAK_AUTH__SERVER__URL}\"
Expand All @@ -390,10 +391,16 @@ MULTI_USER_REPLACEMENT_STRING=" - name: \"CHE_WORKSPACE_LOGS\"
- name: \"CHE_KEYCLOAK_CLIENT__ID\"
value: \"${CHE_KEYCLOAK_CLIENT__ID}\"
- name: \"CHE_HOST\"
value: \"${CHE_HOST}\""
value: \"${CHE_HOST}\"
- name: \"CHE_MULTIUSER\"
value: \"${CHE_MULTIUSER}\"
- name: \"CHE_OAUTH_GITHUB_CLIENTID\"
value: \"${CHE_OAUTH_GITHUB_CLIENTID}\"
- name: \"CHE_OAUTH_GITHUB_CLIENTSECRET\"
value: \"${CHE_OAUTH_GITHUB_CLIENTSECRET}\""

if [ "${CHE_FABRIC8_MULTITENANT}" == "true" ]; then
MULTI_USER_REPLACEMENT_STRING=" - name: \"CHE_FABRIC8_MULTITENANT\"
CHE_SERVER_CONFIGURATION=" - name: \"CHE_FABRIC8_MULTITENANT\"
value: \"${CHE_FABRIC8_MULTITENANT}\"
- name: \"CHE_FABRIC8_USER__SERVICE_ENDPOINT\"
value: \"${CHE_FABRIC8_USER__SERVICE_ENDPOINT}\"
Expand All @@ -403,7 +410,7 @@ if [ "${CHE_FABRIC8_MULTITENANT}" == "true" ]; then
value: \"${CHE_DOCKER_ENABLE__CONTAINER__STOP__DETECTOR}\"
- name: \"CHE_WORKSPACE_CHE__SERVER__ENDPOINT\"
value: \"\"
$MULTI_USER_REPLACEMENT_STRING"
$CHE_SERVER_CONFIGURATION"

MULTITENANT_CUSTOM_STRATEGY_REPLACEMENT="s/ che-server-evaluation-strategy: .*/ che-server-evaluation-strategy: always-external-custom/"
MULTITENANT_CUSTOM_TEMPLATE_REPLACEMENT="s/ che.docker.server_evaluation_strategy.custom.template: .*/ che.docker.server_evaluation_strategy.custom.template: <serverName>-<if(isDevMachine)><workspaceIdWithoutPrefix><else><machineName><endif>-<if(workspacesRoutingSuffix)><workspacesRoutingSuffix><else><externalAddress><endif>/"
Expand Down Expand Up @@ -436,7 +443,7 @@ if [ "${OPENSHIFT_FLAVOR}" == "minishift" ]; then
grep -v -e "tls:" -e "insecureEdgeTerminationPolicy: Redirect" -e "termination: edge" | \
if [ "${CHE_KEYCLOAK_DISABLED}" == "true" ]; then sed "s/ keycloak-disabled: \"false\"/ keycloak-disabled: \"true\"/" ; else cat -; fi | \
sed "$MULTI_USER_HEALTH_CHECK_REPLACEMENT_STRING" | \
append_after_match "env:" "${MULTI_USER_REPLACEMENT_STRING}" | \
append_after_match "env:" "${CHE_SERVER_CONFIGURATION}" | \
if [ "${CHE_FABRIC8_MULTITENANT}" == "true" ]; then sed "$MULTITENANT_CUSTOM_STRATEGY_REPLACEMENT" ; else cat -; fi | \
if [ "${CHE_FABRIC8_MULTITENANT}" == "true" ]; then sed "$MULTITENANT_CUSTOM_TEMPLATE_REPLACEMENT" ; else cat -; fi | \
if [ "${CHE_FABRIC8_MULTITENANT}" == "true" ]; then sed "$MULTITENANT_IDLING_REPLACEMENT" ; else cat -; fi | \
Expand All @@ -451,7 +458,7 @@ elif [ "${OPENSHIFT_FLAVOR}" == "osio" ]; then
sed "s/ imagePullPolicy:.*/ imagePullPolicy: \"${IMAGE_PULL_POLICY}\"/" | \
if [ "${CHE_KEYCLOAK_DISABLED}" == "true" ]; then sed "s/ keycloak-disabled: \"false\"/ keycloak-disabled: \"true\"/" ; else cat -; fi | \
sed "$MULTI_USER_HEALTH_CHECK_REPLACEMENT_STRING" | \
append_after_match "env:" "${MULTI_USER_REPLACEMENT_STRING}" | \
append_after_match "env:" "${CHE_SERVER_CONFIGURATION}" | \
if [ "${CHE_FABRIC8_MULTITENANT}" == "true" ]; then sed "$MULTITENANT_CUSTOM_STRATEGY_REPLACEMENT" ; else cat -; fi | \
if [ "${CHE_FABRIC8_MULTITENANT}" == "true" ]; then sed "$MULTITENANT_CUSTOM_TEMPLATE_REPLACEMENT" ; else cat -; fi | \
if [ "${CHE_FABRIC8_MULTITENANT}" == "true" ]; then sed "$MULTITENANT_IDLING_REPLACEMENT" ; else cat -; fi | \
Expand All @@ -472,7 +479,7 @@ else
if [ "${ENABLE_SSL}" == "false" ]; then sed "s/ che.docker.server_evaluation_strategy.custom.external.protocol: https/ che.docker.server_evaluation_strategy.custom.external.protocol: http/" ; else cat -; fi | \
if [ "${K8S_VERSION_PRIOR_TO_1_6}" == "true" ]; then sed "s/ che-openshift-precreate-subpaths: \"false\"/ che-openshift-precreate-subpaths: \"true\"/" ; else cat -; fi | \
sed "$MULTI_USER_HEALTH_CHECK_REPLACEMENT_STRING" | \
append_after_match "env:" "${MULTI_USER_REPLACEMENT_STRING}" | \
append_after_match "env:" "${CHE_SERVER_CONFIGURATION}" | \
if [ "${CHE_FABRIC8_MULTITENANT}" == "true" ]; then sed "$MULTITENANT_CUSTOM_STRATEGY_REPLACEMENT" ; else cat -; fi | \
if [ "${CHE_FABRIC8_MULTITENANT}" == "true" ]; then sed "$MULTITENANT_CUSTOM_TEMPLATE_REPLACEMENT" ; else cat -; fi | \
if [ "${CHE_FABRIC8_MULTITENANT}" == "true" ]; then sed "$MULTITENANT_IDLING_REPLACEMENT" ; else cat -; fi | \
Expand Down