Skip to content

Commit 5a90178

Browse files
iromlimoabu
iromli
and
moabu
authored
feat(docker): remove SSA mount in favor of uploading via admin-ui (#1649)
* feat(docker): remove SSA mount in favor of uploading via admin-ui Signed-off-by: iromli <[email protected]> * chore(deps): remove jwcrypto library Signed-off-by: iromli <[email protected]> * refactor: remove license ssa from charts and deployment Signed-off-by: moabu <[email protected]> * docs: remove licenseSsa from docs Signed-off-by: iromli <[email protected]> * chore: update FLEX_SOURCE_VERSION Signed-off-by: iromli <[email protected]> * refactor: remove SSA mount Signed-off-by: iromli <[email protected]> --------- Signed-off-by: iromli <[email protected]> Signed-off-by: moabu <[email protected]> Co-authored-by: moabu <[email protected]>
1 parent ee491be commit 5a90178

File tree

30 files changed

+222
-358
lines changed

30 files changed

+222
-358
lines changed

‎automation/rancher-partner-charts/questions.yaml

-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
11
questions:
2-
# ==================
3-
# License SSA group
4-
# ==================
5-
- variable: global.licenseSsa
6-
default: ""
7-
required: true
8-
type: string
9-
label: License SSA
10-
description: "Before initiating the setup, please contact Gluu to obtain a valid license or trial license. Your organization needs to register with Gluu to trial Flex, after which you are issued a JWT placed here in which you can use to install. This must be base64 encoded."
11-
group: "License SSA"
12-
132
# ==================
143
# Distribution group
154
# ==================

‎automation/startflexdemo.sh

+1-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
set -eo pipefail
33
GLUU_FQDN=$1
44
GLUU_PERSISTENCE=$2
5-
GLUU_LICENSE_SSA=$3
65
GLUU_CI_CD_RUN=$4
76
EXT_IP=$5
87
INSTALL_ISTIO=$6
@@ -21,9 +20,7 @@ if [[ $GLUU_PERSISTENCE != "LDAP" ]] && [[ $GLUU_PERSISTENCE != "MYSQL" ]] && [[
2120
echo "[E] Incorrect entry. Please enter either LDAP, MYSQL or PGSQL"
2221
exit 1
2322
fi
24-
if [[ ! "$GLUU_LICENSE_SSA" ]]; then
25-
read -rp "Enter the License SSA provided by Gluu: " GLUU_LICENSE_SSA
26-
fi
23+
2724
LOG_TARGET="FILE"
2825
LOG_LEVEL="TRACE"
2926
if [[ -z $GLUU_CI_CD_RUN ]]; then
@@ -145,10 +142,8 @@ EOF
145142
fi
146143

147144
echo "$EXT_IP $GLUU_FQDN" | sudo tee -a /etc/hosts > /dev/null
148-
ENCODED_GLUU_LICENSE_SSA=$(echo -n "$GLUU_LICENSE_SSA" | base64 -w0)
149145
cat << EOF >> override.yaml
150146
global:
151-
licenseSsa: $ENCODED_GLUU_LICENSE_SSA
152147
cloud:
153148
testEnviroment: true
154149
istio:

‎automation/startflexmonolithdemo.sh

-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ GLUU_FQDN=$1
55
GLUU_PERSISTENCE=$2
66
EXT_IP=$3
77
FLEX_BUILD_COMMIT=$4
8-
GLUU_LICENSE_SSA=$5
98

109
if [[ ! "$GLUU_FQDN" ]]; then
1110
read -rp "Enter Hostname [demoexample.gluu.org]: " GLUU_FQDN
@@ -18,9 +17,6 @@ if [[ -z $EXT_IP ]]; then
1817
EXT_IP=$(curl ipinfo.io/ip)
1918
fi
2019

21-
if [[ ! "$GLUU_LICENSE_SSA" ]]; then
22-
read -rp "Enter the License SSA provided by Gluu: " GLUU_LICENSE_SSA
23-
fi
2420
sudo apt-get update
2521
# Install Docker and Docker compose plugin
2622
sudo apt-get remove docker docker-engine docker.io containerd runc -y || echo "Docker doesn't exist..installing.."
@@ -69,8 +65,6 @@ if [[ "$FLEX_BUILD_COMMIT" ]]; then
6965

7066
python3 -c "from pathlib import Path ; import ruamel.yaml ; compose = Path('/tmp/flex/docker-flex-monolith/flex-ldap-compose.yml') ; yaml = ruamel.yaml.YAML() ; data = yaml.load(compose) ; data['services']['flex']['build'] = '.' ; del data['services']['flex']['image'] ; yaml.dump(data, compose)"
7167
fi
72-
ENCODED_GLUU_LICENSE_SSA=$(echo -n "$GLUU_LICENSE_SSA" | base64 -w0)
73-
python3 -c "from dockerfile_parse import DockerfileParser ; dfparser = DockerfileParser('/tmp/flex/docker-flex-monolith') ; dfparser.envs['CN_GLUU_LICENSE_SSA'] = '$ENCODED_GLUU_LICENSE_SSA'"
7468
# --
7569
if [[ $GLUU_PERSISTENCE == "MYSQL" ]]; then
7670
docker compose -f /tmp/flex/docker-flex-monolith/flex-mysql-compose.yml up -d

‎charts/gluu-all-in-one/README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@ Kubernetes: `>=v1.22.0-0`
2727
|-----|------|---------|-------------|
2828
| additionalAnnotations | object | `{}` | Additional annotations that will be added across the gateway in the format of {cert-manager.io/issuer: "letsencrypt-prod"} |
2929
| additionalLabels | object | `{}` | Additional labels that will be added across the gateway in the format of {mylabel: "myapp"} |
30-
| admin-ui | object | `{"enabled":true,"ingress":{"adminUiEnabled":false},"licenseSsa":""}` | Admin GUI for configuration of the auth-server |
30+
| admin-ui | object | `{"enabled":true,"ingress":{"adminUiEnabled":false}}` | Admin GUI for configuration of the auth-server |
3131
| admin-ui.enabled | bool | `true` | Boolean flag to enable/disable the admin-ui chart and admin ui config api plugin. |
3232
| admin-ui.ingress.adminUiEnabled | bool | `false` | Enable Admin UI endpoints in either istio or nginx ingress depending on users choice |
33-
| admin-ui.licenseSsa | string | `""` | Your organization needs to register with Gluu to trial Flex, after which you are issued a JWT placed here in which you can use to install. This must be base64 encoded. |
3433
| adminPassword | string | `"Test1234#"` | Admin password to log in to the UI. |
3534
| alb.ingress | bool | `false` | switches the service to Nodeport for ALB ingress |
3635
| auth-server | object | `{"appLoggers":{"auditStatsLogLevel":"INFO","auditStatsLogTarget":"FILE","authLogLevel":"INFO","authLogTarget":"STDOUT","enableStdoutLogPrefix":"true","httpLogLevel":"INFO","httpLogTarget":"FILE","ldapStatsLogLevel":"INFO","ldapStatsLogTarget":"FILE","persistenceDurationLogLevel":"INFO","persistenceDurationLogTarget":"FILE","persistenceLogLevel":"INFO","persistenceLogTarget":"FILE","scriptLogLevel":"INFO","scriptLogTarget":"FILE"},"authEncKeys":"RSA1_5 RSA-OAEP","authSigKeys":"RS256 RS384 RS512 ES256 ES384 ES512 PS256 PS384 PS512","enabled":true,"ingress":{"authServerEnabled":true,"authServerProtectedRegister":false,"authServerProtectedToken":false,"deviceCodeEnabled":true,"firebaseMessagingEnabled":true,"openidConfigEnabled":true,"u2fConfigEnabled":true,"uma2ConfigEnabled":true,"webdiscoveryEnabled":true,"webfingerEnabled":true},"lockEnabled":false}` | Parameters used globally across all services helm charts. |

‎charts/gluu-all-in-one/templates/deployment.yml

-6
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,6 @@ spec:
9090
{{- with .Values.volumeMounts }}
9191
{{- toYaml . | nindent 10 }}
9292
{{- end }}
93-
- mountPath: /etc/jans/conf/ssa
94-
name: license-ssa
95-
subPath: ssa
9693
{{ if or (eq .Values.configSecretAdapter "aws") (eq .Values.configAdapterName "aws") }}
9794
- mountPath: {{ .Values.cnAwsSharedCredentialsFile }}
9895
name: aws-shared-credential-file
@@ -168,9 +165,6 @@ spec:
168165
{{- with .Values.volumes }}
169166
{{- toYaml . | nindent 8 }}
170167
{{- end }}
171-
- name: license-ssa
172-
secret:
173-
secretName: {{ .Release.Name }}-license-ssa
174168
{{ if or (eq .Values.configSecretAdapter "aws") (eq .Values.configAdapterName "aws") }}
175169
- name: aws-shared-credential-file
176170
secret:

‎charts/gluu-all-in-one/templates/license-secrets.yaml

-17
This file was deleted.

‎charts/gluu-all-in-one/values.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,6 @@ auth-server-key-rotation:
314314
customScripts: [ ]
315315
# -- Admin GUI for configuration of the auth-server
316316
admin-ui:
317-
# -- Your organization needs to register with Gluu to trial Flex, after which you are issued a JWT placed here in which you can use to install. This must be base64 encoded.
318-
licenseSsa: ""
319317
# -- Boolean flag to enable/disable the admin-ui chart and admin ui config api plugin.
320318
enabled: true
321319
ingress:

0 commit comments

Comments
 (0)