diff --git a/packages/rancher-monitoring/rancher-pushprox/charts/templates/pushprox-clients-rbac.yaml b/packages/rancher-monitoring/rancher-pushprox/charts/templates/pushprox-clients-rbac.yaml index 7c4c28bbf..5893ace18 100644 --- a/packages/rancher-monitoring/rancher-pushprox/charts/templates/pushprox-clients-rbac.yaml +++ b/packages/rancher-monitoring/rancher-pushprox/charts/templates/pushprox-clients-rbac.yaml @@ -6,7 +6,7 @@ metadata: name: {{ template "pushProxy.client.name" . }} labels: {{ include "pushProxy.client.labels" . | nindent 4 }} rules: -{{- if .Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicies" }} +{{- if .Values.global.cattle.psp.enabled }} - apiGroups: ['policy'] resources: ['podsecuritypolicies'] verbs: ['use'] @@ -42,7 +42,7 @@ metadata: namespace: {{ include "pushprox.namespace" . }} labels: {{ include "pushProxy.client.labels" . | nindent 4 }} --- -{{- if .Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicies" }} +{{- if .Values.global.cattle.psp.enabled }} apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: diff --git a/packages/rancher-monitoring/rancher-pushprox/charts/templates/pushprox-proxy-rbac.yaml b/packages/rancher-monitoring/rancher-pushprox/charts/templates/pushprox-proxy-rbac.yaml index b717fe1e7..eefe60905 100644 --- a/packages/rancher-monitoring/rancher-pushprox/charts/templates/pushprox-proxy-rbac.yaml +++ b/packages/rancher-monitoring/rancher-pushprox/charts/templates/pushprox-proxy-rbac.yaml @@ -6,13 +6,13 @@ metadata: name: {{ template "pushProxy.proxy.name" . }} labels: {{ include "pushProxy.proxy.labels" . | nindent 4 }} rules: -{{- if .Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicies" }} +{{- if .Values.global.cattle.psp.enabled }} - apiGroups: ['policy'] resources: ['podsecuritypolicies'] verbs: ['use'] resourceNames: - {{ template "pushProxy.proxy.name" . }} - {{- end }} +{{- end }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding @@ -35,7 +35,7 @@ metadata: namespace: {{ include "pushprox.namespace" . }} labels: {{ include "pushProxy.proxy.labels" . | nindent 4 }} --- -{{- if .Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicies" }} +{{- if .Values.global.cattle.psp.enabled }} apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: diff --git a/packages/rancher-monitoring/rancher-pushprox/charts/values.yaml b/packages/rancher-monitoring/rancher-pushprox/charts/values.yaml index f57f9ac36..8d25737a0 100644 --- a/packages/rancher-monitoring/rancher-pushprox/charts/values.yaml +++ b/packages/rancher-monitoring/rancher-pushprox/charts/values.yaml @@ -9,6 +9,8 @@ global: cattle: + psp: + enabled: false systemDefaultRegistry: "" seLinux: enabled: false diff --git a/packages/rancher-monitoring/rancher-pushprox/package.yaml b/packages/rancher-monitoring/rancher-pushprox/package.yaml index b00e848b4..265d05981 100644 --- a/packages/rancher-monitoring/rancher-pushprox/package.yaml +++ b/packages/rancher-monitoring/rancher-pushprox/package.yaml @@ -1,3 +1,2 @@ url: local -version: 101.0.1 -doNotRelease: true \ No newline at end of file +version: 102.0.0 diff --git a/release.yaml b/release.yaml index 4349771a2..1a4eed834 100644 --- a/release.yaml +++ b/release.yaml @@ -66,6 +66,8 @@ rancher-monitoring-crd: - 101.1.0+up40.1.2 rancher-project-monitoring: - 1.1.0+up0.2.0-rc1 +rancher-pushprox: +- 102.0.0 rancher-vsphere-cpi: - 101.1.0+up1.4.1 rancher-vsphere-csi: