Skip to content

Commit

Permalink
Format multi-secrets better
Browse files Browse the repository at this point in the history
  • Loading branch information
ainmosni committed May 31, 2023
1 parent 540221d commit e60eead
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions charts/ocis/templates/idm/secret.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{{- if or (not .Values.secretRefs.ldapCertRef) (ne .Values.features.externalUserManagement "enabled") }}
{{ if or (not .Values.secretRefs.ldapCertRef) (ne .Values.features.externalUserManagement "enabled") }}
{{- $_ := set . "ldapCA" (genCA "ldap-ca" 365) }}
{{- $params := (dict)}}
{{- $_ := set $params "ldap-ca.crt" .ldapCA.Cert }}
{{- include "ocis.secret" (dict "scope" . "name" "ldap-ca" "params" $params)}}
{{- end }}
---
{{- if or (not .Values.secretRefs.ldapCaRef) (ne .Values.features.externalUserManagement "enabled") }}
{{ if or (not .Values.secretRefs.ldapCaRef) (ne .Values.features.externalUserManagement "enabled") }}
{{- $params := (dict)}}
{{- $ldapCert := genSignedCert "idm" nil (list "idm") 365 .ldapCA }}
{{- $_ := set $params "ldap.key" $ldapCert.Key }}
{{- $_ := set $params "ldap.crt" $ldapCert.Cert }}
{{- include "ocis.secret" (dict "scope" . "name" "ldap-cert" "params" $params)}}
{{- end }}
---
{{- if not .Values.secretRefs.ldapSecretRef }}
{{ if not .Values.secretRefs.ldapSecretRef }}
{{- $params := (dict)}}
{{- $_ := set $params "reva-ldap-bind-password" (randAlphaNum 30) }}
{{- $_ := set $params "idp-ldap-bind-password" (randAlphaNum 30) }}
Expand Down
6 changes: 3 additions & 3 deletions charts/ocis/templates/idp/secret.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{{- if and (not .Values.externalUserManagement) (not .Values.secretRefs.adminUserSecretRef) }}
{{ if and (not .Values.externalUserManagement) (not .Values.secretRefs.adminUserSecretRef) }}
{{- $params := (dict)}}
{{- $_ := set $params "encryption.key" (randAscii 32) }}
{{- $_ := set $params "private-key.pem" (genPrivateKey "rsa") }}
{{- include "ocis.secret" (dict "scope" . "name" "idp-secrets" "params" $params)}}
{{- end }}
---
{{- if not .Values.secretRefs.jwtSecretRef }}
{{ if not .Values.secretRefs.jwtSecretRef }}
{{- $params := (dict)}}
{{- $_ := set $params "jwt-secret" (randAlphaNum 30) }}
{{- include "ocis.secret" (dict "scope" . "name" "jwt-secret" "params" $params)}}
{{- end }}
---
{{- if and (not .Values.externalUserManagement) (not .Values.secretRefs.idpSecretRef) }}
{{ if and (not .Values.externalUserManagement) (not .Values.secretRefs.idpSecretRef) }}
{{- $params := (dict)}}
{{- $_ := set $params "user-id" uuidv4 }}
{{- $_ := set $params "password" (randAlphaNum 10) }}
Expand Down
6 changes: 3 additions & 3 deletions charts/ocis/templates/storagesystem/secret.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{{- if or (not .Values.secretRefs.storagesystemJwtSecretRef) }}
{{ if or (not .Values.secretRefs.storagesystemJwtSecretRef) }}
{{- $params := (dict)}}
{{- $_ := set $params "storage-system-jwt-secret" (randAlphaNum 30) }}
{{- include "ocis.secret" (dict "scope" . "name" "storage-system-jwt-secret" "params" $params)}}
{{- end }}
---
{{- if or (not .Values.secretRefs.storagesystemSecretRef) }}
{{ if or (not .Values.secretRefs.storagesystemSecretRef) }}
{{- $params := (dict)}}
{{- $_ := set $params "api-key" (randAlphaNum 30) }}
{{- $_ := set $params "user-id" uuidv4 }}
{{- include "ocis.secret" (dict "scope" . "name" "storage-system" "params" $params)}}
{{- end }}
---
{{- if or (not .Values.secretRefs.transferSecretSecretRef) }}
{{ if or (not .Values.secretRefs.transferSecretSecretRef) }}
{{- $params := (dict)}}
{{- $_ := set $params "transfer-secret" (randAlphaNum 30) }}
{{- include "ocis.secret" (dict "scope" . "name" "transfer-secret" "params" $params)}}
Expand Down

0 comments on commit e60eead

Please sign in to comment.