Update tests to account for new ServiceAccount generation logic

Signed-off-by: tylerslaton <mtslaton1@gmail.com>

pkg/controller/appdefinition/testdata/cronjob/expected.yaml

@@ -42,7 +42,7 @@ spec:
           imagePullSecrets:
             - name: oneimage-pull-1234567890ab
           restartPolicy: Never
-          serviceAccountName: acorn
+          serviceAccountName: oneimage
           enableServiceLinks: false
           terminationGracePeriodSeconds: 5
           containers:

pkg/controller/appdefinition/testdata/cronjob/expected.yaml.d/serviceaccount.yaml

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

pkg/controller/appdefinition/testdata/depends/expected.yaml.d/deployment.yaml

@@ -30,7 +30,7 @@ spec:
       terminationGracePeriodSeconds: 5
       enableServiceLinks: false
       hostname: container-name
-      serviceAccountName: acorn
+      serviceAccountName: container-name
       imagePullSecrets:
         - name: container-name-pull-1234567890ab
       containers:
@@ -70,7 +70,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       enableServiceLinks: false
-      serviceAccountName: acorn
+      serviceAccountName: web
       hostname: web
       imagePullSecrets:
         - name: web-pull-1234567890ab

pkg/controller/appdefinition/testdata/depends/expected.yaml.d/serviceaccount.yaml

@@ -1,9 +1,39 @@
 kind: ServiceAccount
 apiVersion: v1
 metadata:
-  name: acorn
+  name: container-name
   namespace: app-created-namespace
   labels:
     acorn.io/app-name: app-name
     acorn.io/app-namespace: app-namespace
     acorn.io/managed: "true"
+    acorn.io/container-name: container-name
+  annotations:
+    acorn.io/dep-names: db
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: container-name
+  namespace: app-created-namespace
+  labels:
+    acorn.io/app-name: app-name
+    acorn.io/app-namespace: app-namespace
+    acorn.io/managed: "true"
+    acorn.io/container-name: container-name
+  annotations:
+    acorn.io/dep-names: db
+---
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: web
+  namespace: app-created-namespace
+  labels:
+    acorn.io/app-name: app-name
+    acorn.io/app-namespace: app-namespace
+    acorn.io/managed: "true"
+    acorn.io/container-name: web
+  annotations:
+    acorn.io/dep-names: container-name
+    apply.acorn.io/create: "false"
+    apply.acorn.io/update: "false"

pkg/controller/appdefinition/testdata/deployspec-stop/expected.yaml

@@ -39,7 +39,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       enableServiceLinks: false
-      serviceAccountName: acorn
+      serviceAccountName: oneimage
       hostname: oneimage
       imagePullSecrets:
         - name: oneimage-pull-1234567890ab
@@ -78,7 +78,7 @@ spec:
       terminationGracePeriodSeconds: 5
       enableServiceLinks: false
       hostname: buildimage
-      serviceAccountName: acorn
+      serviceAccountName: buildimage
       imagePullSecrets:
         - name: buildimage-pull-1234567890ab
       containers:

pkg/controller/appdefinition/testdata/deployspec-stop/expected.yaml.d/serviceaccount.yaml

@@ -1,9 +1,21 @@
 kind: ServiceAccount
 apiVersion: v1
 metadata:
-  name: acorn
+  name: oneimage
   namespace: app-created-namespace
   labels:
     acorn.io/app-name: app-name
     acorn.io/app-namespace: app-namespace
     acorn.io/managed: "true"
+    acorn.io/container-name: oneimage
+---
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: buildimage
+  namespace: app-created-namespace
+  labels:
+    acorn.io/app-name: app-name
+    acorn.io/app-namespace: app-namespace
+    acorn.io/managed: "true"
+    acorn.io/container-name: buildimage

pkg/controller/appdefinition/testdata/deployspec/expected.yaml

@@ -40,7 +40,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       enableServiceLinks: false
-      serviceAccountName: acorn
+      serviceAccountName: oneimage
       hostname: oneimage
       imagePullSecrets:
         - name: oneimage-pull-1234567890ab
@@ -90,7 +90,7 @@ spec:
         "acorn.io/container-spec": '{"build":{"context":".","dockerfile":"custom-dockerfile"},"image":"sha256:build-image","probes":null}'
     spec:
       terminationGracePeriodSeconds: 5
-      serviceAccountName: acorn
+      serviceAccountName: buildimage
       enableServiceLinks: false
       hostname: buildimage
       imagePullSecrets:

