diff --git a/charts/connect/templates/connect-credentials.yaml b/charts/connect/templates/connect-credentials.yaml index eeb17bd..665c191 100644 --- a/charts/connect/templates/connect-credentials.yaml +++ b/charts/connect/templates/connect-credentials.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/component: connect {{- include "onepassword-connect.labels" . | nindent 4 }} type: Opaque -stringData: +data: {{ .Values.connect.credentialsKey }}: |- {{- if (.Values.connect.credentials) }} {{ .Values.connect.credentials | b64enc | indent 2 }} diff --git a/charts/connect/templates/connect-deployment.yaml b/charts/connect/templates/connect-deployment.yaml index 22c57d5..e14a4f2 100644 --- a/charts/connect/templates/connect-deployment.yaml +++ b/charts/connect/templates/connect-deployment.yaml @@ -43,6 +43,9 @@ spec: - name: credentials secret: secretName: {{ .Values.connect.credentialsName }} + items: + - key: {{ .Values.connect.credentialsKey }} + path: 1password-credentials.json {{- if .Values.connect.tls.enabled }} - name: tls-cert secret: @@ -62,10 +65,7 @@ spec: {{- toYaml .Values.connect.api.resources | nindent 12 }} env: - name: OP_SESSION - valueFrom: - secretKeyRef: - name: {{ .Values.connect.credentialsName }} - key: {{ .Values.connect.credentialsKey }} + value: /home/opuser/.op/1password-credentials.json - name: OP_BUS_PORT value: "11220" - name: OP_BUS_PEERS @@ -109,6 +109,9 @@ spec: volumeMounts: - mountPath: /home/opuser/.op/data name: {{ .Values.connect.dataVolume.name }} + - name: credentials + mountPath: /home/opuser/.op/1password-credentials.json + subPath: 1password-credentials.json {{- if .Values.connect.tls.enabled }} - name: tls-cert mountPath: /home/opuser/.op/certs @@ -126,10 +129,7 @@ spec: - name: OP_HTTP_PORT value: "{{ .Values.connect.sync.httpPort }}" - name: OP_SESSION - valueFrom: - secretKeyRef: - name: {{ .Values.connect.credentialsName }} - key: {{ .Values.connect.credentialsKey }} + value: /home/opuser/.op/1password-credentials.json - name: OP_BUS_PORT value: "11221" - name: OP_BUS_PEERS @@ -157,6 +157,9 @@ spec: volumeMounts: - mountPath: /home/opuser/.op/data name: {{ .Values.connect.dataVolume.name }} + - name: credentials + mountPath: /home/opuser/.op/1password-credentials.json + subPath: 1password-credentials.json {{- if .Values.connect.profiler.enabled }} - name: profiler-data image: alpine