From 1763081d3e17d8f8f5320b745a7c1842487eedd5 Mon Sep 17 00:00:00 2001
From: Deniz Erdogan <91744937+deer-wmde@users.noreply.github.com>
Date: Tue, 15 Aug 2023 10:41:25 +0200
Subject: [PATCH] refactor(jobs): move `ttlSecondsAfterFinished` (#1102)

---
 k8s/jobs/changeReplicationPasswordOnSecondary.yaml | 3 +--
 k8s/jobs/elasticSearchImportJob.yaml               | 3 +--
 k8s/jobs/elasticSearchInitJob.yaml                 | 2 +-
 k8s/jobs/rebuildQuantityUnitsJob.yaml              | 3 +--
 k8s/jobs/resetOtherSqlSecretsJob.yaml              | 3 +--
 k8s/jobs/resetRootSqlSecretJob.yaml                | 3 +--
 k8s/jobs/runAllMWJobsJob.yaml                      | 3 +--
 7 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/k8s/jobs/changeReplicationPasswordOnSecondary.yaml b/k8s/jobs/changeReplicationPasswordOnSecondary.yaml
index aebf56084..a7fcf2137 100644
--- a/k8s/jobs/changeReplicationPasswordOnSecondary.yaml
+++ b/k8s/jobs/changeReplicationPasswordOnSecondary.yaml
@@ -4,10 +4,9 @@ metadata:
   generateName: change-replication-password-on-secondary-
   namespace: adhoc-jobs
 spec:
+  ttlSecondsAfterFinished: 604800
   template:
-    ttlSecondsAfterFinished: 604800
     spec:
-      ttlSecondsAfterFinished: 604800
       containers:
         - name: change-replication-password-on-secondary
           image: docker.io/bitnami/mariadb:10.5.15-debian-10-r52
diff --git a/k8s/jobs/elasticSearchImportJob.yaml b/k8s/jobs/elasticSearchImportJob.yaml
index bd4ffc413..78c8441bb 100644
--- a/k8s/jobs/elasticSearchImportJob.yaml
+++ b/k8s/jobs/elasticSearchImportJob.yaml
@@ -4,12 +4,11 @@ metadata:
   generateName: load-elasticsearch-data-
   namespace: adhoc-jobs
 spec:
+  ttlSecondsAfterFinished: 604800
   template:
-    ttlSecondsAfterFinished: 604800
     metadata:
       name: load-elasticsearch-data
     spec:
-      ttlSecondsAfterFinished: 604800
       containers:
         - name: import-elasticsearch
           command:
diff --git a/k8s/jobs/elasticSearchInitJob.yaml b/k8s/jobs/elasticSearchInitJob.yaml
index f86a0daef..49a7d0461 100644
--- a/k8s/jobs/elasticSearchInitJob.yaml
+++ b/k8s/jobs/elasticSearchInitJob.yaml
@@ -4,8 +4,8 @@ metadata:
   generateName: elasticsearch-init-job-
   namespace: adhoc-jobs
 spec:
+  ttlSecondsAfterFinished: 604800
   template:
-    ttlSecondsAfterFinished: 604800
     metadata:
       name: elasticsearch-init-job
     spec:
diff --git a/k8s/jobs/rebuildQuantityUnitsJob.yaml b/k8s/jobs/rebuildQuantityUnitsJob.yaml
index a7d061e0a..4cf0356be 100644
--- a/k8s/jobs/rebuildQuantityUnitsJob.yaml
+++ b/k8s/jobs/rebuildQuantityUnitsJob.yaml
@@ -4,12 +4,11 @@ metadata:
   generateName: rebuild-quantity-units-
   namespace: adhoc-jobs
 spec:
+  ttlSecondsAfterFinished: 604800
   template:
-    ttlSecondsAfterFinished: 604800
     metadata:
       name: rebuild-quantity-units
     spec:
-      ttlSecondsAfterFinished: 604800
       containers:
         - name: rebuild-quantity-units
           command:
diff --git a/k8s/jobs/resetOtherSqlSecretsJob.yaml b/k8s/jobs/resetOtherSqlSecretsJob.yaml
index 42399d77e..6ea192a09 100644
--- a/k8s/jobs/resetOtherSqlSecretsJob.yaml
+++ b/k8s/jobs/resetOtherSqlSecretsJob.yaml
@@ -4,10 +4,9 @@ metadata:
   generateName: reset-other-sql-secrets-job-
   namespace: adhoc-jobs
 spec:
+  ttlSecondsAfterFinished: 604800
   template:
-    ttlSecondsAfterFinished: 604800
     spec:
-      ttlSecondsAfterFinished: 604800
       containers:
         - name: reset-other-sql-secrets-job
           image: docker.io/bitnami/mariadb:10.5.15-debian-10-r52
diff --git a/k8s/jobs/resetRootSqlSecretJob.yaml b/k8s/jobs/resetRootSqlSecretJob.yaml
index 07e13be07..422ee8c21 100644
--- a/k8s/jobs/resetRootSqlSecretJob.yaml
+++ b/k8s/jobs/resetRootSqlSecretJob.yaml
@@ -4,10 +4,9 @@ metadata:
   generateName: reset-root-sql-secret-job-
   namespace: adhoc-jobs
 spec:
+  ttlSecondsAfterFinished: 604800
   template:
-    ttlSecondsAfterFinished: 604800
     spec:
-      ttlSecondsAfterFinished: 604800
       containers:
         - name: reset-root-sql-secret-job
           image: docker.io/bitnami/mariadb:10.5.15-debian-10-r52
diff --git a/k8s/jobs/runAllMWJobsJob.yaml b/k8s/jobs/runAllMWJobsJob.yaml
index 3ef06aba1..f1bc979e4 100644
--- a/k8s/jobs/runAllMWJobsJob.yaml
+++ b/k8s/jobs/runAllMWJobsJob.yaml
@@ -4,12 +4,11 @@ metadata:
   generateName: run-all-mw-jobs-
   namespace: adhoc-jobs
 spec:
+  ttlSecondsAfterFinished: 604800
   template:
-    ttlSecondsAfterFinished: 604800
     metadata:
       name: run-all-mw-jobs
     spec:
-      ttlSecondsAfterFinished: 604800
       containers:
         - name: run-all-mw-jobs
           command: