Merge branch 'main' into renovate/prometheus-memcached-exporter-dependency-non-major-updates

Author: asherf

.github/workflows/ci.yaml

@@ -135,7 +135,10 @@ jobs:
       - lint-test
       - check-codeowners-maintainers
       - super-linter
-    if: github.event.pull_request.head.repo.full_name == github.repository && (github.actor == 'renovate[bot]' || github.actor == 'helm-charts-renovate-helper[bot]')
+    if: >-
+      github.event.pull_request.head.repo.full_name == github.repository 
+      && contains(github.event.pull_request.labels.*.name, 'dependencies/auto-merge') 
+      && (github.actor == 'renovate[bot]' || github.actor == 'helm-charts-renovate-helper[bot]')
     steps:
       # Using a GitHub App token, because GitHub Actions doesn't run on commits from github-actions bot
       # Used App:
@@ -150,5 +153,6 @@ jobs:
       - name: Approve PR
         run:
           gh pr review ${{ github.event.pull_request.number }} --approve --repo "${{ github.repository }}"
+          gh pr merge ${{ github.event.pull_request.number }} --admin --squash --repo "${{ github.repository }}" --match-head-commit "${{ github.event.pull_request.head.sha }}" --delete-branch
         env:
           GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}

charts/alertmanager/Chart.yaml

@@ -6,10 +6,10 @@ icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/a
 sources:
   - https://github.com/prometheus/alertmanager
 type: application
-version: 1.20.1
+version: 1.21.0
 # renovate: github-releases=prometheus/alertmanager
 appVersion: v0.28.1
-kubeVersion: ">=1.19.0-0"
+kubeVersion: ">=1.25.0-0"
 keywords:
   - monitoring
 maintainers:

charts/alertmanager/templates/_helpers.tpl

@@ -69,17 +69,6 @@ Define Ingress apiVersion
 {{- printf "networking.k8s.io/v1" }}
 {{- end }}
 
-{{/*
-Define Pdb apiVersion
-*/}}
-{{- define "alertmanager.pdb.apiVersion" -}}
-{{- if $.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget" }}
-{{- printf "policy/v1" }}
-{{- else }}
-{{- printf "policy/v1beta1" }}
-{{- end }}
-{{- end }}
-
 {{/*
 Allow overriding alertmanager namespace
 */}}

charts/alertmanager/templates/pdb.yaml

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

charts/kube-prometheus-stack/Chart.yaml

@@ -31,11 +31,11 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 72.8.0
+version: 73.1.0
 
 # Please do not add a renovate hint here, since appVersion updates involves manual tasks
 appVersion: v0.82.2
-kubeVersion: ">=1.19.0-0"
+kubeVersion: ">=1.25.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus
 keywords:
   - operator

charts/kube-prometheus-stack/UPGRADE.md

@@ -1,5 +1,11 @@
 # Upgrade
 
+## From 72.x to 73.x
+
+This version removes support for deprecated K8s API versions for `Ingress` resources and associated fields.
+This version also removes all `PodSecurityPolicy` resources and `global.pspEnabled` and `global.pspAnnotations` fields.
+The chart now requires a minimum K8s version of `1.25`
+
 ## From 71.x to 72.x
 
 This version adds an `enabled` flag to the `prometheusOperator.admissionWebhooks.deployment.podDisruptionBudget` settings. Users who want this chart to deploy a `podDisruptionBudget` must now set the flag `podDisruptionBudget.enabled` to `true` for each `podDisruptionBudget` resource to be created.

charts/kube-prometheus-stack/hack/sync_grafana_dashboards.py

@@ -33,7 +33,7 @@ def new_representer(dumper, data):
     # renovate: git-refs=https://github.com/kubernetes-monitoring/kubernetes-mixin branch=master
     'ref.kubernetes-mixin': 'ddfa651bc295d2b6659bfef7333d154c72c6e376',
     # renovate: git-refs=https://github.com/etcd-io/etcd branch=main
-    'ref.etcd': 'b6167b7c5d482b14f7a3828628db5de89ad1871e',
+    'ref.etcd': '142cdbfc5fc6361ffb17aa85531ffe6acfa08143',
 }
 
 # Source files list

charts/kube-prometheus-stack/hack/sync_prometheus_rules.py

@@ -33,7 +33,7 @@ def new_representer(dumper, data):
     # renovate: git-refs=https://github.com/kubernetes-monitoring/kubernetes-mixin branch=master
     'ref.kubernetes-mixin': 'ddfa651bc295d2b6659bfef7333d154c72c6e376',
     # renovate: git-refs=https://github.com/etcd-io/etcd branch=main
-    'ref.etcd': 'b6167b7c5d482b14f7a3828628db5de89ad1871e',
+    'ref.etcd': '142cdbfc5fc6361ffb17aa85531ffe6acfa08143',
 }
 
 # Source files list

charts/kube-prometheus-stack/templates/_helpers.tpl

@@ -43,11 +43,6 @@ The longest name that gets created adds and extra 37 characters, so truncation s
 {{- end }}
 {{- end }}
 
-{{/* Prometheus apiVersion for networkpolicy */}}
-{{- define "kube-prometheus-stack.prometheus.networkPolicy.apiVersion" -}}
-{{- print "networking.k8s.io/v1" -}}
-{{- end }}
-
 {{/* Alertmanager custom resource instance name */}}
 {{- define "kube-prometheus-stack.alertmanager.crname" -}}
 {{- if .Values.cleanPrometheusOperatorObjectNames }}
@@ -208,37 +203,6 @@ Use the prometheus-node-exporter namespace override for multi-namespace deployme
   {{- default .Capabilities.KubeVersion.Version .Values.kubeVersionOverride -}}
 {{- end -}}
 
-{{/* Get Ingress API Version */}}
-{{- define "kube-prometheus-stack.ingress.apiVersion" -}}
-  {{- if and (.Capabilities.APIVersions.Has "networking.k8s.io/v1") (semverCompare ">= 1.19-0" (include "kube-prometheus-stack.kubeVersion" .)) -}}
-      {{- print "networking.k8s.io/v1" -}}
-  {{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" -}}
-    {{- print "networking.k8s.io/v1beta1" -}}
-  {{- else -}}
-    {{- print "extensions/v1beta1" -}}
-  {{- end -}}
-{{- end -}}
-
-{{/* Check Ingress stability */}}
-{{- define "kube-prometheus-stack.ingress.isStable" -}}
-  {{- eq (include "kube-prometheus-stack.ingress.apiVersion" .) "networking.k8s.io/v1" -}}
-{{- end -}}
-
-{{/* Check Ingress supports pathType */}}
-{{/* pathType was added to networking.k8s.io/v1beta1 in Kubernetes 1.18 */}}
-{{- define "kube-prometheus-stack.ingress.supportsPathType" -}}
-  {{- or (eq (include "kube-prometheus-stack.ingress.isStable" .) "true") (and (eq (include "kube-prometheus-stack.ingress.apiVersion" .) "networking.k8s.io/v1beta1") (semverCompare ">= 1.18-0" (include "kube-prometheus-stack.kubeVersion" .))) -}}
-{{- end -}}
-
-{{/* Get Policy API Version */}}
-{{- define "kube-prometheus-stack.pdb.apiVersion" -}}
-  {{- if and (.Capabilities.APIVersions.Has "policy/v1") (semverCompare ">= 1.21-0" (include "kube-prometheus-stack.kubeVersion" .)) -}}
-      {{- print "policy/v1" -}}
-  {{- else -}}
-    {{- print "policy/v1beta1" -}}
-  {{- end -}}
-  {{- end -}}
-
 {{/* Get value based on current Kubernetes version */}}
 {{- define "kube-prometheus-stack.kubeVersionDefaultValue" -}}
   {{- $values := index . 0 -}}

charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml

@@ -200,4 +200,8 @@ spec:
 {{- with .Values.alertmanager.alertmanagerSpec.additionalConfigString }}
   {{- tpl . $ | nindent 2 }}
 {{- end }}
+{{- if .Values.alertmanager.alertmanagerSpec.additionalArgs }}
+  additionalArgs:
+{{ toYaml .Values.alertmanager.alertmanagerSpec.additionalArgs | indent 4 }}
+{{- end }}
 {{- end }}