pkg/controller/appdefinition/testdata/deployspec/expected.yaml.d/serviceaccount.yaml

@@ -1,9 +1,21 @@
 kind: ServiceAccount
 apiVersion: v1
 metadata:
-  name: acorn
+  name: oneimage
   namespace: app-created-namespace
   labels:
     acorn.io/app-name: app-name
     acorn.io/app-namespace: app-namespace
     acorn.io/managed: "true"
+    acorn.io/container-name: oneimage
+---
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: buildimage
+  namespace: app-created-namespace
+  labels:
+    acorn.io/app-name: app-name
+    acorn.io/app-namespace: app-namespace
+    acorn.io/managed: "true"
+    acorn.io/container-name: buildimage

pkg/controller/appdefinition/testdata/files-bug/expected.yaml.d/deployment.yaml

@@ -30,7 +30,7 @@ spec:
         - name: oneimage-pull-1234567890ab
       enableServiceLinks: false
       hostname: oneimage
-      serviceAccountName: acorn
+      serviceAccountName: oneimage
       containers:
         - name: oneimage
           image: image-name

pkg/controller/appdefinition/testdata/files-bug/expected.yaml.d/serviceaccount.yaml

@@ -1,9 +1,10 @@
 kind: ServiceAccount
 apiVersion: v1
 metadata:
-  name: acorn
+  name: oneimage
   namespace: app-created-namespace
   labels:
     acorn.io/app-name: app-name
     acorn.io/app-namespace: app-namespace
     acorn.io/managed: "true"
+    acorn.io/container-name: oneimage

pkg/controller/appdefinition/testdata/files/expected.yaml.d/deployment.yaml

@@ -30,7 +30,7 @@ spec:
         - name: oneimage-pull-1234567890ab
       enableServiceLinks: false
       hostname: oneimage
-      serviceAccountName: acorn
+      serviceAccountName: oneimage
       containers:
         - name: oneimage
           image: image-name

pkg/controller/appdefinition/testdata/files/expected.yaml.d/serviceaccount.yaml

@@ -1,9 +1,10 @@
 kind: ServiceAccount
 apiVersion: v1
 metadata:
-  name: acorn
+  name: oneimage
   namespace: app-created-namespace
   labels:
     acorn.io/app-name: app-name
     acorn.io/app-namespace: app-namespace
     acorn.io/managed: "true"
+    acorn.io/container-name: oneimage

pkg/controller/appdefinition/testdata/globalenv/expected.yaml.d/deployment.yaml

@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       enableServiceLinks: false
-      serviceAccountName: acorn
+      serviceAccountName: container-name
       hostname: container-name
       imagePullSecrets:
         - name: container-name-pull-1234567890ab

pkg/controller/appdefinition/testdata/globalenv/expected.yaml.d/serviceaccount.yaml

@@ -1,9 +1,10 @@
 kind: ServiceAccount
 apiVersion: v1
 metadata:
-  name: acorn
+  name: container-name
   namespace: app-created-namespace
   labels:
     acorn.io/app-name: app-name
     acorn.io/app-namespace: app-namespace
     acorn.io/managed: "true"
+    acorn.io/container-name: container-name

pkg/controller/appdefinition/testdata/ingress/basic/expected.yaml.d/deployment.yaml

@@ -32,7 +32,7 @@ spec:
       terminationGracePeriodSeconds: 5
       hostname: oneimage
       enableServiceLinks: false
-      serviceAccountName: acorn
+      serviceAccountName: oneimage
       imagePullSecrets:
         - name: oneimage-pull-1234567890ab
       containers:
@@ -86,7 +86,7 @@ spec:
       hostname: buildimage
       terminationGracePeriodSeconds: 5
       enableServiceLinks: false
-      serviceAccountName: acorn
+      serviceAccountName: buildimage
       imagePullSecrets:
         - name: buildimage-pull-1234567890ab
       containers:

pkg/controller/appdefinition/testdata/ingress/basic/expected.yaml.d/serviceaccount.yaml

@@ -1,9 +1,21 @@
 kind: ServiceAccount
 apiVersion: v1
 metadata:
-  name: acorn
+  name: oneimage
   namespace: app-created-namespace
   labels:
     acorn.io/app-name: app-name
     acorn.io/app-namespace: app-namespace
     acorn.io/managed: "true"
+    acorn.io/container-name: oneimage
+---
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: buildimage
+  namespace: app-created-namespace
+  labels:
+    acorn.io/app-name: app-name
+    acorn.io/app-namespace: app-namespace
+    acorn.io/managed: "true"
+    acorn.io/container-name: buildimage

