From ac6dbe6bb4c47fd3a16825a471ef3258a1673a68 Mon Sep 17 00:00:00 2001
From: Chirayu Kapoor <chirayu.kapoor@suse.com>
Date: Mon, 6 May 2024 16:31:21 +0530
Subject: [PATCH] chore: Remove PSP references

Signed-off-by: Chirayu Kapoor <chirayu.kapoor@suse.com>
---
 charts/rancher-k3s-upgrader/0.7.0/Chart.yaml  |  2 +-
 .../0.7.0/templates/psp.yaml                  | 51 -------------------
 charts/rancher-k3s-upgrader/0.7.0/values.yaml |  2 -
 3 files changed, 1 insertion(+), 54 deletions(-)
 delete mode 100644 charts/rancher-k3s-upgrader/0.7.0/templates/psp.yaml

diff --git a/charts/rancher-k3s-upgrader/0.7.0/Chart.yaml b/charts/rancher-k3s-upgrader/0.7.0/Chart.yaml
index 61a8f6a6..8b03b2a1 100644
--- a/charts/rancher-k3s-upgrader/0.7.0/Chart.yaml
+++ b/charts/rancher-k3s-upgrader/0.7.0/Chart.yaml
@@ -7,4 +7,4 @@ sources:
   - "https://github.com/rancher/system-charts/blob/dev-v2.9/charts/rancher-k3s-upgrader"
 version: 0.7.0
 appVersion: v0.13.1
-kubeVersion: '>= 1.23.0-0'
+kubeVersion: '>= 1.25.0-0'
diff --git a/charts/rancher-k3s-upgrader/0.7.0/templates/psp.yaml b/charts/rancher-k3s-upgrader/0.7.0/templates/psp.yaml
deleted file mode 100644
index ca87b996..00000000
--- a/charts/rancher-k3s-upgrader/0.7.0/templates/psp.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-{{- if .Values.global.cattle.psp.enabled }}
-apiVersion: policy/v1beta1
-kind: PodSecurityPolicy
-metadata:
-  name: system-upgrade-controller
-spec:
-  allowPrivilegeEscalation: true
-  allowedCapabilities:
-    - CAP_SYS_BOOT
-  hostNetwork: true
-  hostPID: true
-  hostIPC: true
-  privileged: true
-  runAsUser:
-    rule: RunAsAny
-  seLinux:
-    rule: RunAsAny
-  supplementalGroups:
-    rule: RunAsAny
-  fsGroup:
-    rule: RunAsAny
-  volumes:
-    - "*"
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: system-upgrade-controller-psp
-rules:
-  - apiGroups:
-      - policy
-    resourceNames:
-      - system-upgrade-controller
-    resources:
-      - podsecuritypolicies
-    verbs:
-      - use
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name:  system-upgrade-controller-psp
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: system-upgrade-controller-psp
-subjects:
-  - kind: Group
-    apiGroup: rbac.authorization.k8s.io
-    name: system:serviceaccounts:cattle-system
-{{- end }}
diff --git a/charts/rancher-k3s-upgrader/0.7.0/values.yaml b/charts/rancher-k3s-upgrader/0.7.0/values.yaml
index 015736f0..5535ec11 100644
--- a/charts/rancher-k3s-upgrader/0.7.0/values.yaml
+++ b/charts/rancher-k3s-upgrader/0.7.0/values.yaml
@@ -1,8 +1,6 @@
 global:
   cattle:
     systemDefaultRegistry: ""
-    psp:
-      enabled: true
 
 systemUpgradeController:
   image: