fix keycloak -> keycloak.internal changes

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>

Author: butonic

charts/opencloud/README.md

@@ -408,7 +408,7 @@ The following HTTPRoutes are created when `httpRoute.enabled` is set to `true`:
    - Port: 9200
    - Headers: Removes Permissions-Policy header to prevent browser console errors
 
-2. **Keycloak HTTPRoute** (when `keycloak.enabled` is `true`):
+2. **Keycloak HTTPRoute** (when `keycloak.internal.enabled` is `true`):
    - Hostname: `global.domain.keycloak`
    - Service: `{{ release-name }}-keycloak`
    - Port: 8080

charts/opencloud/templates/NOTES.txt

@@ -28,12 +28,12 @@ The following services have been deployed:
    - 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 }}
    - 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 }}
 
-{{- if .Values.keycloak.enabled }}
+{{- if .Values.keycloak.internal.enabled }}
 2. Keycloak (Authentication):
    - Service: {{ include "opencloud.keycloak.fullname" . }}
    - Port: 8080
-   - Username: {{ .Values.keycloak.adminUser }}
-   - Password: {{ .Values.keycloak.adminPassword }}
+   - Username: {{ .Values.keycloak.internal.adminUser }}
+   - Password: {{ .Values.keycloak.internal.adminPassword }}
 {{- end }}
 
 {{- if .Values.opencloud.storage.s3.internal.enabled }}
@@ -60,7 +60,7 @@ All HTTPRoutes are configured to use the Gateway named "{{ .Values.httpRoute.gat
 
 Make sure the Gateway exists and is properly configured to accept traffic for the following domains:
 - OpenCloud: {{ include "opencloud.domain" . }} (Service: {{ include "opencloud.opencloud.fullname" . }}, Port: 9200)
-{{- if .Values.keycloak.enabled }}
+{{- if .Values.keycloak.internal.enabled }}
 - Keycloak: {{ include "opencloud.keycloak.domain" . }} (Service: {{ include "opencloud.keycloak.fullname" . }}, Port: 8080)
 {{- end }}
 {{- if .Values.opencloud.storage.s3.internal.enabled }}
@@ -76,7 +76,7 @@ to expose these services externally.
 
 Example domains for your ingress configuration:
 - OpenCloud: {{ include "opencloud.domain" . }} (Service: {{ include "opencloud.opencloud.fullname" . }}, Port: 9200)
-{{- if .Values.keycloak.enabled }}
+{{- if .Values.keycloak.internal.enabled }}
 - Keycloak: {{ include "opencloud.keycloak.domain" . }} (Service: {{ include "opencloud.keycloak.fullname" . }}, Port: 8080)
 {{- end }}
 {{- if .Values.opencloud.storage.s3.internal.enabled }}

charts/opencloud/templates/gateway/gateway.yaml

@@ -42,7 +42,7 @@ spec:
           selector:
             matchLabels:
               kubernetes.io/metadata.name: {{ .Values.httpRoute.gateway.namespace | default .Release.Namespace }}
-    {{- if .Values.keycloak.enabled }}
+    {{- if .Values.keycloak.internal.enabled }}
     {{- if .Values.global.tls.enabled }}
     - name: keycloak-https
     {{- else }}

charts/opencloud/templates/keycloak/deployment.yaml

@@ -74,17 +74,17 @@ spec:
             - name: KEYCLOAK_ADMIN
               valueFrom:
                 secretKeyRef:
-                  name: {{- if .Values.keycloak.existingSecret }}
-                          {{ .Values.keycloak.existingSecret }}
+                  name: {{- if .Values.keycloak.internal.existingSecret }}
+                          {{ .Values.keycloak.internal.existingSecret }}
                         {{- else }}
                           {{ include "opencloud.keycloak.fullname" . }}
                         {{- end }}
                   key: adminUser
             - name: KEYCLOAK_ADMIN_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{- if .Values.keycloak.existingSecret }}
-                          {{ .Values.keycloak.existingSecret }}
+                  name: {{- if .Values.keycloak.internal.existingSecret }}
+                          {{ .Values.keycloak.internal.existingSecret }}
                         {{- else }}
                           {{ include "opencloud.keycloak.fullname" . }}
                         {{- end }}

charts/opencloud/templates/keycloak/secrets.yaml

@@ -1,10 +1,10 @@
-{{- if and (not .Values.keycloak.existingSecret) .Values.keycloak.internal.enabled }}
+{{- if and (not .Values.keycloak.internal.existingSecret) .Values.keycloak.internal.enabled }}
 apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "opencloud.keycloak.fullname" . }}
 type: Opaque
 stringData:
-  adminUser: {{ .Values.keycloak.adminUser }}
-  adminPassword: {{ .Values.keycloak.adminPassword }}
+  adminUser: {{ .Values.keycloak.internal.adminUser }}
+  adminPassword: {{ .Values.keycloak.internal.adminPassword }}
 {{- end }}

charts/opencloud/values.yaml

@@ -112,11 +112,11 @@ keycloak:
     existingSecret: ""
 
     # Admin user
-    # ignored if keycloak.existingSecret is not empty string
+    # ignored if keycloak.internal.existingSecret is not empty string
     adminUser: admin
 
     # Admin password
-    # ignored if keycloak.existingSecret is not empty string
+    # ignored if keycloak.internal.existingSecret is not empty string
     adminPassword: admin
 
     # Keycloak realm