diff --git a/elster-transfer/templates/_helpers.tpl b/elster-transfer/templates/_helpers.tpl index 117e6b08bd0089a4e299bde5fdc56a9c8efe5746..caad293a12efbd80db7ef9b024ac9f5522467e58 100644 --- a/elster-transfer/templates/_helpers.tpl +++ b/elster-transfer/templates/_helpers.tpl @@ -60,4 +60,16 @@ app.kubernetes.io/namespace: {{ .Release.Namespace }} {{- $customList = append $customList (dict "name" $key "value" $value) }} {{- end -}} {{- $customList | toYaml -}} +{{- end -}} + + +{{- define "app.generateElsterTransferUserRessourceName" -}} +{{- $lowerUserName := . | lower }} +{{- $alphanumericUserName := (include "app.replaceAllNonAlphanumeric" $lowerUserName ) }} +{{- printf "%s-elster-transfer-user" ( $alphanumericUserName | trunc 20) }} +{{- end -}} + + +{{- define "app.replaceAllNonAlphanumeric" -}} +{{- trimAll "-" ( regexReplaceAll "[^a-zA-Z0-9-]" . "" ) }} {{- end -}} \ No newline at end of file diff --git a/elster-transfer/templates/elstertransfer_user_cr.yaml b/elster-transfer/templates/elstertransfer_user_cr.yaml index 9d2f5cc27b721d319747a7e086e0e6c654d7e230..73338622fe1a6ef240f5965551ae71c0db5acebc 100644 --- a/elster-transfer/templates/elstertransfer_user_cr.yaml +++ b/elster-transfer/templates/elstertransfer_user_cr.yaml @@ -1,14 +1,18 @@ + {{- if not .Values.disableOzgElsterTransferOperator -}} +{{ range $user := ((.Values.CR).etr_users | default list) }} +--- apiVersion: operator.ozgcloud.de/v1 kind: OzgCloudElsterTransferUser metadata: - name: {{ include "app.namespace" . }}-user - namespace: {{ include "app.namespace" . }} + name: {{ include "app.generateElsterTransferUserRessourceName" (deepCopy $user.login) }} + namespace: {{ include "app.namespace" $ }} spec: - keep_after_delete: {{ (.Values.user).keep_after_delete | default false }} - login: {{ (.Values.user).name }} - role: {{ (.Values.user).role | default "USER" }} - credentials: {{ (.Values.user).credentials }} - group: {{ (.Values.user).group | default "Administratoren" }} -{{- end }} + keep_after_delete: {{ $.Values.CR.keep_after_delete | default false }} + login: {{ $user.login }} + role: {{ $user.role | default "USER" }} + credentials: {{ $user.credentials }} + group: {{ $user.group | default "Administratoren" }} +{{ end }} +{{- end -}} \ No newline at end of file