From 858300f736f9dd8790b762bc023e049abdac0043 Mon Sep 17 00:00:00 2001
From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com>
Date: Thu, 21 Sep 2023 15:09:57 +0530
Subject: [PATCH] release-5.2.

---
 .../blackbox-exporter/templates/poddisruptionbudget.yaml        | 2 +-
 .../elasticsearch-exporter/templates/podsecuritypolicies.yaml   | 2 +-
 .../monitoring/oauth2-proxy/charts/redis/templates/_helpers.tpl | 2 +-
 .../charts/grafana/templates/poddisruptionbudget.yaml           | 2 +-
 .../charts/grafana/templates/podsecuritypolicy.yaml             | 2 +-
 .../charts/grafana/templates/tests/test-podsecuritypolicy.yaml  | 2 +-
 .../charts/kube-state-metrics/templates/pdb.yaml                | 2 +-
 .../charts/kube-state-metrics/templates/podsecuritypolicy.yaml  | 2 +-
 .../charts/prometheus-node-exporter/templates/psp.yaml          | 2 +-
 .../prometheus-operator/templates/alertmanager/psp.yaml         | 2 +-
 .../templates/prometheus/podDisruptionBudget.yaml               | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/kubernetes/helm_charts/monitoring/blackbox-exporter/templates/poddisruptionbudget.yaml b/kubernetes/helm_charts/monitoring/blackbox-exporter/templates/poddisruptionbudget.yaml
index 8d54718ed0..1d9644fd6b 100755
--- a/kubernetes/helm_charts/monitoring/blackbox-exporter/templates/poddisruptionbudget.yaml
+++ b/kubernetes/helm_charts/monitoring/blackbox-exporter/templates/poddisruptionbudget.yaml
@@ -1,4 +1,4 @@
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "prometheus-blackbox-exporter.fullname" . }}
diff --git a/kubernetes/helm_charts/monitoring/elasticsearch-exporter/templates/podsecuritypolicies.yaml b/kubernetes/helm_charts/monitoring/elasticsearch-exporter/templates/podsecuritypolicies.yaml
index fc7c2b6325..f08dd64343 100755
--- a/kubernetes/helm_charts/monitoring/elasticsearch-exporter/templates/podsecuritypolicies.yaml
+++ b/kubernetes/helm_charts/monitoring/elasticsearch-exporter/templates/podsecuritypolicies.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.podSecurityPolicies.enabled -}}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "elasticsearch-exporter.fullname" . }}
diff --git a/kubernetes/helm_charts/monitoring/oauth2-proxy/charts/redis/templates/_helpers.tpl b/kubernetes/helm_charts/monitoring/oauth2-proxy/charts/redis/templates/_helpers.tpl
index 47f52a3345..4d40eed1b0 100644
--- a/kubernetes/helm_charts/monitoring/oauth2-proxy/charts/redis/templates/_helpers.tpl
+++ b/kubernetes/helm_charts/monitoring/oauth2-proxy/charts/redis/templates/_helpers.tpl
@@ -58,7 +58,7 @@ Return the appropriate apiVersion for PodSecurityPolicy.
 */}}
 {{- define "podSecurityPolicy.apiVersion" -}}
 {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-{{- print "policy/v1beta1" -}}
+{{- print "policy/v1" -}}
 {{- else -}}
 {{- print "extensions/v1beta1" -}}
 {{- end -}}
diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/poddisruptionbudget.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/poddisruptionbudget.yaml
index d6f230a8f2..ef41785b40 100755
--- a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/poddisruptionbudget.yaml
+++ b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/poddisruptionbudget.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.podDisruptionBudget }}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "grafana.name" . }}
diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/podsecuritypolicy.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/podsecuritypolicy.yaml
index c5e6ba05ea..39204b0607 100755
--- a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/podsecuritypolicy.yaml
+++ b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/podsecuritypolicy.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.rbac.pspEnabled }}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "grafana.fullname" . }}
diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/tests/test-podsecuritypolicy.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/tests/test-podsecuritypolicy.yaml
index eb5cbbcd70..a7b2abb025 100755
--- a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/tests/test-podsecuritypolicy.yaml
+++ b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/tests/test-podsecuritypolicy.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.testFramework.enabled .Values.rbac.pspEnabled }}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "grafana.fullname" . }}-test
diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/pdb.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/pdb.yaml
index 6adb50d79f..6f6070ffcb 100755
--- a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/pdb.yaml
+++ b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/pdb.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.podDisruptionBudget -}}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "kube-state-metrics.fullname" . }}
diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/podsecuritypolicy.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/podsecuritypolicy.yaml
index aeff11791c..35929847e9 100755
--- a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/podsecuritypolicy.yaml
+++ b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/podsecuritypolicy.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.podSecurityPolicy.enabled }}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "kube-state-metrics.fullname" . }}
diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/prometheus-node-exporter/templates/psp.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/prometheus-node-exporter/templates/psp.yaml
index f00506c980..cc26eaf7b8 100755
--- a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/prometheus-node-exporter/templates/psp.yaml
+++ b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/prometheus-node-exporter/templates/psp.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.rbac.create }}
 {{- if .Values.rbac.pspEnabled }}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "prometheus-node-exporter.fullname" . }}
diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/templates/alertmanager/psp.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/templates/alertmanager/psp.yaml
index cbc0bb8567..787054a0e9 100755
--- a/kubernetes/helm_charts/monitoring/prometheus-operator/templates/alertmanager/psp.yaml
+++ b/kubernetes/helm_charts/monitoring/prometheus-operator/templates/alertmanager/psp.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.alertmanager.enabled .Values.global.rbac.create .Values.global.rbac.pspEnabled }}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-alertmanager
diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml
index c0bb5995ff..4ccc61dcfc 100755
--- a/kubernetes/helm_charts/monitoring/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml
+++ b/kubernetes/helm_charts/monitoring/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.prometheus.enabled .Values.prometheus.podDisruptionBudget.enabled }}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "prometheus-operator.fullname" . }}-prometheus