pkg/controller/appdefinition/testdata/ingress/clusterdomainport/expected.yaml.d/deployment.yaml

@@ -31,7 +31,7 @@ spec:
       terminationGracePeriodSeconds: 5
       hostname: oneimage
       enableServiceLinks: false
-      serviceAccountName: acorn
+      serviceAccountName: oneimage
       imagePullSecrets:
         - name: oneimage-pull-1234567890ab
       containers:

pkg/controller/appdefinition/testdata/ingress/clusterdomainport/expected.yaml.d/serviceaccount.yaml

@@ -1,9 +1,10 @@
 kind: ServiceAccount
 apiVersion: v1
 metadata:
-  name: acorn
+  name: oneimage
   namespace: app-created-namespace
   labels:
     acorn.io/app-name: app-name
     acorn.io/app-namespace: app-namespace
     acorn.io/managed: "true"
+    acorn.io/container-name: oneimage

pkg/controller/appdefinition/testdata/ingress/labels/expected.yaml.d/deployment.yaml

@@ -52,7 +52,7 @@ spec:
       terminationGracePeriodSeconds: 5
       hostname: con1
       enableServiceLinks: false
-      serviceAccountName: acorn
+      serviceAccountName: con1
       imagePullSecrets:
         - name: con1-pull-1234567890ab
       containers:

pkg/controller/appdefinition/testdata/ingress/labels/expected.yaml.d/serviceaccount.yaml

@@ -1,14 +1,21 @@
 kind: ServiceAccount
 apiVersion: v1
 metadata:
-  name: acorn
+  name: con1
   namespace: app-created-namespace
   labels:
-    acorn.io/app-name: app-name
     acorn.io/app-namespace: app-namespace
+    acorn.io/app-name: app-name
+    acorn.io/container-name: con1
     acorn.io/managed: "true"
+    allconsl1: value
+    conl1: value
+    conl3: value
     globall1: value
     globall2: value
   annotations:
+    allconsa1: value
+    cona1: value
+    cona3: value
     globala1: value
     globala2: value

pkg/controller/appdefinition/testdata/ingress/letsencrypt/expected.yaml.d/deployment.yaml

@@ -29,7 +29,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       enableServiceLinks: false
-      serviceAccountName: acorn
+      serviceAccountName: app1
       hostname: app1
       imagePullSecrets:
         - name: app1-pull-1234567890ab
@@ -74,7 +74,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       enableServiceLinks: false
-      serviceAccountName: acorn
+      serviceAccountName: app2
       hostname: app2
       imagePullSecrets:
         - name: app2-pull-1234567890ab

pkg/controller/appdefinition/testdata/ingress/letsencrypt/expected.yaml.d/serviceaccount.yaml

@@ -1,9 +1,22 @@
 kind: ServiceAccount
 apiVersion: v1
 metadata:
-  name: acorn
+  name: app1
   namespace: app-created-namespace
   labels:
     acorn.io/app-name: app-name
     acorn.io/app-namespace: app-namespace
     acorn.io/managed: "true"
+    acorn.io/container-name: app1
+---
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: app2
+  namespace: app-created-namespace
+  labels:
+    acorn.io/app-name: app-name
+    acorn.io/app-namespace: app-namespace
+    acorn.io/managed: "true"
+    acorn.io/container-name: app2
+

pkg/controller/appdefinition/testdata/ingress/prefix/prefix-1/expected.yaml.d/deployment.yaml

@@ -52,7 +52,7 @@ spec:
       terminationGracePeriodSeconds: 5
       hostname: con1
       enableServiceLinks: false
-      serviceAccountName: acorn
+      serviceAccountName: con1
       imagePullSecrets:
         - name: con1-pull-1234567890ab
       containers:

pkg/controller/appdefinition/testdata/ingress/prefix/prefix-1/expected.yaml.d/serviceaccount.yaml

@@ -1,14 +1,21 @@
 kind: ServiceAccount
 apiVersion: v1
 metadata:
-  name: acorn
+  name: con1
   namespace: app-created-namespace
   labels:
     acorn.io/app-name: app-name
     acorn.io/app-namespace: app-namespace
+    acorn.io/container-name: con1
     acorn.io/managed: "true"
+    allconsl1: value
+    conl1: value
+    conl3: value
     globall1: value
     globall2: value
   annotations:
+    allconsa1: value
+    cona1: value
+    cona3: value
     globala1: value
     globala2: value