[prometheus-adapter] remove support for deprecated APIs (#5809)

Signed-off-by: drfaust92 <[email protected]>
Signed-off-by: Ilia Lazebnik <[email protected]>
Co-authored-by: Steven Sheehy <[email protected]>

Author: DrFaust92

charts/prometheus-adapter/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: prometheus-adapter
-version: 4.14.2
+version: 5.0.0
 appVersion: v0.12.0
 description: A Helm chart for k8s prometheus adapter
 home: https://github.com/kubernetes-sigs/prometheus-adapter

charts/prometheus-adapter/README.md

@@ -4,7 +4,7 @@ Installs the [Prometheus Adapter](https://github.com/kubernetes-sigs/prometheus-
 
 ## Prerequisites
 
-Kubernetes 1.14+
+Kubernetes 1.21+
 
 ## Usage
 
@@ -43,6 +43,10 @@ helm upgrade [RELEASE_NAME] [CHART] --install
 
 _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._
 
+### To 5.0.0
+
+This version removes support for the deprecated Kubernetes API `policy/v1beta1` for PodDisruptionBudgets. It also removes the deprecated `PodSecurityPolicy` resource. Minimum Kubernetes version >= 1.21 is now required.
+
 #### To 4.2.0
 
 Readiness and liveness probes are now fully configurable through values `readinessProbe` and `livenessProbe`. The previous values have been kept as defaults.

charts/prometheus-adapter/templates/_helpers.tpl

@@ -73,12 +73,3 @@ Create the name of the service account to use
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
-
-{{/* Get Policy API Version */}}
-{{- define "k8s-prometheus-adapter.pdb.apiVersion" -}}
-{{- if and (.Capabilities.APIVersions.Has "policy/v1") (semverCompare ">= 1.21-0" .Capabilities.KubeVersion.Version) -}}
-    {{- print "policy/v1" -}}
-{{- else -}}
-    {{- print "policy/v1beta1" -}}
-{{- end -}}
-{{- end -}}

charts/prometheus-adapter/templates/pdb.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.podDisruptionBudget.enabled }}
-apiVersion: {{ include "k8s-prometheus-adapter.pdb.apiVersion" . }}
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "k8s-prometheus-adapter.fullname" . }}

charts/prometheus-adapter/templates/psp.yaml

@@ -67,15 +67,6 @@ rbac:
   customMetrics:
     resources: ["*"]
 
-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
-
 # If false then the user will opt out of automounting API credentials.
 automountServiceAccountToken: true