Merge pull request #1654 from thedadams/gh-1642

Ensure create jobs are only run once (#1642)

Author: thedadams

pkg/controller/appdefinition/jobs.go

@@ -123,6 +123,7 @@ func toJob(req router.Request, appInstance *v1.AppInstance, pullSecrets *PullSec
 		appInstance.Status.AppSpec.Annotations, container.Annotations, appInstance.Spec.Annotations))
 
 	jobSpec := batchv1.JobSpec{
+		Suspend: appInstance.Spec.Stop,
 		Template: corev1.PodTemplateSpec{
 			ObjectMeta: metav1.ObjectMeta{
 				Labels: jobLabels(appInstance, container, name,

pkg/controller/appdefinition/jobs_test.go

@@ -27,3 +27,7 @@ func TestCronJobs(t *testing.T) {
 func TestDeleteJob(t *testing.T) {
 	tester.DefaultTest(t, scheme.Scheme, "testdata/job/delete-job", DeploySpec)
 }
+
+func TestJobAppStopped(t *testing.T) {
+	tester.DefaultTest(t, scheme.Scheme, "testdata/job/stopped-app", DeploySpec)
+}

pkg/controller/appdefinition/testdata/job/stopped-app/expected.yaml

@@ -0,0 +1,110 @@
+kind: Job
+apiVersion: batch/v1
+metadata:
+  name: oneimage
+  namespace: app-created-namespace
+  annotations:
+    apply.acorn.io/prune: "false"
+    apply.acorn.io/update: "true"
+  labels:
+    "acorn.io/app-namespace": "app-namespace"
+    "acorn.io/app-name": "app-name"
+    acorn.io/app-public-name: "app-name"
+    "acorn.io/job-name": "oneimage"
+    "acorn.io/managed": "true"
+spec:
+  suspend: true
+  backoffLimit: 1000
+  template:
+    metadata:
+      labels:
+        "acorn.io/app-namespace": "app-namespace"
+        "acorn.io/app-name": "app-name"
+        acorn.io/app-public-name: "app-name"
+        "acorn.io/job-name": "oneimage"
+        "acorn.io/managed": "true"
+      annotations:
+        acorn.io/container-spec: '{"build":{"context":".","dockerfile":"Dockerfile"},"image":"image-name","ports":[{"port":80,"protocol":"http","targetPort":81}],"probes":null,"sidecars":{"left":{"image":"foo","ports":[{"port":90,"protocol":"tcp","targetPort":91}],"probes":null}}}'
+    spec:
+      imagePullSecrets:
+        - name: oneimage-pull-1234567890ab
+      restartPolicy: Never
+      serviceAccountName: oneimage
+      enableServiceLinks: false
+      terminationGracePeriodSeconds: 5
+      containers:
+        - name: oneimage
+          image: "image-name"
+          readinessProbe:
+            tcpSocket:
+              port: 81
+          ports:
+            - containerPort: 81
+              protocol: "TCP"
+          terminationMessagePath: "/run/secrets/output"
+          env:
+            - name: ACORN_EVENT
+              value: "create"
+        - name: left
+          env:
+            - name: ACORN_EVENT
+              value: "create"
+          image: "foo"
+          readinessProbe:
+            tcpSocket:
+              port: 91
+          ports:
+            - containerPort: 91
+              protocol: "TCP"
+          terminationMessagePath: "/run/secrets/output"
+---
+kind: Secret
+apiVersion: v1
+metadata:
+  name: oneimage-pull-1234567890ab
+  namespace: app-created-namespace
+  labels:
+    acorn.io/managed: "true"
+    acorn.io/pull-secret: "true"
+type: "kubernetes.io/dockerconfigjson"
+data:
+  ".dockerconfigjson": eyJhdXRocyI6eyJpbmRleC5kb2NrZXIuaW8iOnsiYXV0aCI6Ik9nPT0ifX19
+---
+kind: AppInstance
+apiVersion: internal.acorn.io/v1
+metadata:
+  name: app-name
+  namespace: app-namespace
+  uid: 1234567890abcdef
+spec:
+  stop: true
+  image: test
+status:
+  namespace: app-created-namespace
+  appImage:
+    id: test
+  appSpec:
+    jobs:
+      oneimage:
+        sidecars:
+          left:
+            image: "foo"
+            ports:
+              - port: 90
+                targetPort: 91
+                protocol: tcp
+        ports:
+          - port: 80
+            targetPort: 81
+            protocol: http
+        image: "image-name"
+        build:
+          dockerfile: "Dockerfile"
+          context: "."
+  conditions:
+    - type: defined
+      reason: Success
+      status: "True"
+      success: true
+  jobsStatus:
+    oneimage: {}

pkg/controller/appdefinition/testdata/job/stopped-app/expected.yaml.d/serviceaccount.yaml

@@ -0,0 +1,11 @@
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: oneimage
+  namespace: app-created-namespace
+  labels:
+    acorn.io/app-name: app-name
+    acorn.io/app-public-name: "app-name"
+    acorn.io/app-namespace: app-namespace
+    acorn.io/managed: "true"
+    acorn.io/job-name: "oneimage"

pkg/controller/appdefinition/testdata/job/stopped-app/input.yaml

@@ -0,0 +1,31 @@
+kind: AppInstance
+apiVersion: internal.acorn.io/v1
+metadata:
+  name: app-name
+  namespace: app-namespace
+  uid: 1234567890abcdef
+spec:
+  stop: true
+  image: test
+status:
+  namespace: app-created-namespace
+  appImage:
+    id: test
+  appSpec:
+    jobs:
+      oneimage:
+        sidecars:
+          left:
+            image: "foo"
+            ports:
+              - port: 90
+                targetPort: 91
+                protocol: tcp
+        ports:
+        - port: 80
+          targetPort: 81
+          protocol: http
+        image: "image-name"
+        build:
+          dockerfile: "Dockerfile"
+          context: "."

pkg/controller/appstatus/status.go

@@ -293,7 +293,9 @@ func JobStatus(req router.Request, resp router.Response) error {
 			messageSet.Insert(message...)
 		}
 		jobStatus := v1.JobStatus{
-			Message: strings.Join(messageSet.List(), "; "),
+			Message:              strings.Join(messageSet.List(), "; "),
+			CreateEventSucceeded: app.Status.JobsStatus[job.Name].CreateEventSucceeded,
+			Skipped:              app.Status.JobsStatus[job.Name].Skipped,
 		}
 		if job.Status.Active > 0 {
 			jobStatus.Running = true