add upgradeJobAnnotations to pod and adding more tests (#381)

Signed-off-by: Hung Nguyen <hung.tran.nguyen.585@gmail.com>
anchore · May 23, 2024 · 1fb1889 · 1fb1889
1 parent 34755e6
commit 1fb1889
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 3 deletions.
diff --git a/stable/feeds/Chart.yaml b/stable/feeds/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: feeds
 type: application
-version: "2.5.2"
+version: "2.5.3"
 appVersion: "5.5.1"
 kubeVersion: 1.23.x - 1.27.x || 1.23.x-x - 1.29.x-x
 description: Anchore feeds service

diff --git a/stable/feeds/templates/hooks/post-upgrade/upgrade_job.yaml b/stable/feeds/templates/hooks/post-upgrade/upgrade_job.yaml
@@ -16,7 +16,7 @@ spec:
     metadata:
       name: {{ template "feeds.upgradeJob.fullname" . }}
       labels: {{- include "feeds.common.labels" (merge (dict "component" $component) .) | nindent 8 }}
-      annotations: {{- include "feeds.common.annotations" . | nindent 8 }}
+      annotations: {{- include "feeds.common.annotations" (merge (dict "component" $component "nil" true) .) | nindent 8 }}
     spec:
     {{- with .Values.securityContext }}
       securityContext: {{- toYaml . | nindent 8 }}

diff --git a/stable/feeds/templates/hooks/pre-upgrade/upgrade_job.yaml b/stable/feeds/templates/hooks/pre-upgrade/upgrade_job.yaml
@@ -20,7 +20,7 @@ spec:
     metadata:
       name: {{ template "feeds.upgradeJob.fullname" . }}
       labels: {{- include "feeds.common.labels" (merge (dict "component" $component) .) | nindent 8 }}
-      annotations: {{- include "feeds.common.annotations" . | nindent 8 }}
+      annotations: {{- include "feeds.common.annotations" (merge (dict "component" $component "nil" true) .) | nindent 8 }}
     spec:
     {{- with .Values.securityContext }}
       securityContext: {{- toYaml . | nindent 8 }}

diff --git a/stable/feeds/tests/common_helpers_test.yaml b/stable/feeds/tests/common_helpers_test.yaml
@@ -101,6 +101,34 @@ tests:
             foo: upgradeJobAnnotation1
             bar: upgradeJobAnnotation2
 
+  - it: should render component annotations and global annotations on the pods
+    templates:
+      - templates/hooks/pre-upgrade/upgrade_job.yaml
+    documentIndex: 0
+    set:
+      feedsUpgradeJob:
+        annotations:
+          foo: upgradeJob1
+          bar: upgradeJob2
+      annotations:
+        fizz: global1
+        boo: global2
+    asserts:
+      - isSubset:
+          path: metadata.annotations
+          content:
+            fizz: global1
+            boo: global2
+            foo: upgradeJob1
+            bar: upgradeJob2
+      - isSubset:
+          path: spec.template.metadata.annotations
+          content:
+            fizz: global1
+            boo: global2
+            foo: upgradeJob1
+            bar: upgradeJob2
+
   - it: should render component labels and global labels
     templates:
       - templates/hooks/pre-upgrade/upgrade_job.yaml
@@ -123,6 +151,35 @@ tests:
             foo: upgradeJoblabel1
             bar: upgradeJoblabel2
 
+  - it: should render component labels and global labels on the pods
+    templates:
+      - templates/hooks/pre-upgrade/upgrade_job.yaml
+    documentIndex: 0
+    set:
+      feedsUpgradeJob:
+        labels:
+          foo: upgradeJoblabel1
+          bar: upgradeJoblabel2
+      labels:
+        fizz: global1
+        boo: global2
+    asserts:
+      - isSubset:
+          path: metadata.labels
+          content:
+            fizz: global1
+            boo: global2
+            foo: upgradeJoblabel1
+            bar: upgradeJoblabel2
+
+      - isSubset:
+          path: spec.template.metadata.labels
+          content:
+            fizz: global1
+            boo: global2
+            foo: upgradeJoblabel1
+            bar: upgradeJoblabel2
+
   - it: should render component labels and global labels postupgradeJob
     templates:
       - templates/hooks/post-upgrade/upgrade_job.yaml
@@ -166,6 +223,13 @@ tests:
             boo: global2
             foo: upgradeJob1
             bar: upgradeJob2
+      - isSubset:
+          path: spec.template.metadata.annotations
+          content:
+            fizz: global1
+            boo: global2
+            foo: upgradeJob1
+            bar: upgradeJob2
 
   - it: should render file checksum/secret annotation
     template: deployment.yaml