[rancher-node-exporter] Replace .Values.rbac.pspEnabled with .Values.global.cattle.psp.enabled and bump major version

pull/2375/head
Arvind Iyengar 2023-01-27 16:12:27 -08:00
parent d94a62c56d
commit 54720ea2a5
No known key found for this signature in database
GPG Key ID: A8DD9BFD6C811498
5 changed files with 36 additions and 14 deletions

View File

@ -1,6 +1,12 @@
--- charts-original/templates/psp-clusterrole.yaml
+++ charts/templates/psp-clusterrole.yaml
@@ -6,10 +6,12 @@
@@ -1,15 +1,17 @@
{{- if .Values.rbac.create }}
-{{- if .Values.rbac.pspEnabled }}
+{{- if .Values.global.cattle.psp.enabled }}
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: psp-{{ template "prometheus-node-exporter.fullname" . }}
labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
rules:

View File

@ -0,0 +1,9 @@
--- charts-original/templates/psp-clusterrolebinding.yaml
+++ charts/templates/psp-clusterrolebinding.yaml
@@ -1,5 +1,5 @@
{{- if .Values.rbac.create }}
-{{- if .Values.rbac.pspEnabled }}
+{{- if .Values.global.cattle.psp.enabled }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:

View File

@ -1,14 +1,9 @@
--- charts-original/templates/psp.yaml
+++ charts/templates/psp.yaml
@@ -1,3 +1,4 @@
+{{- if .Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicies" }}
@@ -1,5 +1,5 @@
{{- if .Values.rbac.create }}
{{- if .Values.rbac.pspEnabled }}
-{{- if .Values.rbac.pspEnabled }}
+{{- if .Values.global.cattle.psp.enabled }}
apiVersion: policy/v1beta1
@@ -46,5 +47,6 @@
- min: 0
max: 65535
readOnlyRootFilesystem: false
+{{- end }}
{{- end }}
{{- end }}
kind: PodSecurityPolicy
metadata:

View File

@ -1,12 +1,14 @@
--- charts-original/values.yaml
+++ charts/values.yaml
@@ -1,10 +1,15 @@
@@ -1,10 +1,17 @@
# Default values for prometheus-node-exporter.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
+
+global:
+ cattle:
+ psp:
+ enabled: false
+ systemDefaultRegistry: ""
+
image:
@ -18,7 +20,17 @@
pullPolicy: IfNotPresent
sha: ""
@@ -163,6 +168,8 @@
@@ -95,9 +102,6 @@
## If true, create & use RBAC resources
##
create: true
- ## If true, create & use Pod Security Policy resources
- ## https://kubernetes.io/docs/concepts/policy/pod-security-policy/
- pspEnabled: true
pspAnnotations: {}
# for deployments that have node_exporter deployed outside of the cluster, list
@@ -163,6 +167,8 @@
tolerations:
- effect: NoSchedule

View File

@ -1,5 +1,5 @@
url: https://github.com/prometheus-community/helm-charts.git
subdirectory: charts/prometheus-node-exporter
commit: 059e3a6e6b4ba0fd8614763de0f8e24937a89a39
version: 101.0.0
version: 102.0.0
doNotRelease: true