From 58318be43909763e1122e8becb51def89ab4acc7 Mon Sep 17 00:00:00 2001
From: Vishal Choudhary <vishal.choudhary@nirmata.com>
Date: Thu, 2 Jan 2025 13:30:08 +0530
Subject: [PATCH] fix: sync with upstream release (#25)

* fix: change label selector for kubectl wait in post install job



* fix: chainsaw tests



* fix: tests



* fix: regex



---------

Signed-off-by: Vishal Choudhary <vishal.choudhary@nirmata.com>
---
 .github/workflows/conformance-tests.yaml                   | 7 +++----
 .github/workflows/migration-tests.yaml                     | 7 +++----
 .../templates/hooks/post-install-api-services.yaml         | 2 +-
 .../templates/hooks/pre-delete-api-service-cleanup.yaml    | 2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/conformance-tests.yaml b/.github/workflows/conformance-tests.yaml
index f108eb9..726bd9b 100644
--- a/.github/workflows/conformance-tests.yaml
+++ b/.github/workflows/conformance-tests.yaml
@@ -88,9 +88,8 @@ jobs:
           set -e
           set -e
           export HELM=${{ steps.helm.outputs.helm-path }}
-          helm repo add kyverno https://kyverno.github.io/kyverno/
-          kubectl create namespace kyverno
-          helm install kyverno --namespace kyverno kyverno/kyverno --set features.policyExceptions.enabled=true --set features.policyExceptions.namespace='*'
+          curl https://raw.githubusercontent.com/kyverno/kyverno/refs/heads/main/scripts/config/standard/kyverno.yaml > values.yaml
+          helm install kyverno -n kyverno --create-namespace ./kyverno/charts/kyverno --wait --values values.yaml
       - name: Wait for kyverno ready
         run: |
           set -e
@@ -106,7 +105,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           set -e
-          cd ./kyverno/test/conformance/chainsaw && chainsaw test --config ./../../../../.chainsaw.yaml --include-test-regex '^chainsaw$/${{ matrix.tests }}' --no-color=false
+          cd ./kyverno/test/conformance/chainsaw/reports && chainsaw test --config ./../../../../../.chainsaw.yaml --exclude-test-regex '^chainsaw$/^admission$/^label'
       - name: Debug failure
         if: failure()
         uses: ./.github/actions/failure-logs
diff --git a/.github/workflows/migration-tests.yaml b/.github/workflows/migration-tests.yaml
index b767f28..665d791 100644
--- a/.github/workflows/migration-tests.yaml
+++ b/.github/workflows/migration-tests.yaml
@@ -78,9 +78,8 @@ jobs:
         run: |
           set -e
           export HELM=${{ steps.helm.outputs.helm-path }}
-          helm repo add kyverno https://kyverno.github.io/kyverno/
-          kubectl create namespace kyverno
-          helm install kyverno --namespace kyverno kyverno/kyverno --set features.policyExceptions.enabled=true --set features.policyExceptions.namespace='*'
+          curl https://raw.githubusercontent.com/kyverno/kyverno/refs/heads/main/scripts/config/standard/kyverno.yaml > values.yaml
+          helm install kyverno -n kyverno --create-namespace ./kyverno/charts/kyverno --wait --values values.yaml
       - name: Wait for kyverno ready
         run: |
           set -e
@@ -120,7 +119,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           set -e
-          cd ./kyverno/test/conformance/chainsaw && chainsaw test --config ./../../../../.chainsaw.yaml --include-test-regex '^chainsaw$/${{ matrix.tests }}' --no-color=false
+          cd ./kyverno/test/conformance/chainsaw/reports && chainsaw test --config ./../../../../../.chainsaw.yaml --exclude-test-regex '^chainsaw$/^admission$/^label'
       - name: Debug failure
         if: failure()
         uses: ./.github/actions/failure-logs
diff --git a/charts/reports-server/templates/hooks/post-install-api-services.yaml b/charts/reports-server/templates/hooks/post-install-api-services.yaml
index f028ae6..9c6ca2e 100644
--- a/charts/reports-server/templates/hooks/post-install-api-services.yaml
+++ b/charts/reports-server/templates/hooks/post-install-api-services.yaml
@@ -42,7 +42,7 @@ spec:
             - '-c'
             - |-
               set -euo pipefail
-              kubectl wait -n {{ $.Release.Namespace }} pod --for=condition=ready -l app.kubernetes.io/name={{ include "reports-server.fullname" . }} --timeout=120s
+              kubectl wait -n {{ $.Release.Namespace }} pod --for=condition=ready -l app.kubernetes.io/name={{ include "reports-server.name" . }} --timeout=120s
               kubectl apply -f - <<EOF
               {
                 "apiVersion": "apiregistration.k8s.io/v1",
diff --git a/charts/reports-server/templates/hooks/pre-delete-api-service-cleanup.yaml b/charts/reports-server/templates/hooks/pre-delete-api-service-cleanup.yaml
index bbd5d85..de739e4 100644
--- a/charts/reports-server/templates/hooks/pre-delete-api-service-cleanup.yaml
+++ b/charts/reports-server/templates/hooks/pre-delete-api-service-cleanup.yaml
@@ -43,7 +43,7 @@ spec:
             - '-c'
             - |-
               set -euo pipefail
-              kubectl wait -n {{ $.Release.Namespace }} pod --for=condition=ready -l app.kubernetes.io/name={{ include "reports-server.fullname" . }} --timeout=120s
+              kubectl wait -n {{ $.Release.Namespace }} pod --for=condition=ready -l app.kubernetes.io/name={{ include "reports-server.name" . }} --timeout=120s
               kubectl delete apiservice v1alpha2.wgpolicyk8s.io v1.reports.kyverno.io --ignore-not-found=true
           {{- with .Values.apiServicesManagement.securityContext }}
           securityContext: