-
Notifications
You must be signed in to change notification settings - Fork 716
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update rancher-monitoring/rancher-kube-state-metrics to new base kube…
…-state-metrics-5.8.1
- Loading branch information
1 parent
da13e1b
commit 8d9f4d4
Showing
5 changed files
with
36 additions
and
21 deletions.
There are no files selected for viewing
9 changes: 3 additions & 6 deletions
9
...rancher-kube-state-metrics/generated-changes/patch/templates/podsecuritypolicy.yaml.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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: |
9 changes: 3 additions & 6 deletions
9
...g/rancher-kube-state-metrics/generated-changes/patch/templates/psp-clusterrole.yaml.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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: |
9 changes: 3 additions & 6 deletions
9
...er-kube-state-metrics/generated-changes/patch/templates/psp-clusterrolebinding.yaml.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
packages/rancher-monitoring/rancher-kube-state-metrics/package.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |