Merge remote-tracking branch 'origin/ci/update-helm-unittest'

charts/.utils/gitlab-ci.yaml

 .chart-matrix:
+  tags:
+    - kubernetes
   parallel:
     matrix:
       - CHART:
@@ -38,11 +40,11 @@ chart-helm-unittest:
   stage: lint
   extends: .chart-matrix
   image:
-    name: docker.io/quintush/helm-unittest:3.10.1-0.2.9
+    name: docker.io/helmunittest/helm-unittest:3.11.2-0.3.1
     entrypoint: [""]
   script:
     - if [ ! -e charts/${CHART}/tests ]; then echo "No helm unittests"; exit 0; fi
-    - helm unittest -3 -o helm-unittest-${CHART}.xml -t junit charts/${CHART}
+    - helm unittest -o helm-unittest-${CHART}.xml -t junit charts/${CHART}
   artifacts:
     when: always
     reports:

charts/keycloak/tests/helmlabels_test.yaml

@@ -26,11 +26,11 @@ tests:
       version: 1.2.3
     asserts:
       - equal:
-          path: metadata.labels.[app.kubernetes.io/instance]
+          path: metadata.labels["app.kubernetes.io/instance"]
           value: "test-suite"
       - equal:
-          path: metadata.labels.[app.kubernetes.io/managed-by]
+          path: metadata.labels["app.kubernetes.io/managed-by"]
           value: "Helm"
       - equal:
-          path: metadata.labels.[app.kubernetes.io/name]
+          path: metadata.labels["app.kubernetes.io/name"]
           value: "keycloak"

charts/mastodon/tests/50_sidekiq_test.yaml

@@ -65,17 +65,17 @@ tests:
       - mocks/sidekiq.yaml
     asserts:
       - equal:
-          path: spec.selector.matchLabels.app\.kubernetes\.io/component
+          path: spec.selector.matchLabels["app.kubernetes.io/component"]
           value: sidekiq-scheduler
         documentIndex: 0
         template: deployment-sidekiq.yaml
       - equal:
-          path: spec.selector.matchLabels.app\.kubernetes\.io/component
+          path: spec.selector.matchLabels["app.kubernetes.io/component"]
           value: sidekiq-default
         documentIndex: 1
         template: deployment-sidekiq.yaml
       - equal:
-          path: spec.selector.matchLabels.app\.kubernetes\.io/part-of
+          path: spec.selector.matchLabels["app.kubernetes.io/part-of"]
           value: rails
         template: deployment-sidekiq.yaml
           

charts/mastodon/tests/99_helmlabels_test.yaml

@@ -31,11 +31,11 @@ tests:
       version: 1.2.3
     asserts:
       - equal:
-          path: metadata.labels.[app.kubernetes.io/instance]
+          path: metadata.labels["app.kubernetes.io/instance"]
           value: "test-suite"
       - equal:
-          path: metadata.labels.[app.kubernetes.io/managed-by]
+          path: metadata.labels["app.kubernetes.io/managed-by"]
           value: "Helm"
       - equal:
-          path: metadata.labels.[app.kubernetes.io/name]
+          path: metadata.labels["app.kubernetes.io/name"]
           value: "mastodon"

charts/mok/tests/__snapshot__/postfix_test.yaml.snap

@@ -72,8 +72,7 @@ should match snapshot:
                   command:
                     - sh
                     - -c
-                - ps axf | fgrep -v grep | fgrep -q "supervisord" && ps axf | fgrep -v
-                  grep | fgrep -q "/usr/libexec/postfix/master"
+                    - ps axf | fgrep -v grep | fgrep -q "supervisord" && ps axf | fgrep -v grep | fgrep -q "/usr/libexec/postfix/master"
                 failureThreshold: 1
                 initialDelaySeconds: 5
                 periodSeconds: 5
@@ -90,8 +89,7 @@ should match snapshot:
                   command:
                     - sh
                     - -c
-                - printf "EHLO healthcheck\n" | nc 127.0.0.1 587 | grep -qE "^220.*ESMTP
-                  Postfix"
+                    - printf "EHLO healthcheck\n" | nc 127.0.0.1 587 | grep -qE "^220.*ESMTP Postfix"
                 initialDelaySeconds: 5
                 periodSeconds: 60
                 timeoutSeconds: 5
@@ -121,8 +119,7 @@ should match snapshot:
                   command:
                     - sh
                     - -c
