Skip to content

Commit ec5d2cd

Browse files
donchNicolasgouze
authored andcommitted
fix(chart): align secret name between kuik and minio to avoid inconsistency
1 parent bdf4730 commit ec5d2cd

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

helm/kube-image-keeper/templates/minio-registry-users.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{{- if .Values.minio.enabled }}
22

3-
{{- $secretName := printf "%s-%s" (include "kube-image-keeper.fullname" .) "minio-passwords" }}
3+
{{- $secretName := "kube-image-keeper-minio-registry-passwords" }}
44
{{- $secretData := (get (lookup "v1" "Secret" .Release.Namespace $secretName) "data") | default dict }}
55
# set passwords to existing secret data or generate random ones when they do not exist
66
{{- $password := (get $secretData "registry" | b64dec) | default (randAlphaNum 32) }}
77

88
apiVersion: v1
99
kind: Secret
1010
metadata:
11-
name: {{ include "kube-image-keeper.fullname" . }}-minio-registry-users
11+
name: kube-image-keeper-minio-registry-users
1212
annotations:
1313
"helm.sh/resource-policy": "keep"
1414
type: Opaque
@@ -22,7 +22,7 @@ stringData:
2222
apiVersion: v1
2323
kind: Secret
2424
metadata:
25-
name: {{ include "kube-image-keeper.fullname" . }}-minio-registry-passwords
25+
name: kube-image-keeper-minio-registry-passwords
2626
annotations:
2727
"helm.sh/resource-policy": "keep"
2828
type: Opaque

helm/kube-image-keeper/templates/registry-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ spec:
7474
value: "true"
7575
{{- end }}
7676
{{- end }}
77-
{{ $s3KeysSecretName := .Values.registry.persistence.s3ExistingSecret | default (print (include "kube-image-keeper.fullname" . ) "-s3-registry-keys") }}
77+
{{ $s3KeysSecretName := .Values.registry.persistence.s3ExistingSecret | default "kube-image-keeper-s3-registry-keys" }}
7878
- name: REGISTRY_STORAGE_S3_ACCESSKEY
7979
valueFrom:
8080
secretKeyRef:

helm/kube-image-keeper/templates/s3-registry-keys.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
apiVersion: v1
33
kind: Secret
44
metadata:
5-
name: {{ include "kube-image-keeper.fullname" . }}-s3-registry-keys
5+
name: kube-image-keeper-s3-registry-keys
66
annotations:
77
"helm.sh/resource-policy": "keep"
88
type: Opaque
99
stringData:
1010
{{- if .Values.minio.enabled }}
11-
{{- $secretName := printf "%s-%s" (include "kube-image-keeper.fullname" .) "s3-registry-keys" }}
11+
{{- $secretName := "kube-image-keeper-s3-registry-keys" }}
1212
{{- $secretData := (get (lookup "v1" "Secret" .Release.Namespace $secretName) "data") | default dict }}
1313
# set $accessKey $secretKey to existing secret data or generate random ones when they do not exist
1414
{{- $accessKey := (get $secretData "accessKey" | b64dec) | default (randAlphaNum 16) }}

0 commit comments

Comments
 (0)