updates for rancher 2.9.4 (#245)

Signed-off-by: Adam Martin <[email protected]>

README.md

@@ -6,7 +6,7 @@
 NAME                            CHART VERSION   APP VERSION     DESCRIPTION
 carbide-charts/airgapped-docs   0.1.53          0.1.7           Rancher Government Airgapped Docs
 carbide-charts/heimdall2        0.1.45          0.1.1           Rancher Government Heimdall2 Tool
-carbide-charts/rancher          2.9.3           v2.9.3          Install Rancher Server to manage Kubernetes...
+carbide-charts/rancher          2.9.4           v2.9.4          Install Rancher Server to manage Kubernetes...
 carbide-charts/stigatron        0.2.5           0.2.2           Rancher Government Stigatron Extension
 carbide-charts/stigatron-ui     0.2.3           0.2.0           Rancher Government Stigatron UI Extension
 ```
@@ -52,7 +52,7 @@ spec:
       version: 0.1.45
     - name: rancher
       repoURL: https://rancherfederal.github.io/carbide-charts
-      version: 2.8.5
+      version: 2.9.4
     - name: stigatron
       repoURL: https://rancherfederal.github.io/carbide-charts
       version: 0.2.5

charts/rancher/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
 name: rancher
 description: Install Rancher Server to manage Kubernetes clusters across providers
-version: 2.8.10
-appVersion: v2.8.10
-kubeVersion: < 1.29.0-0
+version: 2.9.4
+appVersion: v2.9.4
+kubeVersion: < 1.31.0-0
 home: https://rancher.com
 icon: https://github.com/rancher/ui/blob/master/public/assets/images/logos/welcome-cow.svg
 keywords:

charts/rancher/templates/_helpers.tpl

@@ -77,31 +77,6 @@ add below linux tolerations to workloads could be scheduled to those linux nodes
 {{- end -}}
 {{- end -}}
 
-{{/*
-Define the chosen value for PSPs. If this value is "", then the user did not set the value. This will
-result in psps on <=1.24 and no psps on >=1.25. If the value is true/false, then the user specifically
-chose an option, and that option will be used. If it is set otherwise, then we fail so the user can correct
-the invalid value.
-*/}}
-
-{{- define "rancher.chart_psp_enabled" -}}
-{{- if kindIs "bool" .Values.global.cattle.psp.enabled -}}
-{{ .Values.global.cattle.psp.enabled }}
-{{- else if empty .Values.global.cattle.psp.enabled -}}
-  {{- if gt (len (lookup "rbac.authorization.k8s.io/v1" "ClusterRole" "" "")) 0 -}}
-    {{- if (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") -}}
-true
-    {{- else -}}
-false
-    {{- end -}}
-  {{- else -}}
-true
-  {{- end -}}
-{{- else -}}
-{{- fail "Invalid value for .Values.global.cattle.psp.enabled - must be a bool of true, false, or \"\"" -}}
-{{- end -}}
-{{- end -}}
-
 {{/*
     Select correct auditLog image
 */}}

charts/rancher/templates/post-delete-hook-cluster-role.yaml

@@ -30,14 +30,6 @@ rules:
   - apiGroups: [ "admissionregistration.k8s.io" ]
     resources: [ "validatingwebhookconfigurations", "mutatingwebhookconfigurations" ]
     verbs: [ "get", "list", "delete" ]
-  - apiGroups: [ "policy" ]
-    resources: [ "podsecuritypolicies" ]
-    verbs: ["delete", "create" ]
-{{- if eq (include "rancher.chart_psp_enabled" . ) "true" }}
-  - apiGroups: [ "policy" ]
-    resources: [ "podsecuritypolicies" ]
-    verbs: [ "use"]
-{{- end }}
   - apiGroups: [ "networking.k8s.io" ]
     resources: [ "ingresses" ]
     verbs: [ "delete" ]

charts/rancher/values.yaml

@@ -65,7 +65,7 @@ ingress:
   includeDefaultExtraAnnotations: true
   extraAnnotations: {}
   ingressClassName: ""
-  # Certain ingress controllers will will require the pathType or path to be set to a different value.
+  # Certain ingress controllers will require the pathType or path to be set to a different value.
   pathType: ImplementationSpecific
   path: "/"
   # backend port number
@@ -163,7 +163,7 @@ postDelete:
   enabled: true
   image:
     repository: rancher/shell
-    tag: v0.2.1
+    tag: v0.2.2
   namespaceList:
     - cattle-fleet-system
     - cattle-system
@@ -190,13 +190,6 @@ readinessProbe:
   periodSeconds: 30
   failureThreshold: 5
 
-global:
-  cattle:
-    psp:
-      # will default to true on 1.24 and below, and false for 1.25 and above
-      # can be changed manually to true or false to bypass version checks and force that option
-      enabled: ""
-
 # helm values to use when installing the rancher-webhook chart.
 # helm values set here will override all other global values used when installing the webhook such as priorityClassName and systemRegistry settings.
 webhook: ""