Skip to content

Commit cda502e

Browse files
dennispanadamjensenbot
authored andcommitted
Support getting aws credentials from existing secret instead of clear text in values file
1 parent 888bcb1 commit cda502e

File tree

3 files changed

+26
-0
lines changed

3 files changed

+26
-0
lines changed

deployments/liqo/templates/liqo-auth-deployment.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,28 @@ spec:
110110
{{- if .Values.awsConfig.accessKeyId }}
111111
- name: ACCESS_KEY_ID
112112
valueFrom:
113+
{{- if .Values.awsConfig.accessKeyId.secretKeyRef }}
114+
secretKeyRef:
115+
name: {{ .Values.awsConfig.accessKeyId.secretKeyRef.name }}
116+
key: {{ .Values.awsConfig.accessKeyId.secretKeyRef.key }}
117+
{{- else }}
113118
secretKeyRef:
114119
name: {{ include "liqo.prefixedName" $awsConfig }}
115120
key: ACCESS_KEY_ID
121+
{{- end }}
116122
{{- end }}
117123
{{- if .Values.awsConfig.secretAccessKey }}
118124
- name: SECRET_ACCESS_KEY
119125
valueFrom:
126+
{{- if .Values.awsConfig.secretAccessKey.secretKeyRef }}
127+
secretKeyRef:
128+
name: {{ .Values.awsConfig.secretAccessKey.secretKeyRef.name }}
129+
key: {{ .Values.awsConfig.secretAccessKey.secretKeyRef.key }}
130+
{{- else }}
120131
secretKeyRef:
121132
name: {{ include "liqo.prefixedName" $awsConfig }}
122133
key: SECRET_ACCESS_KEY
134+
{{- end }}
123135
{{- end }}
124136
resources: {{- toYaml .Values.auth.pod.resources | nindent 12 }}
125137
volumeMounts:

deployments/liqo/templates/liqo-aws-credentials.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{{- $awsConfig := (merge (dict "name" "aws-config" "module" "aws-config") .) -}}
33

44
{{- if and .Values.awsConfig.accessKeyId .Values.awsConfig.secretAccessKey }}
5+
{{- if not (or (.Values.awsConfig.accessKeyId.secretKeyRef) (.Values.awsConfig.secretAccessKey.secretKeyRef)) }}
56

67
apiVersion: v1
78
kind: Secret
@@ -14,3 +15,4 @@ data:
1415
SECRET_ACCESS_KEY: {{ .Values.awsConfig.secretAccessKey | b64enc }}
1516

1617
{{- end }}
18+
{{- end }}

deployments/liqo/values.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,18 @@ awsConfig:
600600
region: ""
601601
# -- Name of the EKS cluster.
602602
clusterName: ""
603+
# To use an existing secret instead of setting the secrets in values file:
604+
# awsConfig:
605+
# accessKeyId:
606+
# secretKeyRef:
607+
# name: "your-secret-name"
608+
# key: "your-secret-key"
609+
# secretAccessKey
610+
# secretKeyRef:
611+
# name: "your-secret-name"
612+
# key: "your-secret-key"
613+
# region: "your-region"
614+
# clusterName: "your-cluster-name"
603615

604616
# OpenShift-specific configurations.
605617
openshiftConfig:

0 commit comments

Comments
 (0)