Skip to content
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

fix cronjob templates #3156

Merged
merged 6 commits into from
Jun 4, 2022
Merged

fix cronjob templates #3156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
824fb89
fix securityContext for (some) Cronjobs
tobybellwood May 27, 2022
5c03ec5
more cronjob fixup
tobybellwood May 27, 2022
1dd9461
Merge branch 'main' into db_cronjobs
tobybellwood Jun 2, 2022
37dbccf
Merge branch 'main' into db_cronjobs
tobybellwood Jun 3, 2022
fd95a56
Merge branch 'main' into db_cronjobs
tobybellwood Jun 3, 2022
4f4f629
Merge branch 'main' into db_cronjobs
tobybellwood Jun 3, 2022
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 images/kubectl-build-deploy-dind/helmcharts/elasticsearch/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
{{- include "elasticsearch.labels" $ | nindent 4 }}
annotations:
{{- include "elasticsearch.annotations" . | nindent 4 }}
{{- include "elasticsearch.annotations" $ | nindent 4 }}
spec:
schedule: {{ $cronjobConfig.schedule | quote }}
concurrencyPolicy: Forbid
Expand Down
2 changes: 1 addition & 1 deletion images/kubectl-build-deploy-dind/helmcharts/kibana/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
{{- include "kibana.labels" $ | nindent 4 }}
annotations:
{{- include "kibana.annotations" . | nindent 4 }}
{{- include "kibana.annotations" $ | nindent 4 }}
spec:
schedule: {{ $cronjobConfig.schedule | quote }}
concurrencyPolicy: Forbid
Expand Down
2 changes: 1 addition & 1 deletion images/kubectl-build-deploy-dind/helmcharts/mariadb-single/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
priorityClassName: {{ include "mariadb-single.lagoonPriority" $ }}
enableServiceLinks: false
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 12 }}
{{- toYaml $.Values.podSecurityContext | nindent 12 }}
volumes:
- name: {{ include "mariadb-single.fullname" $ }}
persistentVolumeClaim:
Expand Down
2 changes: 1 addition & 1 deletion images/kubectl-build-deploy-dind/helmcharts/mongodb-single/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
priorityClassName: {{ include "mongodb-single.lagoonPriority" $ }}
enableServiceLinks: false
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 12 }}
{{- toYaml $.Values.podSecurityContext | nindent 12 }}
volumes:
- name: {{ include "mongodb-single.fullname" $ }}
persistentVolumeClaim:
Expand Down
2 changes: 1 addition & 1 deletion images/kubectl-build-deploy-dind/helmcharts/nginx/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
{{- include "nginx.labels" $ | nindent 4 }}
annotations:
{{- include "nginx.annotations" . | nindent 4 }}
{{- include "nginx.annotations" $ | nindent 4 }}
spec:
schedule: {{ $cronjobConfig.schedule | quote }}
concurrencyPolicy: Forbid
Expand Down
2 changes: 1 addition & 1 deletion images/kubectl-build-deploy-dind/helmcharts/node/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
{{- include "node.labels" $ | nindent 4 }}
annotations:
{{- include "node.annotations" . | nindent 4 }}
{{- include "node.annotations" $ | nindent 4 }}
spec:
schedule: {{ $cronjobConfig.schedule | quote }}
concurrencyPolicy: Forbid
Expand Down
2 changes: 1 addition & 1 deletion images/kubectl-build-deploy-dind/helmcharts/postgres-single/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
priorityClassName: {{ include "postgres-single.lagoonPriority" $ }}
enableServiceLinks: false
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 12 }}
{{- toYaml $.Values.podSecurityContext | nindent 12 }}
volumes:
- name: {{ include "postgres-single.fullname" $ }}
persistentVolumeClaim:
Expand Down
5 changes: 3 additions & 2 deletions images/kubectl-build-deploy-dind/helmcharts/python/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
{{- include "python.labels" $ | nindent 4 }}
annotations:
{{- include "python.annotations" . | nindent 4 }}
{{- include "python.annotations" $ | nindent 4 }}
spec:
schedule: {{ $cronjobConfig.schedule | quote }}
concurrencyPolicy: Forbid
Expand All @@ -33,7 +33,8 @@ spec:
imagePullSecrets:
{{- toYaml . | nindent 12 }}
{{- end }}
priorityClassName: {{ include "python.lagoonPriority" . }}
priorityClassName:
{{- include "python.lagoonPriority" $ | nindent 12 }}
enableServiceLinks: false
securityContext:
{{- toYaml $.Values.podSecurityContext | nindent 12 }}
Expand Down
2 changes: 1 addition & 1 deletion images/kubectl-build-deploy-dind/helmcharts/rabbitmq/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
{{- include "rabbitmq.labels" $ | nindent 4 }}
annotations:
{{- include "rabbitmq.annotations" . | nindent 4 }}
{{- include "rabbitmq.annotations" $ | nindent 4 }}
spec:
schedule: {{ $cronjobConfig.schedule | quote }}
concurrencyPolicy: Forbid
Expand Down
4 changes: 2 additions & 2 deletions images/kubectl-build-deploy-dind/helmcharts/solr/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
{{- include "solr.labels" $ | nindent 4 }}
annotations:
{{- include "solr.annotations" . | nindent 4 }}
{{- include "solr.annotations" $ | nindent 4 }}
spec:
schedule: {{ $cronjobConfig.schedule | quote }}
concurrencyPolicy: Forbid
Expand Down Expand Up @@ -36,7 +36,7 @@ spec:
priorityClassName: {{ include "solr.lagoonPriority" $ }}
enableServiceLinks: false
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 12 }}
{{- toYaml $.Values.podSecurityContext | nindent 12 }}
containers:
- image: {{ $.Values.image | quote }}
name: cronjob-{{ $.Release.Name }}-{{ $cronjobName }}
Expand Down