lib/pfab/templates/job.rb in pfab-0.32.0 vs lib/pfab/templates/job.rb in pfab-0.33.0

@@ -3,57 +3,45 @@
     class Job < Base
       def write_to(f)
         f << YAML.dump(job.deep_stringify_keys)
       end
 
-      def application_type
-        "job"
-      end
-
       def job
         {
           apiVersion: "batch/v1",
           kind: "Job",
           metadata: {
             name: "job-#{@data['deployed_name']}-#{@data['sha']}",
-            namespace: get_namespace,
+            namespace: @data['env'],
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
-              "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']}"
+              "application-type" => "job",
             }
           },
           spec: {
             template: {
               metadata: {
                 name: "#{@data['deployed_name']}-#{@data['sha']}",
-                namespace: get_namespace,
+                namespace: @data['env'],
                 labels: {
                   application: @data['application'],
                   "deployed-name" => @data['deployed_name'],
                   "application-type" => "job",
-                  "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: 0,
           },
         }
       end