Merge pull request #171 from MediaMarktSaturn/metronome-annotation-op…

…tion [HTTP-Metronome] Option to add podTemplate annotations
MediaMarktSaturn · Dec 5, 2024 · 38ea24d · 38ea24d
2 parents 0cdb95c + 59a48ee
commit 38ea24d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/chart-tests/http-metronome/ci/test-podTemplate-annotation-values.yaml b/chart-tests/http-metronome/ci/test-podTemplate-annotation-values.yaml
@@ -0,0 +1,9 @@
+podTemplate:
+  annotations:
+    linkerd.io/inject: disabled
+
+jobs:
+  - name: this-is-just-a-test                          # MANDATORY: name of the cron-job that should be created
+    schedule: "* * * * *"                              # MANDATORY: cron expression this job trigger should run
+    target: http://the-cluster-local-service/the-path  # MANDATORY: http endpoint within the cluster that should be called using GET
+    activeDeadlineSeconds: 60                          # MANDATORY: maximum lifetime of a single job execution
diff --git a/charts/http-metronome/Chart.yaml b/charts/http-metronome/Chart.yaml
@@ -7,4 +7,4 @@ maintainers:
   - name: MediaMarktSaturn
     url: https://github.com/MediaMarktSaturn
 appVersion: 1.0.0
-version: 1.0.0
+version: 1.1.0
diff --git a/charts/http-metronome/templates/CronJobs.yaml b/charts/http-metronome/templates/CronJobs.yaml
@@ -22,11 +22,16 @@ spec:
       ttlSecondsAfterFinished: {{ $.Values.ttlSecondsAfterFinished }}
       activeDeadlineSeconds: {{ .activeDeadlineSeconds }}
       template:
-                {{- if $.Values.istioManaged }}
         metadata:
+          {{- if $.Values.istioManaged }}
           labels:
             istio-prometheus-ignore: "true"
-                {{- end }}
+          {{- end }}
+          annotations: {{ if not $.Values.podTemplate.annotations }}{}{{ else }}
+            {{- range $k, $v := $.Values.podTemplate.annotations }}
+            {{ $k }}: {{ $v | quote }}
+            {{- end }}
+          {{- end }}
         spec:
           automountServiceAccountToken: false
           containers:

diff --git a/charts/http-metronome/values.yaml b/charts/http-metronome/values.yaml
@@ -22,6 +22,10 @@ startingDeadlineSeconds: 200
 # in an istio meshed environment, sidecar lifecycle has to be managed
 istioManaged: false
 
+# annotations to be added to the job template
+podTemplate:
+  annotations: {}
+
 # list of cronjobs that should run, structure see below.
 jobs:
   - name: this-is-just-a-test                          # MANDATORY: name of the cron-job that should be created