Skip to content

Commit

Permalink
fix: envFrom indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
BrendanGalloway committed Jun 14, 2022
1 parent 4963ac9 commit 4da992f
Show file tree
Hide file tree
Showing 10 changed files with 71 additions and 72 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ spec:
- name: VARNISH_HOST
value: "varnish-{{ .Values.deployEnv }}-{{ .Release.Revision }}"
envFrom:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
- configMapRef:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
- configMapRef:
name: local-settings-{{ .Values.deployEnv }}
volumeMounts:
- mountPath: /app/sefaria/local_settings.py
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ spec:
- name: VARNISH_HOST
value: "varnish-{{ .Values.deployEnv }}-{{ .Release.Revision }}"
envFrom:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
- configMapRef:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
- configMapRef:
name: local-settings-{{ .Values.deployEnv }}
volumeMounts:
- mountPath: /app/sefaria/local_settings.py
Expand Down
14 changes: 7 additions & 7 deletions helm-chart/sefaria-project/templates/cronjob/metrics.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ spec:
- name: VARNISH_HOST
value: "varnish-{{ .Values.deployEnv }}-{{ .Release.Revision }}"
envFrom:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
- configMapRef:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
- configMapRef:
name: local-settings-{{ .Values.deployEnv }}
volumeMounts:
- mountPath: /app/sefaria/local_settings.py
Expand Down
16 changes: 8 additions & 8 deletions helm-chart/sefaria-project/templates/cronjob/mongo-backup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ spec:
- name: mongo-dumper
image: mongo:4.4
envFrom:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- configMapRef:
name: local-settings-{{ .Values.deployEnv }}
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- configMapRef:
name: local-settings-{{ .Values.deployEnv }}
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
volumeMounts:
- name: shared-volume
mountPath: /mongodumps/shared_volume
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ spec:
- name: VARNISH_HOST
value: "varnish-{{ .Values.deployEnv }}-{{ .Release.Revision }}"
envFrom:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
- configMapRef:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
- configMapRef:
name: local-settings-{{ .Values.deployEnv }}
volumeMounts:
- mountPath: /app/sefaria/local_settings.py
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ spec:
- name: VARNISH_HOST
value: "varnish-{{ .Values.deployEnv }}-{{ .Release.Revision }}"
envFrom:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
- configMapRef:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
- configMapRef:
name: local-settings-{{ .Values.deployEnv }}
volumeMounts:
- mountPath: /app/sefaria/local_settings.py
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ spec:
name: {{ template "sefaria.secrets.slackWebhook" . }}
key: slack-webhook
envFrom:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
- configMapRef:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
- configMapRef:
name: local-settings-{{ .Values.deployEnv }}
volumeMounts:
- mountPath: /app/sefaria/local_settings.py
Expand Down
15 changes: 7 additions & 8 deletions helm-chart/sefaria-project/templates/cronjob/sitemaps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ spec:
- name: VARNISH_HOST
value: "varnish-{{ .Values.deployEnv }}-{{ .Release.Revision }}"
envFrom:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
- configMapRef:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
- configMapRef:
name: local-settings-{{ .Values.deployEnv }}
volumeMounts:
- name: shared-volume
Expand All @@ -54,7 +54,6 @@ spec:
readOnly: true
command: ["bash"]
args: ["-c", "/app/run /app/scripts/generate_sitemaps.py -o /storage/"]

containers:
- name: file-uploader
image: google/cloud-sdk
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ spec:
- name: VARNISH_HOST
value: "varnish-{{ .Values.deployEnv }}-{{ .Release.Revision }}"
envFrom:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- configMapRef:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- configMapRef:
name: local-settings-{{ .Values.deployEnv }}
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
volumeMounts:
- mountPath: /app/sefaria/local_settings.py
name: local-settings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ spec:
- name: VARNISH_HOST
value: "varnish-{{ .Values.deployEnv }}-{{ .Release.Revision }}"
envFrom:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
- configMapRef:
- secretRef:
name: {{ .Values.secrets.localSettings.ref }}
optional: true
- secretRef:
name: local-settings-secrets-{{ .Values.deployEnv }}
optional: true
- configMapRef:
name: local-settings-{{ .Values.deployEnv }}
volumeMounts:
- mountPath: /app/sefaria/local_settings.py
Expand Down

0 comments on commit 4da992f

Please sign in to comment.