[bitnami/keycloak] add annotation for auto-generated secrets (#19706)

* add annotation for auto-generated secrets

Signed-off-by: Ahmed AbouZaid <6760103+aabouzaid@users.noreply.github.com>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

* swap the order in the annotations

Signed-off-by: Ahmed AbouZaid <6760103+aabouzaid@users.noreply.github.com>

* add newline at the end

Signed-off-by: Ahmed AbouZaid <6760103+aabouzaid@users.noreply.github.com>

* Update Chart.yaml

Signed-off-by: Andrés Bono <andresbono@vmware.com>

---------

Signed-off-by: Ahmed AbouZaid <6760103+aabouzaid@users.noreply.github.com>
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
Signed-off-by: Andrés Bono <andresbono@vmware.com>
Co-authored-by: Bitnami Containers <bitnami-bot@vmware.com>
Co-authored-by: Andrés Bono <andresbono@vmware.com>
This commit is contained in:
Ahmed AbouZaid
2023-10-17 09:44:02 +02:00
committed by GitHub
parent bae41e60e8
commit 25087bcf63
5 changed files with 14 additions and 7 deletions

View File

@@ -33,4 +33,4 @@ maintainers:
name: keycloak name: keycloak
sources: sources:
- https://github.com/bitnami/charts/tree/main/bitnami/keycloak - https://github.com/bitnami/charts/tree/main/bitnami/keycloak
version: 17.0.4 version: 17.1.0

View File

@@ -95,6 +95,7 @@ The command removes all the Kubernetes components associated with the chart and
| `auth.adminPassword` | Keycloak administrator password for the new user | `""` | | `auth.adminPassword` | Keycloak administrator password for the new user | `""` |
| `auth.existingSecret` | Existing secret containing Keycloak admin password | `""` | | `auth.existingSecret` | Existing secret containing Keycloak admin password | `""` |
| `auth.passwordSecretKey` | Key where the Keycloak admin password is being stored inside the existing secret. | `""` | | `auth.passwordSecretKey` | Key where the Keycloak admin password is being stored inside the existing secret. | `""` |
| `auth.annotations` | Additional custom annotations for Keycloak auth secret object | `{}` |
| `tls.enabled` | Enable TLS encryption. Required for HTTPs traffic. | `false` | | `tls.enabled` | Enable TLS encryption. Required for HTTPs traffic. | `false` |
| `tls.autoGenerated` | Generate automatically self-signed TLS certificates. Currently only supports PEM certificates | `false` | | `tls.autoGenerated` | Generate automatically self-signed TLS certificates. Currently only supports PEM certificates | `false` |
| `tls.existingSecret` | Existing secret containing the TLS certificates per Keycloak replica | `""` | | `tls.existingSecret` | Existing secret containing the TLS certificates per Keycloak replica | `""` |
@@ -335,6 +336,7 @@ The command removes all the Kubernetes components associated with the chart and
| `externalDatabase.existingSecretUserKey` | Name of an existing secret key containing the database user | `""` | | `externalDatabase.existingSecretUserKey` | Name of an existing secret key containing the database user | `""` |
| `externalDatabase.existingSecretDatabaseKey` | Name of an existing secret key containing the database name | `""` | | `externalDatabase.existingSecretDatabaseKey` | Name of an existing secret key containing the database name | `""` |
| `externalDatabase.existingSecretPasswordKey` | Name of an existing secret key containing the database credentials | `""` | | `externalDatabase.existingSecretPasswordKey` | Name of an existing secret key containing the database credentials | `""` |
| `externalDatabase.annotations` | Additional custom annotations for external database secret object | `{}` |
### Keycloak Cache parameters ### Keycloak Cache parameters

View File

@@ -9,9 +9,9 @@ kind: Secret
metadata: metadata:
name: {{ printf "%s-externaldb" .Release.Name }} name: {{ printf "%s-externaldb" .Release.Name }}
namespace: {{ .Release.Namespace | quote }} namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
{{- if .Values.commonAnnotations }} {{- if or .Values.externalDatabase.annotations .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }} annotations: {{- include "common.tplvalues.merge" (dict "values" (list .Values.externalDatabase.annotations .Values.commonAnnotations) "context" $) | nindent 4 }}
{{- end }} {{- end }}
type: Opaque type: Opaque
data: data:

View File

@@ -9,10 +9,10 @@ kind: Secret
metadata: metadata:
name: {{ printf "%s" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }} name: {{ printf "%s" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
namespace: {{ include "common.names.namespace" . | quote }} namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
app.kubernetes.io/component: keycloak app.kubernetes.io/component: keycloak
{{- if .Values.commonAnnotations }} {{- if or .Values.auth.annotations .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} annotations: {{- include "common.tplvalues.merge" (dict "values" (list .Values.auth.annotations .Values.commonAnnotations) "context" $) | nindent 4 }}
{{- end }} {{- end }}
type: Opaque type: Opaque
data: data:

View File

@@ -128,6 +128,9 @@ auth:
## @param auth.passwordSecretKey Key where the Keycloak admin password is being stored inside the existing secret. ## @param auth.passwordSecretKey Key where the Keycloak admin password is being stored inside the existing secret.
## ##
passwordSecretKey: "" passwordSecretKey: ""
## @param auth.annotations Additional custom annotations for Keycloak auth secret object
##
annotations: {}
## HTTPS settings ## HTTPS settings
## ref: https://github.com/bitnami/containers/tree/main/bitnami/keycloak#tls-encryption ## ref: https://github.com/bitnami/containers/tree/main/bitnami/keycloak#tls-encryption
@@ -1042,6 +1045,7 @@ postgresql:
## @param externalDatabase.existingSecretUserKey Name of an existing secret key containing the database user ## @param externalDatabase.existingSecretUserKey Name of an existing secret key containing the database user
## @param externalDatabase.existingSecretDatabaseKey Name of an existing secret key containing the database name ## @param externalDatabase.existingSecretDatabaseKey Name of an existing secret key containing the database name
## @param externalDatabase.existingSecretPasswordKey Name of an existing secret key containing the database credentials ## @param externalDatabase.existingSecretPasswordKey Name of an existing secret key containing the database credentials
## @param externalDatabase.annotations Additional custom annotations for external database secret object
## ##
externalDatabase: externalDatabase:
host: "" host: ""
@@ -1055,6 +1059,7 @@ externalDatabase:
existingSecretUserKey: "" existingSecretUserKey: ""
existingSecretDatabaseKey: "" existingSecretDatabaseKey: ""
existingSecretPasswordKey: "" existingSecretPasswordKey: ""
annotations: {}
## @section Keycloak Cache parameters ## @section Keycloak Cache parameters