-                - ps axf | fgrep -v grep | fgrep -q "supervisord" && ps axf | fgrep -v
-                  grep | fgrep -q "/usr/libexec/postfix/master"
+                    - ps axf | fgrep -v grep | fgrep -q "supervisord" && ps axf | fgrep -v grep | fgrep -q "/usr/libexec/postfix/master"
                 failureThreshold: 12
                 initialDelaySeconds: 2
                 periodSeconds: 5

charts/mok/tests/dovecot_test.yaml

@@ -96,7 +96,7 @@ tests:
         secretName: example-tls
     asserts:
       - equal:
-          path: spec.template.metadata.annotations.[checksum/config]
+          path: spec.template.metadata.annotations["checksum/config"]
           value: 66ea930a9b7e50528ddc0aa54786d07f78c7f56d1daea45b21d9eb94f8e5c4f2
         documentIndex: 2
         template: dovecot.yaml
@@ -113,7 +113,7 @@ tests:
               passwordHash: NotReallyAHash
     asserts:
       - equal:
-          path: spec.template.metadata.annotations.[checksum/config]
+          path: spec.template.metadata.annotations["checksum/config"]
           value: 9215abccdd6c1f21fd329db0133f6f8e892c50aab3dcde3259ea797e8ad2a959
         documentIndex: 2
         template: dovecot.yaml

charts/mok/tests/helmlabels_test.yaml

@@ -21,11 +21,11 @@ tests:
       version: 1.2.3
     asserts:
       - equal:
-          path: metadata.labels.[app.kubernetes.io/instance]
+          path: metadata.labels["app.kubernetes.io/instance"]
           value: "test-suite"
       - equal:
-          path: metadata.labels.[app.kubernetes.io/managed-by]
+          path: metadata.labels["app.kubernetes.io/managed-by"]
           value: "Helm"
       - equal:
-          path: metadata.labels.[app.kubernetes.io/name]
+          path: metadata.labels["app.kubernetes.io/name"]
           value: "mok"

charts/mok/tests/networkpolicies_test.yaml

@@ -65,7 +65,7 @@ tests:
           value: 0.0.0.0/0
         documentIndex: 0
         template: networkpolicy.yaml
-      - isEmpty:
+      - isNull:
           path: spec.ingress[1].from[0].ipBlock.except
         documentIndex: 0
         template: networkpolicy.yaml
@@ -100,7 +100,7 @@ tests:
           value: 0.0.0.0/0
         documentIndex: 0
         template: networkpolicy.yaml
-      - isEmpty:
+      - isNull:
           path: spec.ingress[1].from[0].ipBlock.except
         documentIndex: 0
         template: networkpolicy.yaml
@@ -135,7 +135,7 @@ tests:
           value: 0.0.0.0/0
         documentIndex: 0
         template: networkpolicy.yaml
-      - isEmpty:
+      - isNull:
           path: spec.ingress[1].from[0].ipBlock.except
         documentIndex: 0
         template: networkpolicy.yaml
@@ -164,7 +164,7 @@ tests:
           value: 0.0.0.0/0
         documentIndex: 1
         template: networkpolicy.yaml
-      - isEmpty:
+      - isNull:
           path: spec.ingress[0].from[0].ipBlock.except
         documentIndex: 1
         template: networkpolicy.yaml
@@ -192,7 +192,7 @@ tests:
           value: 0.0.0.0/0
         documentIndex: 1
         template: networkpolicy.yaml
-      - isEmpty:
+      - isNull:
           path: spec.ingress[0].from[0].ipBlock.except
         documentIndex: 1
         template: networkpolicy.yaml
@@ -232,7 +232,7 @@ tests:
           value: 127.0.123.123/32
         documentIndex: 1
         template: networkpolicy.yaml
-      - isEmpty:
+      - isNull:
           path: spec.ingress[1].from[0].ipBlock.except
         documentIndex: 1
         template: networkpolicy.yaml

charts/mok/tests/postfix_test.yaml

@@ -82,7 +82,7 @@ tests:
         secretName: example-tls
     asserts:
       - equal:
-          path: spec.template.metadata.annotations.[checksum/config]
+          path: spec.template.metadata.annotations["checksum/config"]
           value: 66ea930a9b7e50528ddc0aa54786d07f78c7f56d1daea45b21d9eb94f8e5c4f2
         documentIndex: 1
         template: postfix.yaml
@@ -99,7 +99,7 @@ tests:
               passwordHash: NotReallyAHash
     asserts:
       - equal:
-          path: spec.template.metadata.annotations.[checksum/config]
+          path: spec.template.metadata.annotations["checksum/config"]
           value: 9215abccdd6c1f21fd329db0133f6f8e892c50aab3dcde3259ea797e8ad2a959
         documentIndex: 1
         template: postfix.yaml