Skip to content

Fix 1password-credentials secret injection #193

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.

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion charts/connect/templates/connect-credentials.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
16 changes: 6 additions & 10 deletions charts/connect/templates/connect-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,6 @@ spec:
resources:
{{- toYaml .Values.connect.api.resources | nindent 12 }}
env:
- name: OP_SESSION
valueFrom:
secretKeyRef:
name: {{ .Values.connect.credentialsName }}
key: {{ .Values.connect.credentialsKey }}
- name: OP_BUS_PORT
value: "11220"
- name: OP_BUS_PEERS
Expand Down Expand Up @@ -113,6 +108,9 @@ spec:
- name: tls-cert
mountPath: /home/opuser/.op/certs
{{- end }}
- mountPath: /home/opuser/.op/1password-credentials.json
name: credentials
subPath: {{ .Values.connect.credentialsKey }}
- name: connect-sync
image: {{ .Values.connect.sync.imageRepository }}:{{ tpl .Values.connect.version . }}
imagePullPolicy: {{ .Values.connect.imagePullPolicy }}
Expand All @@ -125,11 +123,6 @@ spec:
env:
- name: OP_HTTP_PORT
value: "{{ .Values.connect.sync.httpPort }}"
- name: OP_SESSION
valueFrom:
secretKeyRef:
name: {{ .Values.connect.credentialsName }}
key: {{ .Values.connect.credentialsKey }}
- name: OP_BUS_PORT
value: "11221"
- name: OP_BUS_PEERS
Expand Down Expand Up @@ -157,6 +150,9 @@ spec:
volumeMounts:
- mountPath: /home/opuser/.op/data
name: {{ .Values.connect.dataVolume.name }}
- mountPath: /home/opuser/.op/1password-credentials.json
name: credentials
subPath: {{ .Values.connect.credentialsKey }}
{{- if .Values.connect.profiler.enabled }}
- name: profiler-data
image: alpine
Expand Down
Loading