Skip to content

Commit 8a738dd

Browse files
authored
Merge pull request #1587 from porter-dev/ym/fix_cloudsql_proxy_volume_name
fix: cloud sql proxy sidecar creds volume naming
2 parents cb2916a + 307499f commit 8a738dd

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

applications/job/templates/cronjob.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,14 +247,14 @@ spec:
247247
securityContext:
248248
runAsNonRoot: true
249249
volumeMounts:
250-
- name: "sidecar-volume-{{ include "docker-template.fullname" . }}"
250+
- name: "cloud-sql-proxy-service-account-secret"
251251
mountPath: /secrets/
252252
readOnly: true
253253
{{ end }}
254254
{{ if or .Values.cloudsql.enabled .Values.fileSecretMounts.enabled .Values.pvc.enabled}}
255255
volumes:
256256
{{ if .Values.cloudsql.enabled }}
257-
- name: "sidecar-volume-{{ include "docker-template.fullname" . }}"
257+
- name: "cloud-sql-proxy-service-account-secret"
258258
secret:
259259
secretName: "{{ include "cloudsql.serviceAccountJSONSecret" . }}"
260260
{{ end }}

applications/web/templates/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ spec:
474474
memory: 128Mi
475475
cpu: 0.1
476476
volumeMounts:
477-
- name: "sidecar-volume-{{ include "docker-template.fullname" . }}"
477+
- name: "cloud-sql-proxy-service-account-secret"
478478
mountPath: /secrets/
479479
readOnly: true
480480
{{ end }}
@@ -540,7 +540,7 @@ spec:
540540
sizeLimit: 4Gi
541541
{{ end }}
542542
{{ if .Values.cloudsql.enabled }}
543-
- name: "sidecar-volume-{{ include "docker-template.fullname" . }}"
543+
- name: "cloud-sql-proxy-service-account-secret"
544544
secret:
545545
secretName: "{{ include "cloudsql.serviceAccountJSONSecret" . }}"
546546
{{ end }}

applications/worker/templates/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ spec:
361361
securityContext:
362362
runAsNonRoot: true
363363
volumeMounts:
364-
- name: "sidecar-volume-{{ include "docker-template.fullname" . }}"
364+
- name: "cloud-sql-proxy-service-account-secret"
365365
mountPath: /secrets/
366366
readOnly: true
367367
{{ end }}
@@ -421,7 +421,7 @@ spec:
421421
name: datadog-dsd-socket
422422
{{ end }}
423423
{{ if .Values.cloudsql.enabled }}
424-
- name: "sidecar-volume-{{ include "docker-template.fullname" . }}"
424+
- name: "cloud-sql-proxy-service-account-secret"
425425
secret:
426426
secretName: "{{ include "cloudsql.serviceAccountJSONSecret" . }}"
427427
{{ end }}

0 commit comments

Comments
 (0)