Skip to content

Keymanager appids,baseids list rendering fixed #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lalithkota merged 1 commit into from
Jul 9, 2025
Merged

Keymanager appids,baseids list rendering fixed #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 14 additions & 22 deletions charts/keymanager/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
{{/*
Return the proper image name
*/}}
{{- define "keymanager.image" -}}
{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }}
{{- end -}}

{{/*
Return the proper Docker Image Registry Secret Names
*/}}
Expand All @@ -23,21 +16,6 @@ Create the name of the service account to use
{{- end -}}
{{- end -}}

{{/*
Compile all warnings into a single message.
*/}}
{{- define "keymanager.validateValues" -}}
{{- $messages := list -}}
{{- $messages := append $messages (include "keymanager.validateValues.foo" .) -}}
{{- $messages := append $messages (include "keymanager.validateValues.bar" .) -}}
{{- $messages := without $messages "" -}}
{{- $message := join "\n" $messages -}}

{{- if $message -}}
{{- printf "\nVALUES VALIDATION:\n%s" $message -}}
{{- end -}}
{{- end -}}

{{/*
Return podAnnotations
*/}}
Expand Down Expand Up @@ -121,3 +99,17 @@ args: []
{{- define "keymanager.postgresInit.command" -}}
{{- include "keymanager.commandBase" (dict "command" .Values.postgresInit.command "args" .Values.postgresInit.args "startUpCommand" .Values.postgresInit.startUpCommand "context" $) }}
{{- end -}}

{{/*
Join a list into comma seperated string after rendering template.
*/}}
{{- define "keymanager.joinListToStr" -}}
{{- $res := "" -}}
{{- $context := .context -}}
{{- $joiner := include "common.tplvalues.render" (dict "value" .joiner "context" $context) -}}
{{- range $i, $item := .value -}}
{{- $transformedItem := include "common.tplvalues.render" (dict "value" $item "context" $context) -}}
{{- $res = (gt $i 0) | ternary (printf "%s%s%s" $res $joiner $transformedItem) (printf "%s" $transformedItem) -}}
{{- end -}}
{{- $res -}}
{{- end -}}
2 changes: 1 addition & 1 deletion charts/keymanager/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ spec:
{{- end }}
containers:
- name: keymanager
image: {{ template "keymanager.image" . }}
image: {{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.lifecycleHooks }}
lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.lifecycleHooks "context" $) | nindent 12 }}
Expand Down
4 changes: 2 additions & 2 deletions charts/keymanager/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,8 +611,8 @@ envVars:
mosip_kernel_database_hostname: '{{ tpl .Values.postgresqlInstallationName $ }}'
mosip_kernel_database_port: '5432'

mosip_kernel_keymanager_autogen_appids_list: '{{ .Values.keygen.appIdsList | join "," }}'
mosip_kernel_keymanager_autogen_basekeys_list: '{{ .Values.keygen.baseKeysList | join "," }}'
mosip_kernel_keymanager_autogen_appids_list: '{{ include "keymanager.joinListToStr" (dict "value" .Values.keygen.appIdsList "joiner" "," "context" $) }}'
mosip_kernel_keymanager_autogen_basekeys_list: '{{ include "keymanager.joinListToStr" (dict "value" .Values.keygen.baseKeysList "joiner" "," "context" $) }}'

mosip_kernel_keymanager_hsm_keystore_type: '{{ tpl .Values.keystoreType $ }}'
mosip_kernel_keymanager_hsm_config_path: '{{ eq (tpl .Values.keystoreType $) "PKCS12" | ternary (tpl .Values.p12KeystorePath $) (tpl .Values.p11ConfigPath $) }}'
Expand Down