Skip to content

use parens to prevent exceptions with newer helm binaries #338

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.

Sign up for GitHub

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

Draft
ewollesen wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

use parens to prevent exceptions with newer helm binaries #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions charts/tidepool/charts/auth/templates/1-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ metadata:
annotations:
secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }},abbott,dexcom,twiist,auth"
configmap.reloader.stakater.com/reload: "abbott,dexcom,twiist"
{{ if .Values.deployment.annotations }}
{{- .Values.deployment.annotations | toYaml | nindent 4 }}
{{ if (.Values.deployment).annotations }}
{{- (.Values.deployment).annotations | toYaml | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
app: auth
app.kubernetes.io/name: {{ include "charts.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
replicas: {{ .Values.deployment.replicas | default 1 }}
replicas: {{ (.Values.deployment).replicas | default 1 }}
strategy: {}
template:
metadata:
Expand Down Expand Up @@ -324,7 +324,7 @@ spec:
- name: {{ $key }}
value: {{ $val | quote }}
{{- end }}
image: "{{ .Values.deployment.image }}"
image: "{{ (.Values.deployment).image }}"
securityContext:
{{- .Values.podSecurityContext | toYaml | nindent 10 }}
{{ template "charts.platform.probes" .Values.global.ports.auth}}
Expand Down
8 changes: 4 additions & 4 deletions charts/tidepool/charts/blip/templates/1-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ metadata:
name: blip
namespace: {{.Release.Namespace}}
annotations:
{{ if .Values.deployment.annotations }}
{{- .Values.deployment.annotations | toYaml | nindent 4 }}
{{ if (.Values.deployment).annotations }}
{{- (.Values.deployment).annotations | toYaml | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
app: blip
app.kubernetes.io/name: {{ include "charts.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
replicas: {{ .Values.deployment.replicas }}
replicas: {{ (.Values.deployment).replicas }}
strategy: {}
template:
metadata:
Expand All @@ -37,7 +37,7 @@ spec:
{{toYaml . | indent 6}}{{- end }}
{{- end }}
containers:
- image: "{{ .Values.deployment.image }}"
- image: "{{ (.Values.deployment).image }}"
securityContext:
{{- .Values.podSecurityContext | toYaml | nindent 10 }}
{{ if .Values.command }}
Expand Down
32 changes: 16 additions & 16 deletions charts/tidepool/charts/blob/templates/1-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ metadata:
namespace: {{.Release.Namespace}}
annotations:
secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }},blob"
{{ if .Values.deployment.annotations }}
{{- .Values.deployment.annotations | toYaml | nindent 4 }}
{{ if (.Values.deployment).annotations }}
{{- (.Values.deployment).annotations | toYaml | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
app: blob
app.kubernetes.io/name: {{ include "charts.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
replicas: {{ .Values.deployment.replicas }}
replicas: {{ (.Values.deployment).replicas }}
strategy: {}
template:
metadata:
Expand Down Expand Up @@ -63,34 +63,34 @@ spec:
- name: TIDEPOOL_BLOB_SERVICE_SERVER_ADDRESS
value: :{{.Values.global.ports.blob}}
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY
value: '{{.Values.deployment.env.store.file.directory}}'
value: '{{(.Values.deployment).env.store.file.directory}}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET
value: '{{ .Values.deployment.env.store.s3.bucket }}'
value: '{{ (.Values.deployment).env.store.s3.bucket }}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_PREFIX
value: '{{.Values.deployment.env.store.s3.prefix}}'
value: '{{(.Values.deployment).env.store.s3.prefix}}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_TYPE
value: '{{.Values.deployment.env.store.type}}'
value: '{{(.Values.deployment).env.store.type}}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_FILE_DIRECTORY
value: '{{.Values.deployment.env.blobs.store.file.directory}}'
value: '{{(.Values.deployment).env.blobs.store.file.directory}}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_BUCKET
value: '{{ .Values.deployment.env.blobs.store.s3.bucket }}'
value: '{{ (.Values.deployment).env.blobs.store.s3.bucket }}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_PREFIX
value: '{{.Values.deployment.env.blobs.store.s3.prefix}}'
value: '{{(.Values.deployment).env.blobs.store.s3.prefix}}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_TYPE
value: '{{.Values.deployment.env.blobs.store.type}}'
value: '{{(.Values.deployment).env.blobs.store.type}}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_FILE_DIRECTORY
value: '{{.Values.deployment.env.logs.store.file.directory}}'
value: '{{(.Values.deployment).env.logs.store.file.directory}}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_BUCKET
value: '{{ .Values.deployment.env.logs.store.s3.bucket }}'
value: '{{ (.Values.deployment).env.logs.store.s3.bucket }}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_PREFIX
value: '{{.Values.deployment.env.logs.store.s3.prefix}}'
value: '{{(.Values.deployment).env.logs.store.s3.prefix}}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_TYPE
value: '{{.Values.deployment.env.logs.store.type}}'
value: '{{(.Values.deployment).env.logs.store.type}}'
{{- range $key, $val := ((.Values.deployment).extraEnv | default ((.Values.global).deployment).extraEnv | default (dict)) }}
- name: {{ $key }}
value: {{ $val | quote }}
{{- end }}
image: "{{ .Values.deployment.image }}"
image: "{{ (.Values.deployment).image }}"
securityContext:
{{- .Values.podSecurityContext | toYaml | nindent 10 }}
{{ template "charts.platform.probes" .Values.global.ports.blob}}
Expand Down
8 changes: 4 additions & 4 deletions charts/tidepool/charts/data/templates/1-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ metadata:
annotations:
secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }},abbott,data"
configmap.reloader.stakater.com/reload: "abbott"
{{ if .Values.deployment.annotations }}
{{- .Values.deployment.annotations | toYaml | nindent 4 }}
{{ if (.Values.deployment).annotations }}
{{- (.Values.deployment).annotations | toYaml | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
app: data
app.kubernetes.io/name: {{ include "charts.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
replicas: {{ .Values.deployment.replicas }}
replicas: {{ (.Values.deployment).replicas }}
strategy: {}
template:
metadata:
Expand Down Expand Up @@ -153,7 +153,7 @@ spec:
name: data
key: AlertsRetryDelays
optional: true
image: "{{ .Values.deployment.image }}"
image: "{{ (.Values.deployment).image }}"
securityContext:
{{- .Values.podSecurityContext | toYaml | nindent 10 }}
{{ template "charts.platform.probes" .Values.global.ports.data }}
Expand Down
8 changes: 4 additions & 4 deletions charts/tidepool/charts/export/templates/1-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ metadata:
namespace: {{.Release.Namespace}}
annotations:
secret.reloader.stakater.com/reload: "export"
{{ if .Values.deployment.annotations }}
{{- .Values.deployment.annotations | toYaml | nindent 4 }}
{{ if (.Values.deployment).annotations }}
{{- (.Values.deployment).annotations | toYaml | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
app: export
app.kubernetes.io/name: {{ include "charts.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
replicas: {{ .Values.deployment.replicas }}
replicas: {{ (.Values.deployment).replicas }}
strategy: {}
template:
metadata:
Expand Down Expand Up @@ -60,7 +60,7 @@ spec:
optional: true
- name: PLOTLY_ORCA
value: "http://plotly-orca:{{.Values.global.ports.plotly_orca}}"
image: "{{ .Values.deployment.image }}"
image: "{{ (.Values.deployment).image }}"
securityContext:
{{- .Values.podSecurityContext | toYaml | nindent 10 }}
livenessProbe:
Expand Down
8 changes: 4 additions & 4 deletions charts/tidepool/charts/gatekeeper/templates/1-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ metadata:
namespace: {{.Release.Namespace}}
annotations:
secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }}"
{{ if .Values.deployment.annotations }}
{{- .Values.deployment.annotations | toYaml | nindent 4 }}
{{ if (.Values.deployment).annotations }}
{{- (.Values.deployment).annotations | toYaml | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
app: gatekeeper
app.kubernetes.io/name: {{ include "charts.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
replicas: {{ .Values.deployment.replicas }}
replicas: {{ (.Values.deployment).replicas }}
strategy: {}
template:
metadata:
Expand Down Expand Up @@ -58,7 +58,7 @@ spec:
value: gatekeeper
- name: USERSERVICE
value: "shoreline:{{.Values.global.ports.shoreline}}"
image: "{{ .Values.deployment.image }}"
image: "{{ (.Values.deployment).image }}"
securityContext:
{{- .Values.podSecurityContext | toYaml | nindent 10 }}
readinessProbe:
Expand Down
8 changes: 4 additions & 4 deletions charts/tidepool/charts/highwater/templates/1-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ metadata:
namespace: {{.Release.Namespace}}
annotations:
secret.reloader.stakater.com/reload: "server,highwater,userdata,kissmetrics"
{{ if .Values.deployment.annotations }}
{{- .Values.deployment.annotations | toYaml | nindent 4 }}
{{ if (.Values.deployment).annotations }}
{{- (.Values.deployment).annotations | toYaml | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
app: highwater
app.kubernetes.io/name: {{ include "charts.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
replicas: {{ .Values.deployment.replicas }}
replicas: {{ (.Values.deployment).replicas }}
strategy: {}
template:
metadata:
Expand Down Expand Up @@ -100,7 +100,7 @@ spec:
value: highwater
- name: USER_API_SERVICE
value: '{"type": "static", "hosts": [{"protocol": "http", "host": "shoreline:{{.Values.global.ports.shoreline}}"}]}'
image: "{{ .Values.deployment.image }}"
image: "{{ (.Values.deployment).image }}"
securityContext:
{{- .Values.podSecurityContext | toYaml | nindent 10 }}
readinessProbe:
Expand Down
8 changes: 4 additions & 4 deletions charts/tidepool/charts/jellyfish/templates/1-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ metadata:
namespace: {{.Release.Namespace}}
annotations:
secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }}"
{{ if .Values.deployment.annotations }}
{{- .Values.deployment.annotations | toYaml | nindent 4 }}
{{ if (.Values.deployment).annotations }}
{{- (.Values.deployment).annotations | toYaml | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
app: jellyfish
app.kubernetes.io/name: {{ include "charts.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
replicas: {{ .Values.deployment.replicas }}
replicas: {{ (.Values.deployment).replicas }}
strategy: {}
template:
metadata:
Expand Down Expand Up @@ -79,7 +79,7 @@ spec:
value: "seagull:{{.Values.global.ports.seagull}}"
- name: TIDEPOOL_PERMISSION_CLIENT_ADDRESS
value: "gatekeeper:{{.Values.global.ports.gatekeeper}}"
image: "{{ .Values.deployment.image }}"
image: "{{ (.Values.deployment).image }}"
securityContext:
{{- .Values.podSecurityContext | toYaml | nindent 10 }}
livenessProbe:
Expand Down
8 changes: 4 additions & 4 deletions charts/tidepool/charts/messageapi/templates/1-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ metadata:
namespace: {{.Release.Namespace}}
annotations:
secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }}"
{{ if .Values.deployment.annotations }}
{{- .Values.deployment.annotations | toYaml | nindent 4 }}
{{ if (.Values.deployment).annotations }}
{{- (.Values.deployment).annotations | toYaml | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
app: message-api
app.kubernetes.io/name: {{ include "charts.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
replicas: {{ .Values.deployment.replicas }}
replicas: {{ (.Values.deployment).replicas }}
template:
metadata:
labels:
Expand Down Expand Up @@ -74,7 +74,7 @@ spec:
value: '{"type": "static", "hosts": [{"protocol": "http", "host": "shoreline:{{.Values.global.ports.shoreline}}"}]}'
- name: SKIP_HAKKEN
value: "true"
image: "{{ .Values.deployment.image }}"
image: "{{ (.Values.deployment).image }}"
securityContext:
{{- .Values.podSecurityContext | toYaml | nindent 10 }}
readinessProbe:
Expand Down
8 changes: 4 additions & 4 deletions charts/tidepool/charts/migrations/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ metadata:
namespace: {{.Release.Namespace}}
annotations:
secret.reloader.stakater.com/reload: "{{ .Values.mongo.secretName }}"
{{ if .Values.deployment.annotations }}
{{- .Values.deployment.annotations | toYaml | nindent 4 }}
{{ if (.Values.deployment).annotations }}
{{- (.Values.deployment).annotations | toYaml | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
app: migrations
app.kubernetes.io/name: {{ include "charts.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
replicas: {{ .Values.deployment.replicas }}
replicas: {{ (.Values.deployment).replicas }}
strategy: {}
template:
metadata:
Expand Down Expand Up @@ -54,7 +54,7 @@ spec:
- name: {{ $key }}
value: {{ $val | quote }}
{{- end }}
image: {{ .Values.deployment.image | quote}}
image: {{ (.Values.deployment).image | quote}}
securityContext:
{{- .Values.podSecurityContext | toYaml | nindent 10 }}
name: migrations
Expand Down
8 changes: 4 additions & 4 deletions charts/tidepool/charts/seagull/templates/1-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ metadata:
namespace: {{.Release.Namespace}}
annotations:
secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }}"
{{ if .Values.deployment.annotations }}
{{- .Values.deployment.annotations | toYaml | nindent 4 }}
{{ if (.Values.deployment).annotations }}
{{- (.Values.deployment).annotations | toYaml | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
app: seagull
app.kubernetes.io/name: {{ include "charts.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
replicas: {{ .Values.deployment.replicas }}
replicas: {{ (.Values.deployment).replicas }}
strategy: {}
template:
metadata:
Expand Down Expand Up @@ -68,7 +68,7 @@ spec:
value: '{"type": "static", "hosts": [{"protocol": "http", "host": "shoreline:{{.Values.global.ports.shoreline}}"}]}'
- name: SKIP_HAKKEN
value: "true"
image: "{{ .Values.deployment.image }}"
image: "{{ (.Values.deployment).image }}"
securityContext:
{{- .Values.podSecurityContext | toYaml | nindent 10 }}
readinessProbe:
Expand Down
12 changes: 6 additions & 6 deletions charts/tidepool/charts/task/templates/1-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ metadata:
annotations:
secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }},task,dexcom"
configmap.reloader.stakater.com/reload: "dexcom"
{{ if .Values.deployment.annotations }}
{{- .Values.deployment.annotations | toYaml | nindent 4 }}
{{ if (.Values.deployment).annotations }}
{{- (.Values.deployment).annotations | toYaml | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
app: task
app.kubernetes.io/name: {{ include "charts.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
replicas: {{ .Values.deployment.replicas }}
replicas: {{ (.Values.deployment).replicas }}
strategy: {}
template:
metadata:
Expand Down Expand Up @@ -99,9 +99,9 @@ spec:
key: ClientURL
optional: true
- name: TIDEPOOL_TASK_QUEUE_DELAY
value: {{ .Values.deployment.env.queue.delay | quote }}
value: {{ (.Values.deployment).env.queue.delay | quote }}
- name: TIDEPOOL_TASK_QUEUE_WORKERS
value: {{ .Values.deployment.env.queue.workers | quote }}
value: {{ (.Values.deployment).env.queue.workers | quote }}
- name: TIDEPOOL_TASK_SERVICE_SECRET
valueFrom:
secretKeyRef:
Expand All @@ -113,7 +113,7 @@ spec:
- name: {{ $key }}
value: {{ $val | quote }}
{{- end }}
image: "{{ .Values.deployment.image }}"
image: "{{ (.Values.deployment).image }}"
securityContext:
{{- .Values.podSecurityContext | toYaml | nindent 10 }}
{{ template "charts.platform.probes" .Values.global.ports.task}}
Expand Down
Loading
Loading