[kube-prometheus-stack] Remove Plus Character From Upgrade Job for Custom Distros (#5292)

* Remove plus character for Kubernetes versions that use + for their custom distros

Signed-off-by: Aidan Leuck <aidan_leuck@selinc.com>

* Bump version

Signed-off-by: Aidan Leuck <aidan_leuck@selinc.com>

* Update charts/kube-prometheus-stack/Chart.yaml

Signed-off-by: Jan-Otto Kröpke <github@jkroepke.de>

---------

Signed-off-by: Aidan Leuck <aidan_leuck@selinc.com>
Signed-off-by: Jan-Otto Kröpke <github@jkroepke.de>
Co-authored-by: Jan-Otto Kröpke <github@jkroepke.de>

Author: aidanleuck

charts/kube-prometheus-stack/Chart.yaml

@@ -31,7 +31,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 69.1.0
+version: 69.1.1
 appVersion: v0.80.0
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

charts/kube-prometheus-stack/charts/crds/templates/upgrade/job.yaml

@@ -75,10 +75,11 @@ spec:
       containers:
         - name: kubectl
           {{- $kubectlRegistry := .Values.global.imageRegistry | default .Values.upgradeJob.image.kubectl.registry -}}
+          {{- $defaultKubernetesVersion := regexReplaceAll "\\+.*" .Capabilities.KubeVersion.Version "" }}
           {{- if .Values.upgradeJob.image.kubectl.sha }}
-          image: "{{ $kubectlRegistry }}/{{ .Values.upgradeJob.image.kubectl.repository }}:{{ .Values.upgradeJob.image.kubectl.tag | default .Capabilities.KubeVersion.Version }}@sha256:{{ .Values.upgradeJob.image.kubectl.sha }}"
+          image: "{{ $kubectlRegistry }}/{{ .Values.upgradeJob.image.kubectl.repository }}:{{ .Values.upgradeJob.image.kubectl.tag | default $defaultKubernetesVersion }}@sha256:{{ .Values.upgradeJob.image.kubectl.sha }}"
           {{- else }}
-          image: "{{ $kubectlRegistry }}/{{ .Values.upgradeJob.image.kubectl.repository }}:{{ .Values.upgradeJob.image.kubectl.tag | default .Capabilities.KubeVersion.Version }}"
+          image: "{{ $kubectlRegistry }}/{{ .Values.upgradeJob.image.kubectl.repository }}:{{ .Values.upgradeJob.image.kubectl.tag | default $defaultKubernetesVersion }}"
           {{- end }}
           imagePullPolicy: "{{ .Values.upgradeJob.image.kubectl.pullPolicy }}"
           command: