From 93a87f4e8de23a82ac799b6f9d781f360312ff4c Mon Sep 17 00:00:00 2001
From: Trey Dockendorf <tdockendorf@osc.edu>
Date: Thu, 4 Jan 2024 10:24:26 -0500
Subject: [PATCH] Kyverno 1.10.6 upgrade

---
 .github/config/kyverno-values.yaml  | 12 +++++++-----
 .github/workflows/test-private.yaml |  6 +++---
 .github/workflows/test.yaml         |  2 +-
 Makefile                            |  2 +-
 charts/kyverno-policies/Chart.yaml  |  6 +++---
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/config/kyverno-values.yaml b/.github/config/kyverno-values.yaml
index a321fc40..660f3b15 100644
--- a/.github/config/kyverno-values.yaml
+++ b/.github/config/kyverno-values.yaml
@@ -3,11 +3,13 @@ imagePullSecrets:
     registry: docker-registry.osc.edu
     username: robot$webservices-read
     password: IMAGE-PULL-PASSWORD
-replicaCount: 1
-extraArgs:
-  - --loggingFormat=text
-  - --exceptionNamespace=kyverno
-  - --webhookTimeout=20
+admissionController:
+  replicaCount: 1
+  container:
+    extraArgs:
+      - --loggingFormat=text
+      - --exceptionNamespace=kyverno
+      - --webhookTimeout=20
 config:
   # TODO: Remove once fixed: https://github.com/kyverno/kyverno/issues/3190
   resourceFilters:
diff --git a/.github/workflows/test-private.yaml b/.github/workflows/test-private.yaml
index a9898d5f..e94f3d1d 100644
--- a/.github/workflows/test-private.yaml
+++ b/.github/workflows/test-private.yaml
@@ -87,11 +87,11 @@ jobs:
       - name: Install Kyverno
         run: |
           helm repo add kyverno https://kyverno.github.io/kyverno/
-          helm install kyverno kyverno/kyverno -n kyverno --create-namespace -f .github/config/kyverno-values.yaml --version 2.7.5
+          helm install kyverno kyverno/kyverno -n kyverno --create-namespace -f .github/config/kyverno-values.yaml --version 3.0.8
           helm dependency build charts/kyverno-policies
           helm install kyverno-policies charts/kyverno-policies -n kyverno -f .github/config/kyverno-policies-values.yaml
           kubectl apply -f .github/config/k8-ldap-configmaps.yaml
-          timeout 60 /bin/bash -c 'until kubectl get pods -n kyverno -o jsonpath="{.items[0].status.phase}" | grep Running ; do echo "Waiting for Kyverno" ; sleep 10 ; done'
+          timeout 60 /bin/bash -c 'until kubectl get pods -n kyverno -l app.kubernetes.io/component=admission-controller -o jsonpath="{.items[0].status.phase}" | grep Running ; do echo "Waiting for Kyverno" ; sleep 10 ; done'
           sleep 60
       - name: Add namespaces
         run: kubectl apply -f .github/config/namespaces.yaml
@@ -101,6 +101,7 @@ jobs:
       - name: Debug failure
         if: failure()
         run: |
+          kubectl logs -n kyverno -l app.kubernetes.io/component=admission-controller
           kubectl describe node -A
           kubectl describe pod -A
           kubectl describe service -A
@@ -109,4 +110,3 @@ jobs:
             kubectl describe job -A
             kubectl logs job.batch/$(kubectl get jobs -n nominatim -o jsonpath="{.items[0].metadata.name}") -n nominatim
           fi
-          kubectl logs $(kubectl get pods -n kyverno -o jsonpath="{.items[0].metadata.name}") -n kyverno
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index d6b01f9c..cea4947e 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -93,7 +93,7 @@ jobs:
       - name: Install Kyverno
         run: |
           helm repo add kyverno https://kyverno.github.io/kyverno/
-          helm install kyverno kyverno/kyverno -n kyverno --create-namespace --version 2.6.5
+          helm install kyverno kyverno/kyverno -n kyverno --create-namespace --version 3.0.8
       - name: Add namespaces
         run: kubectl create namespace ${{ matrix.chart }}
       - name: Run chart-testing (install)
diff --git a/Makefile b/Makefile
index 2a9ef75d..696fd05e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 KYVERNO_GIT = https://github.com/kyverno/kyverno.git
-KYVERNO_VERSION := "v1.9.5"
+KYVERNO_VERSION := "v1.10.7"
 KYVERNO_DIR := $(ROOT_DIR)/kyverno-cli
 #KYVENOR_CLI := $(KYVERNO_DIR)/cmd/cli/kubectl-kyverno/kubectl-kyverno
 KYVENOR_CLI := $(KYVERNO_DIR)/kyverno
diff --git a/charts/kyverno-policies/Chart.yaml b/charts/kyverno-policies/Chart.yaml
index 8d9c13d0..1f220701 100644
--- a/charts/kyverno-policies/Chart.yaml
+++ b/charts/kyverno-policies/Chart.yaml
@@ -2,11 +2,11 @@ apiVersion: v2
 name: kyverno-policies
 description: OSC Kyverno policies deployment
 type: application
-version: 0.22.0
-appVersion: "v1.9.5"
+version: 0.23.0
+appVersion: "v1.10.6"
 maintainers:
   - name: treydock
 dependencies:
   - name: kyverno-policies
-    version: 2.7.5
+    version: 3.0.7
     repository: https://kyverno.github.io/kyverno/