adjust tests now that st2canary is in jobs.yaml

Author: cognifloyd

tests/unit/custom_annotations_test.yaml

@@ -7,7 +7,6 @@ templates:
   - jobs.yaml
   - service-account.yaml
   - services.yaml
-  - hooks/pod_packs-volumes.yaml
 
   # included templates must also be listed
   - configmaps_overrides.yaml
@@ -151,6 +150,28 @@ tests:
       st2:
         rbac:
           enabled: true # enable rbac job
+        packs:
+          sensors: [] # ensure only 1 sensor
+          images: []
+          volumes:
+            enabled: true
+            packs:
+              nfs:
+                server: "10.12.34.56"
+                path: /var/nfsshare/packs
+            virtualenvs:
+              nfs:
+                server: "10.12.34.56"
+                path: /var/nfsshare/virtualenvs
+            configs:
+              nfs:
+                server: "10.12.34.56"
+                path: /var/nfsshare/configs
+          configs: {} # has one core.yaml config file by default (dicts get merged)
+      st2canary:
+        annotations:
+          foo: bar
+          answer: "42"
       jobs:
         annotations:
           foo: bar
@@ -162,11 +183,12 @@ tests:
             command: ["st2", "run", "--tail", "custom_pack.warn_about_upgrade"]
     asserts:
       - hasDocuments:
-          count: 5
+          count: 6
           # job-st2-apply-rbac-defintions
           # job-st2-apikey-load
           # job-st2-key-load
           # job-st2-register-content
+          # job-st2canary-for-writable-packs-volumes
           # extra_hooks job
 
       # job annotations
@@ -188,42 +210,3 @@ tests:
       - equal:
           path: spec.template.metadata.annotations.answer
           value: "42"
-
-  - it: Hook with st2.packs.volumes
-    template: hooks/pod_packs-volumes.yaml
-    set:
-      st2:
-        packs:
-          sensors: [] # ensure only 1 sensor
-          images: []
-          volumes:
-            enabled: true
-            packs:
-              nfs:
-                server: "10.12.34.56"
-                path: /var/nfsshare/packs
-            virtualenvs:
-              nfs:
-                server: "10.12.34.56"
-                path: /var/nfsshare/virtualenvs
-            configs:
-              nfs:
-                server: "10.12.34.56"
-                path: /var/nfsshare/configs
-          configs: {} # has one core.yaml config file by default (dicts get merged)
-      st2canary:
-        annotations:
-          foo: bar
-          answer: "42"
-    asserts:
-      - hasDocuments:
-          count: 1
-
-      - isNotNull:
-          path: metadata.annotations
-      - equal:
-          path: metadata.annotations.foo
-          value: bar
-      - equal:
-          path: metadata.annotations.answer
-          value: "42"

tests/unit/dns_test.yaml

@@ -4,7 +4,6 @@ templates:
   # primary template files
   - deployments.yaml
   - jobs.yaml
-  - hooks/pod_packs-volumes.yaml
 
   # included templates must also be listed
   - configmaps_overrides.yaml
@@ -24,31 +23,13 @@ tests:
     templates:
       - deployments.yaml
       - jobs.yaml
-    set:
-      st2:
-        packs: { sensors: [] } # ensure only 1 sensor
-        rbac: { enabled: true } # enable rbac job
-      jobs:
-        extra_hooks: &jobs_extra_hooks
-          - name: upgrade-warning
-            hook: pre-upgrade, pre-rollback
-            hook_weight: -5
-            command: ["st2", "run", "--tail", "custom_pack.warn_about_upgrade"]
-    asserts:
-      - isNull:
-          path: spec.template.spec.dnsPolicy
-      - isNull:
-          path: spec.template.spec.dnsConfig
-
-  - it: Hook Pod defaults to no dnsPolicy or dnsConfig
-    template: hooks/pod_packs-volumes.yaml
     set:
       st2:
         packs:
           sensors: [] # ensure only 1 sensor
           images: []
           volumes: &volumes_enabled
-            enabled: true
+            enabled: true # for st2canary volumes job
             packs:
               nfs:
                 server: "10.12.34.56"
@@ -62,11 +43,18 @@ tests:
                 server: "10.12.34.56"
                 path: /var/nfsshare/configs
           configs: {} # has one core.yaml config file by default (dicts get merged)
+        rbac: { enabled: true } # enable rbac job
+      jobs:
+        extra_hooks: &jobs_extra_hooks
+          - name: upgrade-warning
+            hook: pre-upgrade, pre-rollback
+            hook_weight: -5
+            command: ["st2", "run", "--tail", "custom_pack.warn_about_upgrade"]
     asserts:
       - isNull:
-          path: spec.dnsPolicy
+          path: spec.template.spec.dnsPolicy
       - isNull:
-          path: spec.dnsConfig
+          path: spec.template.spec.dnsConfig
 
   - it: Deployments and Jobs accept custom dnsPolicy or dnsConfig
     templates:
@@ -84,37 +72,19 @@ tests:
           - name: ndots
             value: "2"
           - name: edns0
-      st2:
-        packs: { sensors: [] } # ensure only 1 sensor
-        rbac: { enabled: true } # enable rbac job
-      jobs:
-        extra_hooks: *jobs_extra_hooks
-    asserts:
-      - equal:
-          path: spec.template.spec.dnsPolicy
-          value: *dnsPolicy
-      - equal:
-          path: spec.template.spec.dnsConfig
-          value: *dnsConfig
-
-  - it: Hook Pod accepts custom dnsPolicy or dnsConfig
-    template: hooks/pod_packs-volumes.yaml
-    set:
-      dnsPolicy: *dnsPolicy
-      dnsConfig: *dnsConfig
       st2:
         packs:
           sensors: [] # ensure only 1 sensor
           images: []
           volumes: *volumes_enabled
           configs: {} # has one core.yaml config file by default (dicts get merged)
+        rbac: { enabled: true } # enable rbac job
+      jobs:
+        extra_hooks: *jobs_extra_hooks
     asserts:
-      - hasDocuments:
-          count: 1
-
       - equal:
-          path: spec.dnsPolicy
+          path: spec.template.spec.dnsPolicy
           value: *dnsPolicy
       - equal:
-          path: spec.dnsConfig
+          path: spec.template.spec.dnsConfig
           value: *dnsConfig

tests/unit/labels_test.yaml

@@ -4,7 +4,6 @@ templates:
   - deployments.yaml
   - jobs.yaml
   - services.yaml
-  - hooks/pod_packs-volumes.yaml
 
   - configmaps_overrides.yaml
   - configmaps_packs.yaml
@@ -116,6 +115,24 @@ tests:
       st2:
         rbac:
           enabled: true # enable rbac job
+        packs:
+          sensors: [] # ensure only 1 sensor
+          images: [] # no extra packs to load
+          volumes:
+            enabled: true
+            packs:
+              nfs:
+                server: "10.12.34.56"
+                path: /var/nfsshare/packs
+            virtualenvs:
+              nfs:
+                server: "10.12.34.56"
+                path: /var/nfsshare/virtualenvs
+            configs:
+              nfs:
+                server: "10.12.34.56"
+                path: /var/nfsshare/configs
+          configs: {} # has one core.yaml config file by default (dicts get merged)
       jobs:
         extra_hooks:
           - name: upgrade-warning
@@ -124,11 +141,12 @@ tests:
             command: ["st2", "run", "--tail", "custom_pack.warn_about_upgrade"]
     asserts:
       - hasDocuments:
-          count: 5
+          count: 6
           # job-st2-apply-rbac-defintions
           # job-st2-apikey-load
           # job-st2-key-load
           # job-st2-register-content
+          # job-st2canary-for-writable-packs-volumes
           # extra_hooks job
 
       # unlike deployments, jobs should not have selector.matchLabels
@@ -144,8 +162,12 @@ tests:
       - equal: *metadata_labels_instance
       - equal: *spec_template_metadata_labels_instance
 
-      - matchRegex: *regex_metadata_labels_component_backend_or_frontend
-      - matchRegex: *regex_spec_template_metadata_labels_component_backend_or_frontend
+      - matchRegex:
+          path: metadata.labels.[app.kubernetes.io/component]
+          pattern: ^(backend|tests)$
+      - matchRegex:
+          path: spec.template.metadata.labels.[app.kubernetes.io/component]
+          pattern: ^(backend|tests)$
 
       - equal: *metadata_labels_part_of
       - equal: *spec_template_metadata_labels_part_of
@@ -367,40 +389,3 @@ tests:
       - equal: *metadata_labels_app_version
       - equal: *metadata_labels_chart
       - equal: *metadata_labels_managed_by
-
-  - it: Hook Pod has required labels
-    template: hooks/pod_packs-volumes.yaml
-    set:
-      st2:
-        packs:
-          sensors: [] # ensure only 1 sensor
-          images: [] # no extra packs to load
-          volumes:
-            enabled: true
-            packs:
-              nfs:
-                server: "10.12.34.56"
-                path: /var/nfsshare/packs
-            virtualenvs:
-              nfs:
-                server: "10.12.34.56"
-                path: /var/nfsshare/virtualenvs
-            configs:
-              nfs:
-                server: "10.12.34.56"
-                path: /var/nfsshare/configs
-          configs: {} # has one core.yaml config file by default (dicts get merged)
-    asserts:
-      - hasDocuments:
-          count: 1
-      - equal:
-          path: metadata.labels.app
-          value: st2canary
-      - equal: *metadata_labels_instance
-      - equal:
-          path: metadata.labels.tier
-          value: tests
-      - equal: *metadata_labels_part_of
-      - equal: *metadata_labels_app_version
-      - equal: *metadata_labels_chart
-      - equal: *metadata_labels_managed_by