From 8d9f4d49eeee184a2e5ec32ca4487ddda7cb604d Mon Sep 17 00:00:00 2001 From: joshmeranda Date: Fri, 22 Sep 2023 14:31:41 -0400 Subject: [PATCH] Update rancher-monitoring/rancher-kube-state-metrics to new base kube-state-metrics-5.8.1 --- .../templates/podsecuritypolicy.yaml.patch | 9 ++---- .../templates/psp-clusterrole.yaml.patch | 9 ++---- .../psp-clusterrolebinding.yaml.patch | 9 ++---- .../generated-changes/patch/values.yaml.patch | 28 +++++++++++++++++-- .../rancher-kube-state-metrics/package.yaml | 2 +- 5 files changed, 36 insertions(+), 21 deletions(-) diff --git a/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/podsecuritypolicy.yaml.patch b/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/podsecuritypolicy.yaml.patch index fcc04509a2..eecde98956 100644 --- a/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/podsecuritypolicy.yaml.patch +++ b/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: diff --git a/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/psp-clusterrole.yaml.patch b/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/psp-clusterrole.yaml.patch index 0b80f06165..0ae3456a74 100644 --- a/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/psp-clusterrole.yaml.patch +++ b/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: diff --git a/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/psp-clusterrolebinding.yaml.patch b/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/psp-clusterrolebinding.yaml.patch index 2b0f6b4e4f..2aefe17083 100644 --- a/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/psp-clusterrolebinding.yaml.patch +++ b/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: diff --git a/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/values.yaml.patch b/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/values.yaml.patch index c5d0ed0a6f..3d8af20eda 100644 --- a/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/values.yaml.patch @@ -1,6 +1,20 @@ --- charts-original/values.yaml +++ charts/values.yaml -@@ -12,6 +12,11 @@ +@@ -1,10 +1,9 @@ + # 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: "" ++ registry: docker.io ++ repository: rancher/mirrored-kube-state-metrics-kube-state-metrics ++ tag: v2.6.0 + sha: "" + pullPolicy: IfNotPresent + +@@ -12,6 +11,11 @@ # - name: "image-pull-secret" global: @@ -12,7 +26,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 +91,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 +189,6 @@ ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/ ## podSecurityPolicy: diff --git a/packages/rancher-monitoring/rancher-kube-state-metrics/package.yaml b/packages/rancher-monitoring/rancher-kube-state-metrics/package.yaml index 3a410af68c..ee82deb37a 100644 --- a/packages/rancher-monitoring/rancher-kube-state-metrics/package.yaml +++ b/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