From 2718fe6dc4b9597a222198db57a422ad1fac12ad Mon Sep 17 00:00:00 2001 From: Masaki Muranaka Date: Mon, 8 Jul 2019 18:47:20 +0900 Subject: [PATCH 1/3] Rename environment variables. (eclipse#13821) POSTGRES_* to DB_*. Signed-off-by: Masaki Muranaka --- .../che-keycloak/templates/deployment.yaml | 10 +++++----- .../openshift/templates/multi/keycloak-template.yaml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/deployment.yaml b/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/deployment.yaml index fcb947b223d..6ac6c2ee91f 100644 --- a/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/deployment.yaml +++ b/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/deployment.yaml @@ -36,15 +36,15 @@ spec: value: postgres containers: - env: - - name: POSTGRES_PORT_5432_TCP_ADDR + - name: DB_ADDR value: postgres - - name: POSTGRES_PORT_5432_TCP_PORT + - name: DB_PORT value: "5432" - - name: POSTGRES_DATABASE + - name: DB_DATABASE value: keycloak - - name: POSTGRES_USER + - name: DB_USER value: keycloak - - name: POSTGRES_PASSWORD + - name: DB_PASSWORD value: keycloak - name: KEYCLOAK_USER value: admin diff --git a/deploy/openshift/templates/multi/keycloak-template.yaml b/deploy/openshift/templates/multi/keycloak-template.yaml index 06df2cc4ba6..cbf9557b618 100644 --- a/deploy/openshift/templates/multi/keycloak-template.yaml +++ b/deploy/openshift/templates/multi/keycloak-template.yaml @@ -38,15 +38,15 @@ objects: fieldPath: metadata.namespace - name: PROXY_ADDRESS_FORWARDING value: "true" - - name: POSTGRES_PORT_5432_TCP_ADDR + - name: DB_ADDR value: postgres - - name: POSTGRES_PORT_5432_TCP_PORT + - name: DB_PORT value: "5432" - - name: POSTGRES_DATABASE + - name: DB_DATABASE value: keycloak - - name: POSTGRES_USER + - name: DB_USER value: keycloak - - name: POSTGRES_PASSWORD + - name: DB_PASSWORD value: keycloak - name: KEYCLOAK_USER value: "${KEYCLOAK_USER}" From bb7eac2603e29e1b3e711db4b1d1eb15d4d96dda Mon Sep 17 00:00:00 2001 From: Masaki Muranaka Date: Sat, 20 Jul 2019 14:34:01 +0900 Subject: [PATCH 2/3] Add `DB_VENDOR` to env. (eclipse#13919) Signed-off-by: Masaki Muranaka --- .../che/custom-charts/che-keycloak/templates/deployment.yaml | 2 ++ deploy/openshift/templates/multi/keycloak-template.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/deployment.yaml b/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/deployment.yaml index 6ac6c2ee91f..f0b875ed471 100644 --- a/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/deployment.yaml +++ b/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/deployment.yaml @@ -36,6 +36,8 @@ spec: value: postgres containers: - env: + - name: DB_VENDOR + value: POSTGRES - name: DB_ADDR value: postgres - name: DB_PORT diff --git a/deploy/openshift/templates/multi/keycloak-template.yaml b/deploy/openshift/templates/multi/keycloak-template.yaml index cbf9557b618..112940aaab2 100644 --- a/deploy/openshift/templates/multi/keycloak-template.yaml +++ b/deploy/openshift/templates/multi/keycloak-template.yaml @@ -38,6 +38,8 @@ objects: fieldPath: metadata.namespace - name: PROXY_ADDRESS_FORWARDING value: "true" + - name: DB_VENDOR + value: POSTGRES - name: DB_ADDR value: postgres - name: DB_PORT From 7aa81417e5c86a7aef1accfb8a2a34e06c8ff9b5 Mon Sep 17 00:00:00 2001 From: Masaki Muranaka Date: Tue, 23 Jul 2019 13:54:48 +0900 Subject: [PATCH 3/3] Fix to use DB_VENDOR. DB_VENDOR is parsed in `docker-entrypoint.sh`. `standalone.sh` will be called the tail of `docker-entrypoint.sh.` Signed-off-by: Masaki Muranaka --- dockerfiles/keycloak/kc_realm_user.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dockerfiles/keycloak/kc_realm_user.sh b/dockerfiles/keycloak/kc_realm_user.sh index ebf7febf85f..53b64c31b80 100755 --- a/dockerfiles/keycloak/kc_realm_user.sh +++ b/dockerfiles/keycloak/kc_realm_user.sh @@ -40,10 +40,14 @@ if [ "${CHE_SELF__SIGNED__CERT}" != "" ]; then /opt/jboss/keycloak/bin/jboss-cli.sh --file=/scripts/cli/add_openshift_certificate.cli && rm -rf /opt/jboss/keycloak/standalone/configuration/standalone_xml_history fi +# POSTGRES_PORT is assigned by Kubernetes controller +# and it isn't fit to docker-entrypoin.sh. +unset POSTGRES_PORT + echo "Starting Keycloak server..." -/opt/jboss/keycloak/bin/standalone.sh -Dkeycloak.migration.action=import \ - -Dkeycloak.migration.provider=dir \ - -Dkeycloak.migration.strategy=IGNORE_EXISTING \ - -Dkeycloak.migration.dir=/scripts/ \ - -Djboss.bind.address=0.0.0.0 +exec /opt/jboss/docker-entrypoint.sh -Dkeycloak.migration.action=import \ + -Dkeycloak.migration.provider=dir \ + -Dkeycloak.migration.strategy=IGNORE_EXISTING \ + -Dkeycloak.migration.dir=/scripts/ \ + -Djboss.bind.address=0.0.0.0