Skip to content

Commit 3455494

Browse files
butonicbutonic
committed
fix keycloak -> keycloak.internal changes
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
1 parent 6ad642b commit 3455494

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

‎charts/opencloud/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ The following HTTPRoutes are created when `httpRoute.enabled` is set to `true`:
408408
- Port: 9200
409409
- Headers: Removes Permissions-Policy header to prevent browser console errors
410410

411-
2. **Keycloak HTTPRoute** (when `keycloak.enabled` is `true`):
411+
2. **Keycloak HTTPRoute** (when `keycloak.internal.enabled` is `true`):
412412
- Hostname: `global.domain.keycloak`
413413
- Service: `{{ release-name }}-keycloak`
414414
- Port: 8080

‎charts/opencloud/templates/NOTES.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ The following services have been deployed:
2828
- S3 Storage: {{ if .Values.opencloud.storage.s3.external.enabled }}{{ .Values.opencloud.storage.s3.external.endpoint }}{{ else if .Values.opencloud.storage.s3.internal.enabled }}MinIO ({{ include "opencloud.minio.fullname" . }}){{ else }}Not configured{{ end }}
2929
- S3 Bucket: {{ if .Values.opencloud.storage.s3.external.enabled }}{{ .Values.opencloud.storage.s3.external.bucket }}{{ else if .Values.opencloud.storage.s3.internal.enabled }}{{ .Values.opencloud.storage.s3.internal.bucketName }}{{ else }}Not configured{{ end }}
3030

31-
{{- if .Values.keycloak.enabled }}
31+
{{- if .Values.keycloak.internal.enabled }}
3232
2. Keycloak (Authentication):
3333
- Service: {{ include "opencloud.keycloak.fullname" . }}
3434
- Port: 8080
35-
- Username: {{ .Values.keycloak.adminUser }}
36-
- Password: {{ .Values.keycloak.adminPassword }}
35+
- Username: {{ .Values.keycloak.internal.adminUser }}
36+
- Password: {{ .Values.keycloak.internal.adminPassword }}
3737
{{- end }}
3838

3939
{{- if .Values.opencloud.storage.s3.internal.enabled }}
@@ -60,7 +60,7 @@ All HTTPRoutes are configured to use the Gateway named "{{ .Values.httpRoute.gat
6060

6161
Make sure the Gateway exists and is properly configured to accept traffic for the following domains:
6262
- OpenCloud: {{ include "opencloud.domain" . }} (Service: {{ include "opencloud.opencloud.fullname" . }}, Port: 9200)
63-
{{- if .Values.keycloak.enabled }}
63+
{{- if .Values.keycloak.internal.enabled }}
6464
- Keycloak: {{ include "opencloud.keycloak.domain" . }} (Service: {{ include "opencloud.keycloak.fullname" . }}, Port: 8080)
6565
{{- end }}
6666
{{- if .Values.opencloud.storage.s3.internal.enabled }}
@@ -76,7 +76,7 @@ to expose these services externally.
7676

7777
Example domains for your ingress configuration:
7878
- OpenCloud: {{ include "opencloud.domain" . }} (Service: {{ include "opencloud.opencloud.fullname" . }}, Port: 9200)
79-
{{- if .Values.keycloak.enabled }}
79+
{{- if .Values.keycloak.internal.enabled }}
8080
- Keycloak: {{ include "opencloud.keycloak.domain" . }} (Service: {{ include "opencloud.keycloak.fullname" . }}, Port: 8080)
8181
{{- end }}
8282
{{- if .Values.opencloud.storage.s3.internal.enabled }}

‎charts/opencloud/templates/gateway/gateway.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
selector:
4343
matchLabels:
4444
kubernetes.io/metadata.name: {{ .Values.httpRoute.gateway.namespace | default .Release.Namespace }}
45-
{{- if .Values.keycloak.enabled }}
45+
{{- if .Values.keycloak.internal.enabled }}
4646
{{- if .Values.global.tls.enabled }}
4747
- name: keycloak-https
4848
{{- else }}

‎charts/opencloud/templates/keycloak/deployment.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,17 @@ spec:
7474
- name: KEYCLOAK_ADMIN
7575
valueFrom:
7676
secretKeyRef:
77-
name: {{- if .Values.keycloak.existingSecret }}
78-
{{ .Values.keycloak.existingSecret }}
77+
name: {{- if .Values.keycloak.internal.existingSecret }}
78+
{{ .Values.keycloak.internal.existingSecret }}
7979
{{- else }}
8080
{{ include "opencloud.keycloak.fullname" . }}
8181
{{- end }}
8282
key: adminUser
8383
- name: KEYCLOAK_ADMIN_PASSWORD
8484
valueFrom:
8585
secretKeyRef:
86-
name: {{- if .Values.keycloak.existingSecret }}
87-
{{ .Values.keycloak.existingSecret }}
86+
name: {{- if .Values.keycloak.internal.existingSecret }}
87+
{{ .Values.keycloak.internal.existingSecret }}
8888
{{- else }}
8989
{{ include "opencloud.keycloak.fullname" . }}
9090
{{- end }}

‎charts/opencloud/templates/keycloak/secrets.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
{{- if and (not .Values.keycloak.existingSecret) .Values.keycloak.internal.enabled }}
1+
{{- if and (not .Values.keycloak.internal.existingSecret) .Values.keycloak.internal.enabled }}
22
apiVersion: v1
33
kind: Secret
44
metadata:
55
name: {{ include "opencloud.keycloak.fullname" . }}
66
type: Opaque
77
stringData:
8-
adminUser: {{ .Values.keycloak.adminUser }}
9-
adminPassword: {{ .Values.keycloak.adminPassword }}
8+
adminUser: {{ .Values.keycloak.internal.adminUser }}
9+
adminPassword: {{ .Values.keycloak.internal.adminPassword }}
1010
{{- end }}

‎charts/opencloud/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@ keycloak:
112112
existingSecret: ""
113113

114114
# Admin user
115-
# ignored if keycloak.existingSecret is not empty string
115+
# ignored if keycloak.internal.existingSecret is not empty string
116116
adminUser: admin
117117

118118
# Admin password
119-
# ignored if keycloak.existingSecret is not empty string
119+
# ignored if keycloak.internal.existingSecret is not empty string
120120
adminPassword: admin
121121

122122
# Keycloak realm

0 commit comments

Comments
 (0)