lib/pfab/templates/cron.rb in pfab-0.33.0 vs lib/pfab/templates/cron.rb in pfab-0.34.0

@@ -3,21 +3,29 @@
     class Cron < Base
       def write_to(f)
         f << YAML.dump(job.deep_stringify_keys)
       end
 
+      def application_type
+        "cron"
+      end
+
       def job
         {
-          apiVersion: "batch/v1beta1",
+          apiVersion: "batch/v1",
           kind: "CronJob",
           metadata: {
             name: "#{@data['deployed_name']}-#{@data['sha']}",
-            namespace: @data['env'],
+            namespace: get_namespace,
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
-              "application-type" => "job",
+              "application-type" => application_type,
+              "deploy-id" => deploy_id,
+              "tags.datadoghq.com/env": @data['env'],
+              "tags.datadoghq.com/service": @data['deployed_name'],
+              "tags.datadoghq.com/version": "#{@data['sha']}"
             }
           },
           spec: {
             schedule: get("schedule"),
             successfulJobsHistoryLimit: 1,
@@ -37,24 +45,27 @@
                   metadata: {
                     labels: {
                       application: @data['application'],
                       "deployed-name" => @data['deployed_name'],
                       "application-type" => "cron",
+                      "tags.datadoghq.com/env": @data['env'],
+                      "tags.datadoghq.com/service": @data['deployed_name'],
+                      "tags.datadoghq.com/version": "#{@data['sha']}"
                     },
                   },
                   spec: {
-
+                    serviceAccountName: get('serviceAccountName'),
                     containers: [
                       {
                         image: image_name,
                         name: @data['deployed_name'],
                         command: app_vars["command"].split(" "),
                         env: env_vars,
                         resources: resources,
                       },
                     ],
                     restartPolicy: "Never",
-                  },
+                  }.compact,
                 },
                 backoffLimit: 2,
               },
             },
           },