Merge pull request #3156 from uselagoon/db_cronjobs

fix cronjob templates
uselagoon · Jun 4, 2022 · 000148b · 000148b
2 parents 3725043 + 4f4f629
commit 000148b
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 12 deletions.
diff --git a/images/kubectl-build-deploy-dind/helmcharts/elasticsearch/templates/cronjob.yaml b/images/kubectl-build-deploy-dind/helmcharts/elasticsearch/templates/cronjob.yaml
@@ -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

diff --git a/images/kubectl-build-deploy-dind/helmcharts/kibana/templates/cronjob.yaml b/images/kubectl-build-deploy-dind/helmcharts/kibana/templates/cronjob.yaml
@@ -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

diff --git a/images/kubectl-build-deploy-dind/helmcharts/mariadb-single/templates/cronjob.yaml b/images/kubectl-build-deploy-dind/helmcharts/mariadb-single/templates/cronjob.yaml
@@ -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:

diff --git a/images/kubectl-build-deploy-dind/helmcharts/mongodb-single/templates/cronjob.yaml b/images/kubectl-build-deploy-dind/helmcharts/mongodb-single/templates/cronjob.yaml
@@ -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:

diff --git a/images/kubectl-build-deploy-dind/helmcharts/nginx/templates/cronjob.yaml b/images/kubectl-build-deploy-dind/helmcharts/nginx/templates/cronjob.yaml
@@ -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

diff --git a/images/kubectl-build-deploy-dind/helmcharts/node/templates/cronjob.yaml b/images/kubectl-build-deploy-dind/helmcharts/node/templates/cronjob.yaml
@@ -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

diff --git a/images/kubectl-build-deploy-dind/helmcharts/postgres-single/templates/cronjob.yaml b/images/kubectl-build-deploy-dind/helmcharts/postgres-single/templates/cronjob.yaml
@@ -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:

diff --git a/images/kubectl-build-deploy-dind/helmcharts/python/templates/cronjob.yaml b/images/kubectl-build-deploy-dind/helmcharts/python/templates/cronjob.yaml
@@ -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
@@ -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 }}

diff --git a/images/kubectl-build-deploy-dind/helmcharts/rabbitmq/templates/cronjob.yaml b/images/kubectl-build-deploy-dind/helmcharts/rabbitmq/templates/cronjob.yaml
@@ -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

diff --git a/images/kubectl-build-deploy-dind/helmcharts/solr/templates/cronjob.yaml b/images/kubectl-build-deploy-dind/helmcharts/solr/templates/cronjob.yaml
@@ -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
@@ -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 }}