From 4aeb83993fc3c78554ed53b5ffbf35552634e4a6 Mon Sep 17 00:00:00 2001
From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Fri, 28 Feb 2025 13:44:27 +0100
Subject: [COMMON] Add jobAnnotations as optional variables

- add Annotations to all job template metadata
- make the jobAnnotations configurable via values.yaml

Issue-ID: OOM-3254

Change-Id: I84a3a7e9a89ea272a239e7a86e9c615103c2c7e4
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
---
 kubernetes/sdnc/Chart.yaml                     |  2 +-
 kubernetes/sdnc/templates/job.yaml             |  3 +++
 kubernetes/sdnc/templates/sdnrdb-init-job.yaml | 12 +++++++++++-
 kubernetes/sdnc/values.yaml                    | 14 ++++++++++++++
 4 files changed, 29 insertions(+), 2 deletions(-)

(limited to 'kubernetes/sdnc')

diff --git a/kubernetes/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml
index 2e0aa6ed8b..02a3681fad 100644
--- a/kubernetes/sdnc/Chart.yaml
+++ b/kubernetes/sdnc/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 description: SDN Controller
 name: sdnc
-version: 15.1.0
+version: 15.1.1
 
 dependencies:
   - name: common
diff --git a/kubernetes/sdnc/templates/job.yaml b/kubernetes/sdnc/templates/job.yaml
index ffd578f3f1..4a7ca8a2ab 100755
--- a/kubernetes/sdnc/templates/job.yaml
+++ b/kubernetes/sdnc/templates/job.yaml
@@ -25,6 +25,9 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
+  {{- if .Values.jobAnnotations }}
+  annotations:  {{- include "common.tplValue" (dict "value" .Values.jobAnnotations "context" $) | nindent 4 }}
+  {{- end }}
 spec:
   backoffLimit: 20
   template:
diff --git a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
index 1845f6cc9f..0b630e0aa8 100755
--- a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
+++ b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
@@ -16,7 +16,17 @@
 {{ if .Values.config.sdnr.enabled -}}
 apiVersion: batch/v1
 kind: Job
-metadata: {{- include "common.resourceMetadata" (dict "suffix" "sdnrdb-init-job" "dot" . ) | nindent 2 }}
+metadata:
+  name: {{ include "common.fullname" . }}-sdnrdb-init-job
+  namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ include "common.release" . }}
+    heritage: {{ .Release.Service }}
+  {{- if .Values.jobAnnotations }}
+  annotations:  {{- include "common.tplValue" (dict "value" .Values.jobAnnotations "context" $) | nindent 4 }}
+  {{- end }}
 spec:
   backoffLimit: 20
   template:
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 7060cae475..69c81f8087 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -412,6 +412,20 @@ config:
 # Strimzi KafkaUser/Topic config on top level
 kafkaUser: *kafkaUser
 
+# Annotations to control the execution and deletion of the job
+# Can be used to delete a job before an Upgrade
+#
+# jobAnnotations:
+#   # In case of an ArgoCD deployment this Hook deletes the job before syncing
+#   argocd.argoproj.io/hook: Sync
+#   argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
+#
+#   # In case of an Helm/Flux deployment this Hook deletes the job
+#   # This is what defines this resource as a hook. Without this line, the
+#   # job is considered part of the release.
+#   "helm.sh/hook": "pre-upgrade,pre-rollback,post-install"
+#   "helm.sh/hook-delete-policy": "before-hook-creation"
+#   "helm.sh/hook-weight": "1"
 
 # dependency / sub-chart configuration
 network-name-gen:
-- 
cgit