Merge pull request #183 from rancherfederal/main

updates for rancher v2.8.3
rancherfederal · Apr 9, 2024 · f1ebe8c · f1ebe8c
2 parents 0713ea3 + 2b9826f
commit f1ebe8c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/charts/rancher/Chart.yaml b/charts/rancher/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
 name: rancher
 description: Install Rancher Server to manage Kubernetes clusters across providers
-version: 2.7.12
-appVersion: v2.7.12
-kubeVersion: < 1.28.0-0
+version: 2.8.3
+appVersion: v2.8.3
+kubeVersion: < 1.29.0-0
 home: https://rancher.com
 icon: https://github.com/rancher/ui/blob/master/public/assets/images/logos/welcome-cow.svg
 keywords:

diff --git a/charts/rancher/templates/configMap.yaml b/charts/rancher/templates/configMap.yaml
@@ -10,4 +10,9 @@ data:
   rancher-webhook: {{ .Values.webhook | quote }}
   {{- else if .Values.webhook }}
   rancher-webhook: {{ toYaml .Values.webhook | quote }}
+  {{- end }}
+  {{- if and .Values.fleet (kindIs "string" .Values.fleet) }}
+  fleet: {{ .Values.fleet | quote }}
+  {{- else if .Values.fleet }}
+  fleet: {{ toYaml .Values.fleet | quote }}
   {{- end }}
diff --git a/charts/rancher/templates/ingress.yaml b/charts/rancher/templates/ingress.yaml
@@ -54,8 +54,8 @@ spec:
           servicePort: {{ .Values.ingress.servicePort }}
           {{- end }}
         {{- if or (.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") (not (.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress")) }}
-        pathType: ImplementationSpecific
-        path: "/"
+        pathType: {{ .Values.ingress.pathType }}
+        path: {{ .Values.ingress.path }}
         {{- end }}
 {{- if eq .Values.tls "ingress" }}
   tls:

diff --git a/charts/rancher/values.yaml b/charts/rancher/values.yaml
@@ -60,6 +60,9 @@ ingress:
   includeDefaultExtraAnnotations: true
   extraAnnotations: {}
   ingressClassName: ""
+  # Certain ingress controllers will will require the pathType or path to be set to a different value.
+  pathType: ImplementationSpecific
+  path: "/"
   # backend port number
   servicePort: 80
 
@@ -155,7 +158,7 @@ postDelete:
   enabled: true
   image:
     repository: rancher/shell
-    tag: v0.1.22
+    tag: v0.1.23
   namespaceList:
     - cattle-fleet-system
     - cattle-system
@@ -185,6 +188,10 @@ global:
 # 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: ""
+
+# helm values to use when installing the fleet chart.
+# helm values set here will override all other global values used when installing the fleet chart.
+fleet: ""
 
 carbide:
   whitelabel: