Update rancher-monitoring/rancher-kube-state-metrics to new base kube…

…-state-metrics-5.8.1

packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/podsecuritypolicy.yaml.patch

@@ -1,11 +1,8 @@
 --- charts-original/templates/podsecuritypolicy.yaml
 +++ charts/templates/podsecuritypolicy.yaml
-@@ -1,4 +1,8 @@
-+<<<<<<< HEAD
-+{{- if .Values.global.cattle.psp.enabled }}
-+=======
- {{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
-+>>>>>>> 768332c8633ec0161abbee060e9862a878f94072
+@@ -1,4 +1,4 @@
+-{{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
++{{- if or .Values.global.cattle.psp.enabled (and .Values.rbac.create (and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy"))) }}
  apiVersion: policy/v1beta1
  kind: PodSecurityPolicy
  metadata:

packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/psp-clusterrole.yaml.patch

@@ -1,11 +1,8 @@
 --- charts-original/templates/psp-clusterrole.yaml
 +++ charts/templates/psp-clusterrole.yaml
-@@ -1,4 +1,8 @@
-+<<<<<<< HEAD
-+{{- if and .Values.global.cattle.psp.enabled .Values.rbac.create -}}
-+=======
- {{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
-+>>>>>>> 768332c8633ec0161abbee060e9862a878f94072
+@@ -1,4 +1,4 @@
+-{{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
++{{- if or .Values.global.cattle.psp.enabled (and .Values.rbac.create (and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy"))) }}
  apiVersion: rbac.authorization.k8s.io/v1
  kind: ClusterRole
  metadata:

packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/psp-clusterrolebinding.yaml.patch

@@ -1,11 +1,8 @@
 --- charts-original/templates/psp-clusterrolebinding.yaml
 +++ charts/templates/psp-clusterrolebinding.yaml
-@@ -1,4 +1,8 @@
-+<<<<<<< HEAD
-+{{- if and .Values.global.cattle.psp.enabled .Values.rbac.create -}}
-+=======
- {{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
-+>>>>>>> 768332c8633ec0161abbee060e9862a878f94072
+@@ -1,4 +1,4 @@
+-{{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
++{{- if or .Values.global.cattle.psp.enabled (and .Values.rbac.create (and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy"))) }}
  apiVersion: rbac.authorization.k8s.io/v1
  kind: ClusterRoleBinding
  metadata:

packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/values.yaml.patch

@@ -1,6 +1,19 @@
 --- charts-original/values.yaml
 +++ charts/values.yaml
-@@ -12,6 +12,11 @@
+@@ -1,10 +1,8 @@
+ # Default values for kube-state-metrics.
+ prometheusScrape: true
+ image:
+-  registry: registry.k8s.io
+-  repository: kube-state-metrics/kube-state-metrics
+-  # If unset use v + .Charts.appVersion
+-  tag: ""
++  repository: rancher/mirrored-kube-state-metrics-kube-state-metrics
++  tag: v2.6.0
+   sha: ""
+   pullPolicy: IfNotPresent
+
+@@ -12,6 +10,11 @@
  # - name: "image-pull-secret"
 
  global:
@@ -12,7 +25,17 @@
    # To help compatibility with other charts which use global.imagePullSecrets.
    # Allow either an array of {name: pullSecret} maps (k8s-style), or an array of strings (more common helm-style).
    # global:
-@@ -186,7 +191,6 @@
+@@ -87,8 +90,7 @@
+ kubeRBACProxy:
+   enabled: false
+   image:
+-    registry: quay.io
+-    repository: brancz/kube-rbac-proxy
++    repository: rancher/mirrored-kube-rbac-proxy
+     tag: v0.14.0
+     sha: ""
+     pullPolicy: IfNotPresent
+@@ -186,7 +188,6 @@
  ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/
  ##
  podSecurityPolicy:

packages/rancher-monitoring/rancher-kube-state-metrics/package.yaml

@@ -1,5 +1,5 @@
 url: https://github.com/prometheus-community/helm-charts.git
 subdirectory: charts/kube-state-metrics
 commit: 7fad192cca6c6df6fad37deaeaa04d1350399511
-version: 102.1.0
+version: 103.0.0
 doNotRelease: true