diff --git a/charts/prometheus-adapter/Chart.yaml b/charts/prometheus-adapter/Chart.yaml index 175c6d080e18..5a3ca7bcf6f5 100644 --- a/charts/prometheus-adapter/Chart.yaml +++ b/charts/prometheus-adapter/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prometheus-adapter -version: 4.8.3 +version: 4.9.0 appVersion: v0.11.2 description: A Helm chart for k8s prometheus adapter home: https://github.com/kubernetes-sigs/prometheus-adapter diff --git a/charts/prometheus-adapter/templates/psp.yaml b/charts/prometheus-adapter/templates/psp.yaml index 3f3f79e542fa..ec26af502cb3 100644 --- a/charts/prometheus-adapter/templates/psp.yaml +++ b/charts/prometheus-adapter/templates/psp.yaml @@ -4,9 +4,9 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "k8s-prometheus-adapter.fullname" . }} - {{- if .Values.customAnnotations }} + {{- with (merge .Values.customAnnotations .Values.psp.annotations) }} annotations: - {{- toYaml .Values.customAnnotations | nindent 4 }} + {{- toYaml . | nindent 4 }} {{- end }} labels: {{- include "k8s-prometheus-adapter.labels" . | indent 4 }} diff --git a/charts/prometheus-adapter/values.yaml b/charts/prometheus-adapter/values.yaml index b6527ca00caa..ab9aaeaa9650 100644 --- a/charts/prometheus-adapter/values.yaml +++ b/charts/prometheus-adapter/values.yaml @@ -66,6 +66,11 @@ rbac: psp: # Specifies whether PSP resources should be created create: false + # Annotations added to the pod security policy + annotations: {} + ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#apparmor + ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#seccomp + ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#sysctl serviceAccount: # Specifies whether a service account should be created