Merge pull request #312 from azimuth-cloud/fix/delete-job-ttl

Move Job ttlSecondsAfterFinished field to top-level job spec

Author: sd109

azimuth_caas_operator/tests/utils/test_ansible_runner.py

@@ -142,7 +142,6 @@ def test_get_job_remove(self):
         runAsGroup: 1000
         runAsUser: 1000
       serviceAccountName: test1-tfstate
-      ttlSecondsAfterFinished: 36000
       volumes:
       - emptyDir: {}
         name: runner-data
@@ -163,7 +162,9 @@ def test_get_job_remove(self):
           defaultMode: 256
           optional: true
           secretName: ssh-type1
+  ttlSecondsAfterFinished: 36000
 """  # noqa
+
         self.assertEqual(expected, yaml.safe_dump(job))
 
     @mock.patch.dict(
@@ -315,7 +316,6 @@ def test_get_job_remove_with_trust_bundle(self):
         runAsGroup: 1000
         runAsUser: 1000
       serviceAccountName: test1-tfstate
-      ttlSecondsAfterFinished: 36000
       volumes:
       - emptyDir: {}
         name: runner-data
@@ -339,6 +339,7 @@ def test_get_job_remove_with_trust_bundle(self):
       - configMap:
           name: trust-bundle
         name: trust-bundle
+  ttlSecondsAfterFinished: 36000
 """  # noqa
         self.assertEqual(expected, yaml.safe_dump(job))
 

azimuth_caas_operator/utils/ansible_runner.py

@@ -269,16 +269,16 @@ def get_job(
     azimuth-caas-cluster: "{cluster.metadata.name}"
     azimuth-caas-action: "{action}"
 spec:
-  template:
-    spec:
-{
+    {
         '''
-      # auto-remove delete jobs after 10 hours
-      ttlSecondsAfterFinished: 36000
- '''
+  # auto-remove delete jobs after 10 hours
+  ttlSecondsAfterFinished: 36000
+'''
         if remove
         else ""
     }
+  template:
+    spec:
       serviceAccountName: {service_account_name}
       securityContext:
         runAsUser: 1000