From a20c24e297cf271e7bbbddf96c0ad3f7018234bd Mon Sep 17 00:00:00 2001 From: Ludovic Ortega Date: Fri, 19 Apr 2024 18:45:53 +0200 Subject: [PATCH 01/26] [kube-prometheus-stack]add support for dual stack clusters (#4472) --- charts/kube-prometheus-stack/Chart.yaml | 2 +- .../templates/alertmanager/service.yaml | 4 ++ .../templates/exporters/core-dns/service.yaml | 4 ++ .../kube-controller-manager/service.yaml | 4 ++ .../templates/exporters/kube-dns/service.yaml | 4 ++ .../exporters/kube-etcd/service.yaml | 4 ++ .../exporters/kube-proxy/service.yaml | 4 ++ .../exporters/kube-scheduler/service.yaml | 4 ++ .../deployment/service.yaml | 4 ++ .../prometheus-operator/service.yaml | 4 ++ .../templates/prometheus/service.yaml | 4 ++ .../prometheus/serviceThanosSidecar.yaml | 4 ++ .../prometheus/serviceperreplica.yaml | 4 ++ .../templates/thanos-ruler/service.yaml | 4 ++ charts/kube-prometheus-stack/values.yaml | 63 +++++++++++++++++++ 15 files changed, 116 insertions(+), 1 deletion(-) diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 379a94a4ab1c..898841b3571d 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -23,7 +23,7 @@ name: kube-prometheus-stack sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus -version: 58.1.3 +version: 58.2.0 appVersion: v0.73.1 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/templates/alertmanager/service.yaml b/charts/kube-prometheus-stack/templates/alertmanager/service.yaml index 373de328a5ba..6446f010819b 100644 --- a/charts/kube-prometheus-stack/templates/alertmanager/service.yaml +++ b/charts/kube-prometheus-stack/templates/alertmanager/service.yaml @@ -65,4 +65,8 @@ spec: timeoutSeconds: {{ .Values.alertmanager.service.sessionAffinityConfig.clientIP.timeoutSeconds }} {{- end }} type: "{{ .Values.alertmanager.service.type }}" +{{- if .Values.alertmanager.service.ipDualStack.enabled }} + ipFamilies: {{ toYaml .Values.alertmanager.service.ipDualStack.ipFamilies | nindent 4 }} + ipFamilyPolicy: {{ .Values.alertmanager.service.ipDualStack.ipFamilyPolicy }} {{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/kube-prometheus-stack/templates/exporters/core-dns/service.yaml b/charts/kube-prometheus-stack/templates/exporters/core-dns/service.yaml index b8618f7558bf..5dedc369dfb9 100644 --- a/charts/kube-prometheus-stack/templates/exporters/core-dns/service.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/core-dns/service.yaml @@ -10,6 +10,10 @@ metadata: namespace: kube-system spec: clusterIP: None + {{- if .Values.coreDns.service.ipDualStack.enabled }} + ipFamilies: {{ toYaml .Values.coreDns.service.ipDualStack.ipFamilies | nindent 4 }} + ipFamilyPolicy: {{ .Values.coreDns.service.ipDualStack.ipFamilyPolicy }} + {{- end }} ports: - name: {{ .Values.coreDns.serviceMonitor.port }} port: {{ .Values.coreDns.service.port }} diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/service.yaml index 43b1a976d5e5..0a901c4acfd4 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/service.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/service.yaml @@ -10,6 +10,10 @@ metadata: namespace: kube-system spec: clusterIP: None + {{- if .Values.kubeControllerManager.service.ipDualStack.enabled }} + ipFamilies: {{ toYaml .Values.kubeControllerManager.service.ipDualStack.ipFamilies | nindent 4 }} + ipFamilyPolicy: {{ .Values.kubeControllerManager.service.ipDualStack.ipFamilyPolicy }} + {{- end }} ports: - name: {{ .Values.kubeControllerManager.serviceMonitor.port }} {{- $kubeControllerManagerDefaultInsecurePort := 10252 }} diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-dns/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-dns/service.yaml index 81b2c9930ce5..478f4194006a 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-dns/service.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-dns/service.yaml @@ -10,6 +10,10 @@ metadata: namespace: kube-system spec: clusterIP: None + {{- if .Values.kubeDns.service.ipDualStack.enabled }} + ipFamilies: {{ toYaml .Values.kubeDns.service.ipDualStack.ipFamilies | nindent 4 }} + ipFamilyPolicy: {{ .Values.kubeDns.service.ipDualStack.ipFamilyPolicy }} + {{- end }} ports: - name: http-metrics-dnsmasq port: {{ .Values.kubeDns.service.dnsmasq.port }} diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-etcd/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-etcd/service.yaml index d07d4f35e311..a62059aa4e8f 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-etcd/service.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-etcd/service.yaml @@ -10,6 +10,10 @@ metadata: namespace: kube-system spec: clusterIP: None + {{- if .Values.kubeEtcd.service.ipDualStack.enabled }} + ipFamilies: {{ toYaml .Values.kubeEtcd.service.ipDualStack.ipFamilies | nindent 4 }} + ipFamilyPolicy: {{ .Values.kubeEtcd.service.ipDualStack.ipFamilyPolicy }} + {{- end }} ports: - name: {{ .Values.kubeEtcd.serviceMonitor.port }} port: {{ .Values.kubeEtcd.service.port }} diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-proxy/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-proxy/service.yaml index 8ccb2210d742..672f5492b8bd 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-proxy/service.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-proxy/service.yaml @@ -10,6 +10,10 @@ metadata: namespace: kube-system spec: clusterIP: None + {{- if .Values.kubeProxy.service.ipDualStack.enabled }} + ipFamilies: {{ toYaml .Values.kubeProxy.service.ipDualStack.ipFamilies | nindent 4 }} + ipFamilyPolicy: {{ .Values.kubeProxy.service.ipDualStack.ipFamilyPolicy }} + {{- end }} ports: - name: {{ .Values.kubeProxy.serviceMonitor.port }} port: {{ .Values.kubeProxy.service.port }} diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/service.yaml index 90b3a800a4c3..8663d79f0d39 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/service.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/service.yaml @@ -10,6 +10,10 @@ metadata: namespace: kube-system spec: clusterIP: None + {{- if .Values.kubeScheduler.service.ipDualStack.enabled }} + ipFamilies: {{ toYaml .Values.kubeScheduler.service.ipDualStack.ipFamilies | nindent 4 }} + ipFamilyPolicy: {{ .Values.kubeScheduler.service.ipDualStack.ipFamilyPolicy }} + {{- end }} ports: - name: {{ .Values.kubeScheduler.serviceMonitor.port }} {{- $kubeSchedulerDefaultInsecurePort := 10251 }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/service.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/service.yaml index b06c129123b0..6de9cbb71d23 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/service.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/service.yaml @@ -18,6 +18,10 @@ spec: {{- if .Values.prometheusOperator.admissionWebhooks.deployment.service.clusterIP }} clusterIP: {{ .Values.prometheusOperator.admissionWebhooks.deployment.service.clusterIP }} {{- end }} +{{- if .Values.prometheusOperator.admissionWebhooks.deployment.service.ipDualStack.enabled }} + ipFamilies: {{ toYaml .Values.prometheusOperator.admissionWebhooks.deployment.service.ipDualStack.ipFamilies | nindent 4 }} + ipFamilyPolicy: {{ .Values.prometheusOperator.admissionWebhooks.deployment.service.ipDualStack.ipFamilyPolicy }} +{{- end }} {{- if .Values.prometheusOperator.admissionWebhooks.deployment.service.externalIPs }} externalIPs: {{ toYaml .Values.prometheusOperator.admissionWebhooks.deployment.service.externalIPs | indent 4 }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/service.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/service.yaml index d45ab22d0861..72e0788abf79 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/service.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/service.yaml @@ -17,6 +17,10 @@ spec: {{- if .Values.prometheusOperator.service.clusterIP }} clusterIP: {{ .Values.prometheusOperator.service.clusterIP }} {{- end }} +{{- if .Values.prometheusOperator.service.ipDualStack.enabled }} + ipFamilies: {{ toYaml .Values.prometheusOperator.service.ipDualStack.ipFamilies | nindent 4 }} + ipFamilyPolicy: {{ .Values.prometheusOperator.service.ipDualStack.ipFamilyPolicy }} +{{- end }} {{- if .Values.prometheusOperator.service.externalIPs }} externalIPs: {{ toYaml .Values.prometheusOperator.service.externalIPs | indent 4 }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/service.yaml b/charts/kube-prometheus-stack/templates/prometheus/service.yaml index d61b9d6ef39f..bfabebe7b9df 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/service.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/service.yaml @@ -20,6 +20,10 @@ spec: {{- if .Values.prometheus.service.clusterIP }} clusterIP: {{ .Values.prometheus.service.clusterIP }} {{- end }} +{{- if .Values.prometheus.service.ipDualStack.enabled }} + ipFamilies: {{ toYaml .Values.prometheus.service.ipDualStack.ipFamilies | nindent 4 }} + ipFamilyPolicy: {{ .Values.prometheus.service.ipDualStack.ipFamilyPolicy }} +{{- end }} {{- if .Values.prometheus.service.externalIPs }} externalIPs: {{ toYaml .Values.prometheus.service.externalIPs | indent 4 }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/serviceThanosSidecar.yaml b/charts/kube-prometheus-stack/templates/prometheus/serviceThanosSidecar.yaml index 15b89c8c2380..87fae7b4f924 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/serviceThanosSidecar.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/serviceThanosSidecar.yaml @@ -17,6 +17,10 @@ metadata: spec: type: {{ .Values.prometheus.thanosService.type }} clusterIP: {{ .Values.prometheus.thanosService.clusterIP }} +{{- if .Values.prometheus.thanosService.ipDualStack.enabled }} + ipFamilies: {{ toYaml .Values.prometheus.thanosService.ipDualStack.ipFamilies | nindent 4 }} + ipFamilyPolicy: {{ .Values.prometheus.thanosService.ipDualStack.ipFamilyPolicy }} +{{- end }} {{- if ne .Values.prometheus.thanosService.type "ClusterIP" }} externalTrafficPolicy: {{ .Values.prometheus.thanosService.externalTrafficPolicy }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/serviceperreplica.yaml b/charts/kube-prometheus-stack/templates/prometheus/serviceperreplica.yaml index 4bc7f7b86957..3a88b2df3479 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/serviceperreplica.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/serviceperreplica.yaml @@ -24,6 +24,10 @@ items: {{- if $serviceValues.clusterIP }} clusterIP: {{ $serviceValues.clusterIP }} {{- end }} + {{- if $serviceValues.ipDualStack.enabled }} + ipFamilies: {{ toYaml $serviceValues.ipDualStack.ipFamilies | nindent 4 }} + ipFamilyPolicy: {{ $serviceValues.ipDualStack.ipFamilyPolicy }} + {{- end }} {{- if $serviceValues.loadBalancerSourceRanges }} loadBalancerSourceRanges: {{- range $cidr := $serviceValues.loadBalancerSourceRanges }} diff --git a/charts/kube-prometheus-stack/templates/thanos-ruler/service.yaml b/charts/kube-prometheus-stack/templates/thanos-ruler/service.yaml index e08b71ff82d9..e2cca291882f 100644 --- a/charts/kube-prometheus-stack/templates/thanos-ruler/service.yaml +++ b/charts/kube-prometheus-stack/templates/thanos-ruler/service.yaml @@ -19,6 +19,10 @@ spec: {{- if .Values.thanosRuler.service.clusterIP }} clusterIP: {{ .Values.thanosRuler.service.clusterIP }} {{- end }} +{{- if .Values.thanosRuler.service.ipDualStack.enabled }} + ipFamilies: {{ toYaml .Values.thanosRuler.service.ipDualStack.ipFamilies | nindent 4 }} + ipFamilyPolicy: {{ .Values.thanosRuler.service.ipDualStack.ipFamilyPolicy }} +{{- end }} {{- if .Values.thanosRuler.service.externalIPs }} externalIPs: {{ toYaml .Values.thanosRuler.service.externalIPs | indent 4 }} diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml index 8fcb6e35de52..2dd808091290 100644 --- a/charts/kube-prometheus-stack/values.yaml +++ b/charts/kube-prometheus-stack/values.yaml @@ -476,6 +476,10 @@ alertmanager: annotations: {} labels: {} clusterIP: "" + ipDualStack: + enabled: false + ipFamilies: ["IPv6", "IPv4"] + ipFamilyPolicy: "PreferDualStack" ## Port for Alertmanager Service to listen on ## @@ -1454,6 +1458,10 @@ kubeControllerManager: ## port: null targetPort: null + ipDualStack: + enabled: false + ipFamilies: ["IPv6", "IPv4"] + ipFamilyPolicy: "PreferDualStack" # selector: # component: kube-controller-manager @@ -1540,6 +1548,11 @@ coreDns: enabled: true port: 9153 targetPort: 9153 + + ipDualStack: + enabled: false + ipFamilies: ["IPv6", "IPv4"] + ipFamilyPolicy: "PreferDualStack" # selector: # k8s-app: kube-dns serviceMonitor: @@ -1616,6 +1629,10 @@ kubeDns: skydns: port: 10055 targetPort: 10055 + ipDualStack: + enabled: false + ipFamilies: ["IPv6", "IPv4"] + ipFamilyPolicy: "PreferDualStack" # selector: # k8s-app: kube-dns serviceMonitor: @@ -1713,6 +1730,10 @@ kubeEtcd: enabled: true port: 2381 targetPort: 2381 + ipDualStack: + enabled: false + ipFamilies: ["IPv6", "IPv4"] + ipFamilyPolicy: "PreferDualStack" # selector: # component: etcd @@ -1817,6 +1838,10 @@ kubeScheduler: ## port: null targetPort: null + ipDualStack: + enabled: false + ipFamilies: ["IPv6", "IPv4"] + ipFamilyPolicy: "PreferDualStack" # selector: # component: kube-scheduler @@ -1910,6 +1935,10 @@ kubeProxy: enabled: true port: 10249 targetPort: 10249 + ipDualStack: + enabled: false + ipFamilies: ["IPv6", "IPv4"] + ipFamilyPolicy: "PreferDualStack" # selector: # k8s-app: kube-proxy @@ -2080,6 +2109,10 @@ prometheus-node-exporter: - --collector.filesystem.fs-types-exclude=^(autofs|binfmt_misc|bpf|cgroup2?|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs|tracefs)$ service: portName: http-metrics + ipDualStack: + enabled: false + ipFamilies: ["IPv6", "IPv4"] + ipFamilyPolicy: "PreferDualStack" prometheus: monitor: enabled: true @@ -2233,6 +2266,10 @@ prometheusOperator: annotations: {} labels: {} clusterIP: "" + ipDualStack: + enabled: false + ipFamilies: ["IPv6", "IPv4"] + ipFamilyPolicy: "PreferDualStack" ## Port to expose on each node ## Only used if service.type is 'NodePort' @@ -2521,6 +2558,10 @@ prometheusOperator: annotations: {} labels: {} clusterIP: "" + ipDualStack: + enabled: false + ipFamilies: ["IPv6", "IPv4"] + ipFamilyPolicy: "PreferDualStack" ## Port to expose on each node ## Only used if service.type is 'NodePort' @@ -2898,6 +2939,13 @@ prometheus: ## type: ClusterIP + ## Service dual stack + ## + ipDualStack: + enabled: false + ipFamilies: ["IPv6", "IPv4"] + ipFamilyPolicy: "PreferDualStack" + ## gRPC port config portName: grpc port: 10901 @@ -2980,6 +3028,10 @@ prometheus: annotations: {} labels: {} clusterIP: "" + ipDualStack: + enabled: false + ipFamilies: ["IPv6", "IPv4"] + ipFamilyPolicy: "PreferDualStack" ## Port for Prometheus Service to listen on ## @@ -3072,6 +3124,13 @@ prometheus: ## type: ClusterIP + ## Service dual stack + ## + ipDualStack: + enabled: false + ipFamilies: ["IPv6", "IPv4"] + ipFamilyPolicy: "PreferDualStack" + ## Configure pod disruption budgets for Prometheus ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget ## @@ -4217,6 +4276,10 @@ thanosRuler: annotations: {} labels: {} clusterIP: "" + ipDualStack: + enabled: false + ipFamilies: ["IPv6", "IPv4"] + ipFamilyPolicy: "PreferDualStack" ## Port for ThanosRuler Service to listen on ## From ebf85bc07903d8232f0a7b9ac3e1bdff083a58f2 Mon Sep 17 00:00:00 2001 From: Ludovic Ortega Date: Sat, 20 Apr 2024 08:27:14 +0200 Subject: [PATCH 02/26] [kube-state-metrics] add support for dual stack clusters (#4473) Signed-off-by: Ludovic Ortega --- charts/kube-state-metrics/Chart.yaml | 2 +- charts/kube-state-metrics/templates/service.yaml | 4 ++++ charts/kube-state-metrics/values.yaml | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/charts/kube-state-metrics/Chart.yaml b/charts/kube-state-metrics/Chart.yaml index 9c5a266e0d47..4e2f08701a09 100644 --- a/charts/kube-state-metrics/Chart.yaml +++ b/charts/kube-state-metrics/Chart.yaml @@ -7,7 +7,7 @@ keywords: - prometheus - kubernetes type: application -version: 5.18.1 +version: 5.19.0 appVersion: 2.12.0 home: https://github.com/kubernetes/kube-state-metrics/ sources: diff --git a/charts/kube-state-metrics/templates/service.yaml b/charts/kube-state-metrics/templates/service.yaml index 6c486a662ab0..90c235148f2f 100644 --- a/charts/kube-state-metrics/templates/service.yaml +++ b/charts/kube-state-metrics/templates/service.yaml @@ -14,6 +14,10 @@ metadata: {{- end }} spec: type: "{{ .Values.service.type }}" + {{- if .Values.service.ipDualStack.enabled }} + ipFamilies: {{ toYaml .Values.service.ipDualStack.ipFamilies | nindent 4 }} + ipFamilyPolicy: {{ .Values.service.ipDualStack.ipFamilyPolicy }} + {{- end }} ports: - name: "http" protocol: TCP diff --git a/charts/kube-state-metrics/values.yaml b/charts/kube-state-metrics/values.yaml index 443f309a279d..2e8283a89469 100644 --- a/charts/kube-state-metrics/values.yaml +++ b/charts/kube-state-metrics/values.yaml @@ -56,6 +56,10 @@ service: port: 8080 # Default to clusterIP for backward compatibility type: ClusterIP + ipDualStack: + enabled: false + ipFamilies: ["IPv6", "IPv4"] + ipFamilyPolicy: "PreferDualStack" nodePort: 0 loadBalancerIP: "" # Only allow access to the loadBalancerIP from these IPs From f25e9ea37231fd3c11022bb0b57f4f712c2dccaa Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Sat, 20 Apr 2024 14:06:16 +0300 Subject: [PATCH 03/26] bump operator to 0.73.2 (#4475) --- charts/kube-prometheus-stack/Chart.yaml | 4 ++-- .../charts/crds/crds/crd-alertmanagerconfigs.yaml | 4 ++-- .../charts/crds/crds/crd-alertmanagers.yaml | 4 ++-- .../charts/crds/crds/crd-podmonitors.yaml | 4 ++-- charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml | 4 ++-- .../charts/crds/crds/crd-prometheusagents.yaml | 4 ++-- .../charts/crds/crds/crd-prometheuses.yaml | 4 ++-- .../charts/crds/crds/crd-prometheusrules.yaml | 4 ++-- .../charts/crds/crds/crd-scrapeconfigs.yaml | 4 ++-- .../charts/crds/crds/crd-servicemonitors.yaml | 4 ++-- .../charts/crds/crds/crd-thanosrulers.yaml | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 898841b3571d..7a2d00b2ff06 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -23,8 +23,8 @@ name: kube-prometheus-stack sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus -version: 58.2.0 -appVersion: v0.73.1 +version: 58.2.1 +appVersion: v0.73.2 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus keywords: diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml index 0d71a0551bcb..13d0574626b0 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.73.1 + operator.prometheus.io/version: 0.73.2 name: alertmanagerconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml index 320b82bd0006..b266b66e20fc 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.73.1 + operator.prometheus.io/version: 0.73.2 name: alertmanagers.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml index 721c51ea5303..51daf45f399e 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.1/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.73.1 + operator.prometheus.io/version: 0.73.2 name: podmonitors.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml index 769bf6ebbe36..aa3b3cec32b0 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.1/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.73.1 + operator.prometheus.io/version: 0.73.2 name: probes.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml index 961d21a31b41..a6050e740612 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.73.1 + operator.prometheus.io/version: 0.73.2 name: prometheusagents.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml index 8c754ecb8033..8774fe6694b1 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.73.1 + operator.prometheus.io/version: 0.73.2 name: prometheuses.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml index 4e66a5c886ff..a7cd7977d17b 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.73.1 + operator.prometheus.io/version: 0.73.2 name: prometheusrules.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml index 7d5ce00a7b5d..dd76ce0a80b3 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.1/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.73.1 + operator.prometheus.io/version: 0.73.2 name: scrapeconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml index 920b24ef1f9e..875291c4cc6c 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.1/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.73.1 + operator.prometheus.io/version: 0.73.2 name: servicemonitors.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/charts/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml b/charts/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml index 98803af1c5ac..20d143666658 100644 --- a/charts/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml +++ b/charts/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.1/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.73.1 + operator.prometheus.io/version: 0.73.2 name: thanosrulers.monitoring.coreos.com spec: group: monitoring.coreos.com From e10a9b286c0e2d666b4628fa11fab22a01baa386 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Sat, 20 Apr 2024 18:51:47 +0300 Subject: [PATCH 04/26] [prometheus] bump to 2.51.2 + dependencies (#4476) * bump pushgateway dependency Signed-off-by: drfaust92 * bump prom to 2.51.2 Signed-off-by: drfaust92 * Update charts/prometheus/Chart.yaml Co-authored-by: zeritti <47476160+zeritti@users.noreply.github.com> Signed-off-by: Ilia Lazebnik --------- Signed-off-by: drfaust92 Signed-off-by: Ilia Lazebnik Co-authored-by: zeritti <47476160+zeritti@users.noreply.github.com> --- charts/prometheus/Chart.lock | 8 ++++---- charts/prometheus/Chart.yaml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/prometheus/Chart.lock b/charts/prometheus/Chart.lock index 514b74bce151..4cf43ed7a603 100644 --- a/charts/prometheus/Chart.lock +++ b/charts/prometheus/Chart.lock @@ -4,12 +4,12 @@ dependencies: version: 1.10.0 - name: kube-state-metrics repository: https://prometheus-community.github.io/helm-charts - version: 5.18.0 + version: 5.18.1 - name: prometheus-node-exporter repository: https://prometheus-community.github.io/helm-charts version: 4.32.0 - name: prometheus-pushgateway repository: https://prometheus-community.github.io/helm-charts - version: 2.8.0 -digest: sha256:845b6afcabde9eeecc322bc57f8e925a149b44c92f4170db0b45061ce6911637 -generated: "2024-03-29T20:56:04.276491+03:00" + version: 2.12.0 +digest: sha256:c872c94f0e911285f56bbf5e2881bbc3315ef28f844ec4b774b11d5bc2f96453 +generated: "2024-04-20T09:26:23.517241+03:00" diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml index 32c94bf882b1..b0777c17cf04 100644 --- a/charts/prometheus/Chart.yaml +++ b/charts/prometheus/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: prometheus -appVersion: v2.51.1 -version: 25.19.1 +appVersion: v2.51.2 +version: 25.20.0 kubeVersion: ">=1.19.0-0" description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ @@ -38,7 +38,7 @@ dependencies: repository: https://prometheus-community.github.io/helm-charts condition: prometheus-node-exporter.enabled - name: prometheus-pushgateway - version: "2.8.*" + version: "2.12.*" repository: https://prometheus-community.github.io/helm-charts condition: prometheus-pushgateway.enabled keywords: From 224e916ddf41bfd1166f0850e6389db122987272 Mon Sep 17 00:00:00 2001 From: Adrian Berger <43774417+adberger@users.noreply.github.com> Date: Mon, 22 Apr 2024 20:16:45 +0200 Subject: [PATCH 05/26] [prometheus-blackbox-exporter] fix: only template env if .Values.extraEnv is specified (#4354) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Adrian Berger Signed-off-by: André Bauer Co-authored-by: André Bauer --- charts/prometheus-blackbox-exporter/Chart.yaml | 2 +- charts/prometheus-blackbox-exporter/templates/_helpers.tpl | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/prometheus-blackbox-exporter/Chart.yaml b/charts/prometheus-blackbox-exporter/Chart.yaml index 94a22523a63d..420fffd67eb1 100644 --- a/charts/prometheus-blackbox-exporter/Chart.yaml +++ b/charts/prometheus-blackbox-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: Prometheus Blackbox Exporter name: prometheus-blackbox-exporter -version: 8.15.1 +version: 8.15.2 appVersion: v0.25.0 home: https://github.com/prometheus/blackbox_exporter sources: diff --git a/charts/prometheus-blackbox-exporter/templates/_helpers.tpl b/charts/prometheus-blackbox-exporter/templates/_helpers.tpl index 30039b893efc..4e28e55871bf 100644 --- a/charts/prometheus-blackbox-exporter/templates/_helpers.tpl +++ b/charts/prometheus-blackbox-exporter/templates/_helpers.tpl @@ -213,11 +213,13 @@ containers: securityContext: {{- toYaml . | nindent 4 }} {{- end }} + {{- if .Values.extraEnv }} env: {{- range $key, $value := .Values.extraEnv }} - name: {{ $key }} value: {{ $value | quote }} {{- end }} + {{- end }} {{- if .Values.extraEnvFromSecret }} envFrom: {{- range .Values.extraEnvFromSecret }} From 9a15dd4e06b7d52afc8fa35fd21f3e28c25d6eff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Mon, 22 Apr 2024 23:38:17 +0200 Subject: [PATCH 06/26] remove yq install (#4479) --- .github/workflows/check-codeowners.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/check-codeowners.yaml b/.github/workflows/check-codeowners.yaml index 9911c00cd9a8..dad49e040e3b 100644 --- a/.github/workflows/check-codeowners.yaml +++ b/.github/workflows/check-codeowners.yaml @@ -8,10 +8,6 @@ jobs: - name: Checkout Code uses: actions/checkout@v4 - - name: install yq - run: | - sudo snap install yq - - name: generate CODEOWNERS run: | ./scripts/check-codeowners.sh > .github/CODEOWNERS From 4d52be30b712221eadc1e6ca790381f1751cb183 Mon Sep 17 00:00:00 2001 From: Mikhail Naletov <36846182+okgolove@users.noreply.github.com> Date: Tue, 23 Apr 2024 10:40:11 +0300 Subject: [PATCH 07/26] feat: bump prometheus-nats-exporter to 0.15.0 (#4466) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mikhail Naletov Co-authored-by: André Bauer --- charts/prometheus-nats-exporter/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/prometheus-nats-exporter/Chart.yaml b/charts/prometheus-nats-exporter/Chart.yaml index c794bd295fe4..f546cd8282b5 100644 --- a/charts/prometheus-nats-exporter/Chart.yaml +++ b/charts/prometheus-nats-exporter/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: 0.14.0 +appVersion: 0.15.0 description: A Helm chart for prometheus-nats-exporter name: prometheus-nats-exporter -version: 2.16.0 +version: 2.17.0 home: https://github.com/nats-io/prometheus-nats-exporter sources: - https://github.com/nats-io/prometheus-nats-exporter From 7f75d69d8ef0c91d441fa89dca86c76342e233ba Mon Sep 17 00:00:00 2001 From: Christophe Date: Tue, 23 Apr 2024 21:21:44 +0200 Subject: [PATCH 08/26] [prometheus-modbus-exporter] fix deployment template to handle image.registry value (#4436) Signed-off-by: Christophe Rime --- charts/prometheus-modbus-exporter/Chart.yaml | 2 +- charts/prometheus-modbus-exporter/templates/deployment.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/prometheus-modbus-exporter/Chart.yaml b/charts/prometheus-modbus-exporter/Chart.yaml index b715fa4ec403..57a5f7864ca8 100644 --- a/charts/prometheus-modbus-exporter/Chart.yaml +++ b/charts/prometheus-modbus-exporter/Chart.yaml @@ -11,7 +11,7 @@ keywords: type: application -version: 0.1.0 +version: 0.1.1 appVersion: "0.4.0" maintainers: diff --git a/charts/prometheus-modbus-exporter/templates/deployment.yaml b/charts/prometheus-modbus-exporter/templates/deployment.yaml index 48a3c09f9789..113bc059c003 100644 --- a/charts/prometheus-modbus-exporter/templates/deployment.yaml +++ b/charts/prometheus-modbus-exporter/templates/deployment.yaml @@ -35,7 +35,7 @@ spec: - "--log.format={{ .Values.log.format }}" securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - name: metrics @@ -56,7 +56,7 @@ spec: mountPath: /etc/modbus_exporter/ {{ if .Values.configReloaderSidecar.enable }} - name: {{ include "prometheus-modbus-exporter.fullname" . }}-config-reloader-sidecar - image: "{{ .Values.configReloaderSidecar.image.repository }}:{{ .Values.configReloaderSidecar.image.tag }}" + image: "{{ .Values.configReloaderSidecar.image.registry }}/{{ .Values.configReloaderSidecar.image.repository }}:{{ .Values.configReloaderSidecar.image.tag }}" env: - name: CONFIG_DIR value: /etc/modbus_exporter/ From 498c67258a672ce38acc9025c27c50d163d25927 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Tue, 23 Apr 2024 22:30:15 +0300 Subject: [PATCH 09/26] [prometheus-modbus-exporter] bump to 0.4.1 (#4444) Signed-off-by: drfaust92 Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com> Co-authored-by: zeritti <47476160+zeritti@users.noreply.github.com> --- charts/prometheus-modbus-exporter/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/prometheus-modbus-exporter/Chart.yaml b/charts/prometheus-modbus-exporter/Chart.yaml index 57a5f7864ca8..9e21fe0b3578 100644 --- a/charts/prometheus-modbus-exporter/Chart.yaml +++ b/charts/prometheus-modbus-exporter/Chart.yaml @@ -11,8 +11,8 @@ keywords: type: application -version: 0.1.1 -appVersion: "0.4.0" +version: 0.1.2 +appVersion: "0.4.1" maintainers: - name: openenergyprojects From 5d209c7e21eaba11cfc4f05ef33ce0f931610084 Mon Sep 17 00:00:00 2001 From: kogeler <25884155+kogeler@users.noreply.github.com> Date: Wed, 24 Apr 2024 02:19:59 +0300 Subject: [PATCH 10/26] [prom-label-proxy] add path templating (#4482) --- charts/prom-label-proxy/Chart.yaml | 2 +- charts/prom-label-proxy/templates/ingress.yaml | 2 +- charts/prom-label-proxy/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/prom-label-proxy/Chart.yaml b/charts/prom-label-proxy/Chart.yaml index 1356cb781a6e..ba24dddb1b58 100644 --- a/charts/prom-label-proxy/Chart.yaml +++ b/charts/prom-label-proxy/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: prom-label-proxy description: A proxy that enforces a given label in a given PromQL query. type: application -version: 0.7.1 +version: 0.7.2 appVersion: "v0.8.1" home: "https://github.com/prometheus-community/prom-label-proxy" keywords: diff --git a/charts/prom-label-proxy/templates/ingress.yaml b/charts/prom-label-proxy/templates/ingress.yaml index f4c78586764d..3c9cce8b149f 100644 --- a/charts/prom-label-proxy/templates/ingress.yaml +++ b/charts/prom-label-proxy/templates/ingress.yaml @@ -46,7 +46,7 @@ spec: http: paths: {{- range .paths }} - - path: {{ .path }} + - path: {{ tpl .path $ | quote }} {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} pathType: {{ .pathType }} {{- end }} diff --git a/charts/prom-label-proxy/values.yaml b/charts/prom-label-proxy/values.yaml index 5510729a1bc7..2bd05c93f22b 100644 --- a/charts/prom-label-proxy/values.yaml +++ b/charts/prom-label-proxy/values.yaml @@ -93,7 +93,7 @@ nodeSelector: {} # -- Tolerations for pod assignment. Evaluated as a template. tolerations: [] -# -- Ingress hosts and annotations fields are passed through helm tpl function. +# -- Ingress hosts, paths and annotations fields are passed through helm tpl function. ## ref: https://helm.sh/docs/developing_charts/#using-the-tpl-function ingress: enabled: false From a1a6d92b04d4ac3eb553348b127ab7871045c934 Mon Sep 17 00:00:00 2001 From: allanhung Date: Wed, 24 Apr 2024 14:23:06 +0800 Subject: [PATCH 11/26] [kube-prometheus-stack] support kubelet label selector (#4483) --- charts/kube-prometheus-stack/Chart.yaml | 2 +- .../templates/prometheus-operator/deployment.yaml | 3 +++ charts/kube-prometheus-stack/values.yaml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 7a2d00b2ff06..7051d72344c0 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -23,7 +23,7 @@ name: kube-prometheus-stack sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus -version: 58.2.1 +version: 58.2.2 appVersion: v0.73.2 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml index e2b1ba92c692..342f38828e74 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml @@ -59,6 +59,9 @@ spec: args: {{- if .Values.prometheusOperator.kubeletService.enabled }} - --kubelet-service={{ .Values.prometheusOperator.kubeletService.namespace }}/{{ default $defaultKubeletSvcName .Values.prometheusOperator.kubeletService.name }} + {{- if .Values.prometheusOperator.kubeletService.selector }} + - --kubelet-selector={{ .Values.prometheusOperator.kubeletService.selector }} + {{- end }} {{- end }} {{- if .Values.prometheusOperator.logFormat }} - --log-format={{ .Values.prometheusOperator.logFormat }} diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml index 2dd808091290..662af291f7bb 100644 --- a/charts/kube-prometheus-stack/values.yaml +++ b/charts/kube-prometheus-stack/values.yaml @@ -2627,6 +2627,7 @@ prometheusOperator: ## enabled: true namespace: kube-system + selector: "" ## Use '{{ template "kube-prometheus-stack.fullname" . }}-kubelet' by default name: "" From dff13d533cddb5218462b091bc46a790df14ed47 Mon Sep 17 00:00:00 2001 From: Yigit Ozen Date: Wed, 24 Apr 2024 13:19:04 +0300 Subject: [PATCH 12/26] [prometheus-blackbox-exporter] Add value for hostPort (#4469) * [prometheus-blackbox-exporter] Add value for hostPort Signed-off-by: Yigit Ozen * [prometheus-blackbox-exporter] Bump chart version Signed-off-by: Yigit Ozen --------- Signed-off-by: Yigit Ozen --- charts/prometheus-blackbox-exporter/Chart.yaml | 2 +- charts/prometheus-blackbox-exporter/templates/_helpers.tpl | 3 +++ charts/prometheus-blackbox-exporter/values.yaml | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/charts/prometheus-blackbox-exporter/Chart.yaml b/charts/prometheus-blackbox-exporter/Chart.yaml index 420fffd67eb1..6f9817f3e236 100644 --- a/charts/prometheus-blackbox-exporter/Chart.yaml +++ b/charts/prometheus-blackbox-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: Prometheus Blackbox Exporter name: prometheus-blackbox-exporter -version: 8.15.2 +version: 8.16.0 appVersion: v0.25.0 home: https://github.com/prometheus/blackbox_exporter sources: diff --git a/charts/prometheus-blackbox-exporter/templates/_helpers.tpl b/charts/prometheus-blackbox-exporter/templates/_helpers.tpl index 4e28e55871bf..dd04f3129705 100644 --- a/charts/prometheus-blackbox-exporter/templates/_helpers.tpl +++ b/charts/prometheus-blackbox-exporter/templates/_helpers.tpl @@ -247,6 +247,9 @@ containers: ports: - containerPort: {{ .Values.containerPort }} name: http + {{- if .Values.hostPort }} + hostPort: {{ .Values.hostPort }} + {{- end }} livenessProbe: {{- toYaml .Values.livenessProbe | trim | nindent 4 }} readinessProbe: diff --git a/charts/prometheus-blackbox-exporter/values.yaml b/charts/prometheus-blackbox-exporter/values.yaml index bf8b7beb0f73..8d0924ebd821 100644 --- a/charts/prometheus-blackbox-exporter/values.yaml +++ b/charts/prometheus-blackbox-exporter/values.yaml @@ -213,6 +213,10 @@ service: # https://github.com/prometheus/blackbox_exporter/blob/998037b5b40c1de5fee348ffdea8820509d85171/main.go#L55 containerPort: 9115 +# Number of port to expose on the host. If specified, this must be a valid port number, 0 < x < 65536. If zero, no port is exposed. +# This is useful for communicating with Daemon Pods when kind is DaemonSet. +hostPort: 0 + serviceAccount: # Specifies whether a ServiceAccount should be created create: true From ee961be71d016abd798a33b3d1480491328844dc Mon Sep 17 00:00:00 2001 From: bylit <110344434+bylit@users.noreply.github.com> Date: Thu, 25 Apr 2024 14:38:26 +0300 Subject: [PATCH 13/26] =?UTF-8?q?[prometheus-mysql-exporter]=20Manual=20cr?= =?UTF-8?q?edentials=20specification=20for=20mult=E2=80=A6=20(#4485)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [prometheus-mysql-exporter] Manual credentials specification for multuple targets Signed-off-by: alit-by * [prometheus-mysql-exporter] Fix linting. Signed-off-by: alit-by --------- Signed-off-by: alit-by --- charts/prometheus-mysql-exporter/Chart.yaml | 2 +- charts/prometheus-mysql-exporter/README.md | 36 +++++++++++-------- .../templates/_helpers.tpl | 13 +++++++ .../templates/secret-config.yaml | 3 ++ charts/prometheus-mysql-exporter/values.yaml | 7 ++-- 5 files changed, 44 insertions(+), 17 deletions(-) diff --git a/charts/prometheus-mysql-exporter/Chart.yaml b/charts/prometheus-mysql-exporter/Chart.yaml index 26f350bfa53a..91e94e40d9dc 100644 --- a/charts/prometheus-mysql-exporter/Chart.yaml +++ b/charts/prometheus-mysql-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for prometheus mysql exporter with cloudsqlproxy name: prometheus-mysql-exporter -version: 2.5.1 +version: 2.5.2 home: https://github.com/prometheus/mysqld_exporter appVersion: v0.15.1 sources: diff --git a/charts/prometheus-mysql-exporter/README.md b/charts/prometheus-mysql-exporter/README.md index 8eca2387d276..1cc4a2792b15 100644 --- a/charts/prometheus-mysql-exporter/README.md +++ b/charts/prometheus-mysql-exporter/README.md @@ -43,8 +43,8 @@ helm upgrade [RELEASE_NAME] [CHART] --install ### Multiple-target probes -mysql_exporter now support multi-target probes using the `/probe` route. To enable this feature, set `serviecMonitor.multipleTarget.enabled` to `true` and define your targets in `serviceMonitor.multipleTarget.targets`. -Credentials for each target should be referenced in the associate config file. Target name should match the entry in the config file. +mysql_exporter now support multi-target probes using the `/probe` route. To enable this feature, set `serviceMonitor.multipleTarget.enabled` to `true` and define your targets in `serviceMonitor.multipleTarget.targets`. +Credentials for each target should be referenced either in targets section or in the associated config file. As an example, for a config file with two targets: ```yaml @@ -52,28 +52,36 @@ serviceMonitor: multipleTarget: enabled: true targets: - - name: localhost - endpoint: 127.0.0.1 - - name: remote - endpoint: 8.8.8.8 + - endpoint: mysql1.dns.local + name: mysql1 port: 3307 + user: user1 + password: password1 + - endpoint: mysql2.dns.local + name: mysql2 + user: user2 + password: password2 ``` -Config file should have the following entries: +In case of Config file Target name should match the entry in the config file. +Config file example for the above targets: ```cnf [client] user=NOT_USED password=NOT_USED -[client.localhost] -user=localhost_user -password=localhost_password -[client.remote] -user=remote_user -password=remote_password +[client.mysql1] +user=user1 +password=password1 +[client.mysql2] +user=user2 +password=password2 ``` -The configuration file can be referenced using `mysql.existingConfigSecret`. +The configuration file can be: + +- referenced using `mysql.existingConfigSecret`; +- created automatically in case user and password are specified for the target. If all your target use the same credentials, you can set `serviceMonitor.sharedSecret.enabled` to `true` and define the key name in `serviceMonitor.sharedSecret.name`. ### From 1.x to 2.x diff --git a/charts/prometheus-mysql-exporter/templates/_helpers.tpl b/charts/prometheus-mysql-exporter/templates/_helpers.tpl index 1428208b4bcc..1f369c08196a 100644 --- a/charts/prometheus-mysql-exporter/templates/_helpers.tpl +++ b/charts/prometheus-mysql-exporter/templates/_helpers.tpl @@ -91,6 +91,19 @@ Secret key for config {{- end -}} */}} +{{/* Define a function to iterate over multi scraping targets */}} +{{- define "render_mysql_targets" -}} + {{- if and (.Values.serviceMonitor.multipleTarget.targets) (not .Values.serviceMonitor.multipleTarget.sharedSecret.enabled) -}} + {{- range .Values.serviceMonitor.multipleTarget.targets }} + {{- if and (.user) (.password) }} + [client.{{ .name }}] + user={{ .user }} + password={{ .password }} + {{- end -}} + {{- end -}} + {{- end -}} +{{- end -}} + {{/* Define overriding namespace */}} diff --git a/charts/prometheus-mysql-exporter/templates/secret-config.yaml b/charts/prometheus-mysql-exporter/templates/secret-config.yaml index 2a0528e8c8f2..28a5cf12e4c9 100644 --- a/charts/prometheus-mysql-exporter/templates/secret-config.yaml +++ b/charts/prometheus-mysql-exporter/templates/secret-config.yaml @@ -25,4 +25,7 @@ stringData: {{- range $param := .Values.mysql.additionalConfig}} {{ $param }} {{- end }} + {{- if .Values.serviceMonitor.multipleTarget.enabled -}} + {{- template "render_mysql_targets" . -}} + {{- end -}} {{- end }} diff --git a/charts/prometheus-mysql-exporter/values.yaml b/charts/prometheus-mysql-exporter/values.yaml index 1c9b7daac1a3..47768d0eb1bb 100644 --- a/charts/prometheus-mysql-exporter/values.yaml +++ b/charts/prometheus-mysql-exporter/values.yaml @@ -50,13 +50,16 @@ serviceMonitor: multipleTarget: enabled: false targets: [] - # target connection information with name (required), endpoint (required) and port (optionnal) - # if sharedSecret is not enabled the name must match an entry client.{{ name }} existing in the secret + # target connection information with name (required), endpoint (required), port (optional), user(optional), password(optional) # - endpoint: mysql1.dns.local # name: mysql1 # port: 3307 + # user: user1 + # password: password1 # - endpoint: mysql2.dns.local # name: mysql2 + # user: user2 + # password: password2 # Enable shared credentials for all targets sharedSecret: enabled: false From fe80f0044af2b40c5b58da782980ebc112d805ef Mon Sep 17 00:00:00 2001 From: zeritti <47476160+zeritti@users.noreply.github.com> Date: Thu, 25 Apr 2024 18:41:56 +0200 Subject: [PATCH 14/26] [prometheus] Add CI test cases (#4477) * [prometheus] Add CI values files Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com> * Use helper template setting labels in clusterrole Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com> --------- Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com> Co-authored-by: MH --- charts/prometheus/Chart.yaml | 2 +- .../ci/01-automount-sa-token-values.yaml | 5 + .../02-config-reloader-deployment-values.yaml | 25 ++++ .../ci/03-config-reloader-sts-values.yaml | 25 ++++ .../ci/04-extra-manifest-values.yaml | 22 ++++ .../ci/05-server-deployment-values.yaml | 43 +++++++ .../prometheus/ci/06-server-sts-values.yaml | 44 +++++++ .../prometheus/ci/07-meta-labels-values.yaml | 5 + .../08-sts-pvc-retention-policy-values.yaml | 13 ++ .../ci/09-standalone-deployment-values.yaml | 18 +++ .../ci/10-namespaced-sd-values.yaml | 114 ++++++++++++++++++ charts/prometheus/ci/11-default-values.yaml | 1 + 12 files changed, 316 insertions(+), 1 deletion(-) create mode 100644 charts/prometheus/ci/01-automount-sa-token-values.yaml create mode 100644 charts/prometheus/ci/02-config-reloader-deployment-values.yaml create mode 100644 charts/prometheus/ci/03-config-reloader-sts-values.yaml create mode 100644 charts/prometheus/ci/04-extra-manifest-values.yaml create mode 100644 charts/prometheus/ci/05-server-deployment-values.yaml create mode 100644 charts/prometheus/ci/06-server-sts-values.yaml create mode 100644 charts/prometheus/ci/07-meta-labels-values.yaml create mode 100644 charts/prometheus/ci/08-sts-pvc-retention-policy-values.yaml create mode 100644 charts/prometheus/ci/09-standalone-deployment-values.yaml create mode 100644 charts/prometheus/ci/10-namespaced-sd-values.yaml create mode 100644 charts/prometheus/ci/11-default-values.yaml diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml index b0777c17cf04..ea0852819951 100644 --- a/charts/prometheus/Chart.yaml +++ b/charts/prometheus/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: prometheus appVersion: v2.51.2 -version: 25.20.0 +version: 25.20.1 kubeVersion: ">=1.19.0-0" description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ diff --git a/charts/prometheus/ci/01-automount-sa-token-values.yaml b/charts/prometheus/ci/01-automount-sa-token-values.yaml new file mode 100644 index 000000000000..52add690c405 --- /dev/null +++ b/charts/prometheus/ci/01-automount-sa-token-values.yaml @@ -0,0 +1,5 @@ +--- +## Test case: automount SA token +serviceAccounts: + server: + automountServiceAccountToken: true diff --git a/charts/prometheus/ci/02-config-reloader-deployment-values.yaml b/charts/prometheus/ci/02-config-reloader-deployment-values.yaml new file mode 100644 index 000000000000..0db060aa308c --- /dev/null +++ b/charts/prometheus/ci/02-config-reloader-deployment-values.yaml @@ -0,0 +1,25 @@ +--- +## Test case: test config-reloader in deployment +configmapReload: + env: + - name: APPNAME + value: "prometheus-config-reloader" + + prometheus: + containerSecurityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + runAsNonRoot: true + readOnlyRootFilesystem: true + seccompProfile: + type: RuntimeDefault + + extraArgs: + log-level: debug + watch-interval: 1m + +server: + statefulSet: + enabled: false diff --git a/charts/prometheus/ci/03-config-reloader-sts-values.yaml b/charts/prometheus/ci/03-config-reloader-sts-values.yaml new file mode 100644 index 000000000000..f8510efc1138 --- /dev/null +++ b/charts/prometheus/ci/03-config-reloader-sts-values.yaml @@ -0,0 +1,25 @@ +--- +## Test case: test config-reloader in statefulset +configmapReload: + env: + - name: APPNAME + value: "prometheus-config-reloader" + + prometheus: + containerSecurityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + runAsNonRoot: true + readOnlyRootFilesystem: true + seccompProfile: + type: RuntimeDefault + + extraArgs: + log-level: debug + watch-interval: 1m + +server: + statefulSet: + enabled: true diff --git a/charts/prometheus/ci/04-extra-manifest-values.yaml b/charts/prometheus/ci/04-extra-manifest-values.yaml new file mode 100644 index 000000000000..3fb0f5a643df --- /dev/null +++ b/charts/prometheus/ci/04-extra-manifest-values.yaml @@ -0,0 +1,22 @@ +--- +## Test case: set extra manifests to deploy +extraManifests: + - | + apiVersion: v1 + kind: ConfigMap + metadata: + labels: + ci: "true" + name: prometheus-extra-cm-first + data: + GREETING: "hello" + - | + apiVersion: v1 + kind: ConfigMap + metadata: + labels: + ci: "true" + name: prometheus-extra-cm-second + data: + prometheus.txt: "{{ include "prometheus.server.fullname" . }}" + immutable: true diff --git a/charts/prometheus/ci/05-server-deployment-values.yaml b/charts/prometheus/ci/05-server-deployment-values.yaml new file mode 100644 index 000000000000..caf849ce4139 --- /dev/null +++ b/charts/prometheus/ci/05-server-deployment-values.yaml @@ -0,0 +1,43 @@ +--- +## Test case: set various fields in deployment +server: + automountServiceAccountToken: true + + clusterRoleNameOverride: "ci-prometheus-server-cluster-role" + + containerSecurityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + + env: + - name: APPNAME + value: prometheus + + extraArgs: + query.timeout: 1m + query.max-concurrency: 15 + + global: + external_labels: + cluster: "ci" + + persistentVolume: + enabled: true + size: 2Gi + + prefixURL: /prometheus + + retentionSize: 1GB + + startupProbe: + enabled: true + + statefulSet: + enabled: false + + tsdb: + out_of_order_time_window: 10s diff --git a/charts/prometheus/ci/06-server-sts-values.yaml b/charts/prometheus/ci/06-server-sts-values.yaml new file mode 100644 index 000000000000..97839953b145 --- /dev/null +++ b/charts/prometheus/ci/06-server-sts-values.yaml @@ -0,0 +1,44 @@ +--- +# Test case: set various fields in statefulset +server: + automountServiceAccountToken: true + + clusterRoleNameOverride: "ci-prometheus-server-cluster-role" + + containerSecurityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + + env: + - name: APPNAME + value: prometheus + + extraArgs: + query.timeout: 1m + query.max-concurrency: 15 + + global: + external_labels: + cluster: "ci" + + persistentVolume: + enabled: true + statefulSetNameOverride: "ci-prometheus-server-pvc" + size: 2Gi + + prefixURL: /prometheus + + retentionSize: 1GB + + startupProbe: + enabled: true + + statefulSet: + enabled: true + + tsdb: + out_of_order_time_window: 10s diff --git a/charts/prometheus/ci/07-meta-labels-values.yaml b/charts/prometheus/ci/07-meta-labels-values.yaml new file mode 100644 index 000000000000..bc4e872e6dc8 --- /dev/null +++ b/charts/prometheus/ci/07-meta-labels-values.yaml @@ -0,0 +1,5 @@ +--- +# Test case: set meta labels +commonMetaLabels: + ci: "true" + env: "ci" diff --git a/charts/prometheus/ci/08-sts-pvc-retention-policy-values.yaml b/charts/prometheus/ci/08-sts-pvc-retention-policy-values.yaml new file mode 100644 index 000000000000..da65ab77e239 --- /dev/null +++ b/charts/prometheus/ci/08-sts-pvc-retention-policy-values.yaml @@ -0,0 +1,13 @@ +--- +## Test case: set PVC retention policy in statefulset +server: + automountServiceAccountToken: true + + statefulSet: + enabled: true + pvcDeleteOnStsDelete: true + pvcDeleteOnStsScale: true + + persistentVolume: + enabled: true + size: 2Gi diff --git a/charts/prometheus/ci/09-standalone-deployment-values.yaml b/charts/prometheus/ci/09-standalone-deployment-values.yaml new file mode 100644 index 000000000000..cbee5d9e1e14 --- /dev/null +++ b/charts/prometheus/ci/09-standalone-deployment-values.yaml @@ -0,0 +1,18 @@ +--- +## Test case: run standalone Prometheus deployment +alertmanager: + enabled: false + +kube-state-metrics: + enabled: false + +prometheus-node-exporter: + enabled: false + +prometheus-pushgateway: + enabled: false + +server: + automountServiceAccountToken: true + persistentVolume: + enabled: false diff --git a/charts/prometheus/ci/10-namespaced-sd-values.yaml b/charts/prometheus/ci/10-namespaced-sd-values.yaml new file mode 100644 index 000000000000..b62b48b82326 --- /dev/null +++ b/charts/prometheus/ci/10-namespaced-sd-values.yaml @@ -0,0 +1,114 @@ +--- +## Test case: Prometheus with namespaced SD +## Prometheus runs service discovery (SD) in its own namespace only. +## A custom cluster role is set up and bound to SA through a role binding +## in the given namespace. Prometheus *must* be told that its SD +## is namespaced by means of 'scrape_configs.kubernetes_sd_configs.namespaces'. +server: + automountServiceAccountToken: true + namespaces: [] + releaseNamespace: true + useExistingClusterRoleName: "prometheus-cluster-role" + + persistentVolume: + enabled: false + +alertmanager: + enabled: false + +kube-state-metrics: + enabled: true + +prometheus-node-exporter: + enabled: false + +prometheus-pushgateway: + enabled: false + +serverFiles: + prometheus.yml: + scrape_configs: + - job_name: "prometheus" + static_configs: + - targets: + - localhost:9090 + - job_name: "kubernetes-service-endpoints" + honor_labels: true + kubernetes_sd_configs: + - role: endpoints + namespaces: + own_namespace: true + relabel_configs: + - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape] + action: keep + regex: true + - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme] + action: replace + target_label: __scheme__ + regex: (https?) + - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_path] + action: replace + target_label: __metrics_path__ + regex: (.+) + - source_labels: + - __address__ + - __meta_kubernetes_service_annotation_prometheus_io_port + action: replace + target_label: __address__ + regex: (.+?)(?::\d+)?;(\d+) + replacement: $1:$2 + - action: labelmap + regex: __meta_kubernetes_service_label_(.+) + - source_labels: [__meta_kubernetes_namespace] + action: replace + target_label: namespace + - source_labels: [__meta_kubernetes_service_name] + action: replace + target_label: service + - source_labels: [__meta_kubernetes_pod_node_name] + action: replace + target_label: node + +extraManifests: + - | + apiVersion: rbac.authorization.k8s.io/v1 + kind: ClusterRole + metadata: + labels: + {{- include "prometheus.server.labels" . | nindent 4 }} + name: prometheus-cluster-role + rules: + - apiGroups: + - "" + resources: + - services + - endpoints + - pods + - ingresses + - configmaps + verbs: + - get + - list + - watch + - apiGroups: + - "extensions" + - "networking.k8s.io" + resources: + - ingresses/status + - ingresses + verbs: + - get + - list + - watch + - apiGroups: + - "discovery.k8s.io" + resources: + - endpointslices + verbs: + - get + - list + - watch + - nonResourceURLs: + - "/metrics" + verbs: + - get diff --git a/charts/prometheus/ci/11-default-values.yaml b/charts/prometheus/ci/11-default-values.yaml new file mode 100644 index 000000000000..ba5a5c1e2597 --- /dev/null +++ b/charts/prometheus/ci/11-default-values.yaml @@ -0,0 +1 @@ +## Test case: use chart's default values From 2a448c6883ddb2b12b57b68205c225f0b06a04d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= Date: Thu, 25 Apr 2024 21:54:10 +0200 Subject: [PATCH 15/26] [prometheus-systemd-exporter]: add missing dbus volume, fix systemd volume mount point, remove unused proc volume (#4457) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédric de Saint Martin --- charts/prometheus-systemd-exporter/Chart.yaml | 2 +- .../templates/daemonset.yaml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/prometheus-systemd-exporter/Chart.yaml b/charts/prometheus-systemd-exporter/Chart.yaml index b3d6a18fc84f..568869f2d42d 100644 --- a/charts/prometheus-systemd-exporter/Chart.yaml +++ b/charts/prometheus-systemd-exporter/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: prometheus-systemd-exporter description: A Helm chart for prometheus systemd-exporter type: application -version: 0.2.1 +version: 0.2.2 appVersion: "0.6.0" home: https://github.com/prometheus-community/systemd_exporter sources: diff --git a/charts/prometheus-systemd-exporter/templates/daemonset.yaml b/charts/prometheus-systemd-exporter/templates/daemonset.yaml index 8d0bd1eb94bc..56a7e4ec8cad 100644 --- a/charts/prometheus-systemd-exporter/templates/daemonset.yaml +++ b/charts/prometheus-systemd-exporter/templates/daemonset.yaml @@ -75,11 +75,11 @@ spec: {{- toYaml . | nindent 12 }} {{- end }} volumeMounts: - - name: proc - mountPath: /host/proc - readOnly: true - name: systemd - mountPath: /host/systemd + mountPath: /run/systemd + readOnly: true + - name: dbus + mountPath: /var/run/dbus readOnly: true {{- with .Values.extraVolumeMounts }} {{- toYaml . | nindent 12 }} @@ -99,12 +99,12 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} volumes: - - name: proc - hostPath: - path: /proc - name: systemd hostPath: path: /run/systemd + - name: dbus + hostPath: + path: /var/run/dbus {{- with .Values.extraVolumes }} {{- toYaml . | nindent 8 }} {{- end }} From 9c41858ac9714483638d78fb560577dc37e55875 Mon Sep 17 00:00:00 2001 From: ngc4579 Date: Fri, 26 Apr 2024 09:32:55 +0200 Subject: [PATCH 16/26] [prometheus-snmp-exporter] Extend workload config (#4488) * [prometheus-snmp-exporter] Extend workload config - Introduce optional revisionHistoryLimit for Deployment / DaemonSet Signed-off-by: ngc4579 * Update charts/prometheus-snmp-exporter/Chart.yaml Signed-off-by: Tom Walker --------- Signed-off-by: ngc4579 Signed-off-by: Tom Walker Co-authored-by: Tom Walker --- charts/prometheus-snmp-exporter/Chart.yaml | 2 +- charts/prometheus-snmp-exporter/templates/daemonset.yaml | 3 +++ charts/prometheus-snmp-exporter/templates/deployment.yaml | 3 +++ charts/prometheus-snmp-exporter/values.yaml | 4 ++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/charts/prometheus-snmp-exporter/Chart.yaml b/charts/prometheus-snmp-exporter/Chart.yaml index bb7d304e4b59..9258438492a9 100644 --- a/charts/prometheus-snmp-exporter/Chart.yaml +++ b/charts/prometheus-snmp-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Prometheus SNMP Exporter name: prometheus-snmp-exporter -version: 5.1.1 +version: 5.2.0 appVersion: v0.25.0 home: https://github.com/prometheus/snmp_exporter sources: diff --git a/charts/prometheus-snmp-exporter/templates/daemonset.yaml b/charts/prometheus-snmp-exporter/templates/daemonset.yaml index 5de77083f48c..c2a2eca96330 100644 --- a/charts/prometheus-snmp-exporter/templates/daemonset.yaml +++ b/charts/prometheus-snmp-exporter/templates/daemonset.yaml @@ -122,4 +122,7 @@ spec: {{- with .Values.extraVolumes }} {{ toYaml . | nindent 8 }} {{- end }} + {{- with .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ . }} + {{- end }} {{- end }} diff --git a/charts/prometheus-snmp-exporter/templates/deployment.yaml b/charts/prometheus-snmp-exporter/templates/deployment.yaml index 42ad091ccc68..eb34b3efbeb0 100644 --- a/charts/prometheus-snmp-exporter/templates/deployment.yaml +++ b/charts/prometheus-snmp-exporter/templates/deployment.yaml @@ -129,4 +129,7 @@ spec: {{- with .Values.extraVolumes }} {{ toYaml . | nindent 8 }} {{- end }} + {{- with .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ . }} + {{- end }} {{- end }} diff --git a/charts/prometheus-snmp-exporter/values.yaml b/charts/prometheus-snmp-exporter/values.yaml index 82bb9a2b35cf..f1b244432b52 100644 --- a/charts/prometheus-snmp-exporter/values.yaml +++ b/charts/prometheus-snmp-exporter/values.yaml @@ -132,6 +132,10 @@ envFrom: [] # name: name-of-secret replicas: 1 + +# Uncomment to set a specific revisionHistoryLimit. Defaults to 10 as per Kubernetes API if not set. +# revisionHistoryLimit: 3 + ## Monitors ConfigMap changes and POSTs to a URL ## Ref: https://github.com/jimmidyson/configmap-reload ## From f93d563f8be4bd011cba02d9d74ffce1a6886191 Mon Sep 17 00:00:00 2001 From: ngc4579 Date: Sun, 28 Apr 2024 08:31:48 +0200 Subject: [PATCH 17/26] [prometheus-snmp-exporter] Extend metric relabels (#4490) * [prometheus-snmp-exporter] Extend metric relabels - In addition to fixed '$key: $value' metric relabelings, allow arbitrary relabel configs in order to support e.g. common label prefixes Signed-off-by: ngc4579 * Update charts/prometheus-snmp-exporter/values.yaml Apply suggested changes Co-authored-by: Tom Walker Signed-off-by: ngc4579 * Update charts/prometheus-snmp-exporter/values.yaml Apply suggested changes Co-authored-by: Tom Walker Signed-off-by: ngc4579 --------- Signed-off-by: ngc4579 Co-authored-by: Tom Walker --- charts/prometheus-snmp-exporter/Chart.yaml | 2 +- .../templates/servicemonitor.yaml | 3 +++ charts/prometheus-snmp-exporter/values.yaml | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/charts/prometheus-snmp-exporter/Chart.yaml b/charts/prometheus-snmp-exporter/Chart.yaml index 9258438492a9..6c351c5a878c 100644 --- a/charts/prometheus-snmp-exporter/Chart.yaml +++ b/charts/prometheus-snmp-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Prometheus SNMP Exporter name: prometheus-snmp-exporter -version: 5.2.0 +version: 5.3.0 appVersion: v0.25.0 home: https://github.com/prometheus/snmp_exporter sources: diff --git a/charts/prometheus-snmp-exporter/templates/servicemonitor.yaml b/charts/prometheus-snmp-exporter/templates/servicemonitor.yaml index 9ac3218e5fc4..7731368b1428 100644 --- a/charts/prometheus-snmp-exporter/templates/servicemonitor.yaml +++ b/charts/prometheus-snmp-exporter/templates/servicemonitor.yaml @@ -39,6 +39,9 @@ spec: replacement: {{ $replacement }} action: replace {{- end }} + {{- if (or .additionalMetricsRelabelConfigs $.Values.serviceMonitor.additionalMetricsRelabelConfigs) }} + {{- toYaml (default $.Values.serviceMonitor.additionalMetricsRelabelConfigs .additionalMetricsRelabelConfigs) | nindent 6 }} + {{- end }} {{- if (or .relabelings $.Values.serviceMonitor.relabelings) }} relabelings: {{- toYaml (default $.Values.serviceMonitor.relabelings .relabelings) | nindent 6 }} diff --git a/charts/prometheus-snmp-exporter/values.yaml b/charts/prometheus-snmp-exporter/values.yaml index f1b244432b52..a15074b44cb6 100644 --- a/charts/prometheus-snmp-exporter/values.yaml +++ b/charts/prometheus-snmp-exporter/values.yaml @@ -185,7 +185,21 @@ serviceMonitor: # Metric relabeling is applied to samples as the last step before ingestion. # Set if defined unless overriden by params.additionalMetricsRelabels. + # This sets fixed relabel configs with action 'replace'. additionalMetricsRelabels: {} + # targetLabel1: replacementValue1 + # targetLabel2: replacementValue2 + + # Metric relabeling is applied to samples as the last step before ingestion. + # Set if defined unless overridden by params.additionalMetricsRelabelConfigs. + # This allows setting arbitrary relabel configs. + # https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.RelabelConfig + additionalMetricsRelabelConfigs: [] + # - sourceLabels: [__name__] + # targetLabel: __name__ + # action: replace + # regex: (.*) + # replacement: prefix_$1 # Label for selecting service monitors as set in Prometheus CRD. # https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.PrometheusSpec @@ -214,7 +228,10 @@ serviceMonitor: # Relabelings. Overrides value set in serviceMonitor.relabelings # relabelings: [] # Map of metric labels and values to add. Overrides value set in serviceMonitor.additionalMetricsRelabels + # This sets fixed relabel configs with action 'replace'. # additionalMetricsRelabels: {} + # Metrics relabelings. Overrides value set in serviceMonitor.additionalMetricsRelabelConfigs + # additionalMetricsRelabelConfigs: [] # Extra manifests to deploy as an array extraManifests: [] From fd69f6376a47846cdfc7a9c96b144267976bce00 Mon Sep 17 00:00:00 2001 From: ghms28 Date: Sun, 28 Apr 2024 21:22:42 +0330 Subject: [PATCH 18/26] fix/prometheus-mysql-exporter:rm-default-metric-endpoint-on-multi-target (#4495) Signed-off-by: Mohammad Baghertabar --- charts/prometheus-mysql-exporter/Chart.yaml | 2 +- charts/prometheus-mysql-exporter/templates/servicemonitor.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/prometheus-mysql-exporter/Chart.yaml b/charts/prometheus-mysql-exporter/Chart.yaml index 91e94e40d9dc..c706deb4f736 100644 --- a/charts/prometheus-mysql-exporter/Chart.yaml +++ b/charts/prometheus-mysql-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for prometheus mysql exporter with cloudsqlproxy name: prometheus-mysql-exporter -version: 2.5.2 +version: 2.5.3 home: https://github.com/prometheus/mysqld_exporter appVersion: v0.15.1 sources: diff --git a/charts/prometheus-mysql-exporter/templates/servicemonitor.yaml b/charts/prometheus-mysql-exporter/templates/servicemonitor.yaml index 59108d9d3209..c8ff5a7405a7 100644 --- a/charts/prometheus-mysql-exporter/templates/servicemonitor.yaml +++ b/charts/prometheus-mysql-exporter/templates/servicemonitor.yaml @@ -73,6 +73,7 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if not .Values.serviceMonitor.multipleTarget.enabled }} - path: /metrics port: {{ .Values.service.name }} {{- if .Values.serviceMonitor.interval }} @@ -87,4 +88,5 @@ spec: {{- if .Values.serviceMonitor.relabelings }} relabelings: {{ toYaml .Values.serviceMonitor.relabelings | nindent 8 }} {{- end }} + {{- end }} {{- end }} From 8d3761c026308a9b32e95a6e9723b25db74864e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 10:54:51 +0200 Subject: [PATCH 19/26] Bump helm/kind-action from 1.9.0 to 1.10.0 (#4496) Bumps [helm/kind-action](https://github.com/helm/kind-action) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/helm/kind-action/releases) - [Commits](https://github.com/helm/kind-action/compare/v1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: helm/kind-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/lint-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index f936c5a47eb1..537405b2e33f 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -41,7 +41,7 @@ jobs: run: ct lint --config .github/linters/ct.yaml - name: Create kind cluster - uses: helm/kind-action@v1.9.0 + uses: helm/kind-action@v1.10.0 if: steps.list-changed.outputs.changed == 'true' - name: Run chart-testing (install) From a93b6d72c1f76240b76b6a6a0536713fca1622d6 Mon Sep 17 00:00:00 2001 From: Jeroen van Erp Date: Mon, 29 Apr 2024 22:25:26 +0200 Subject: [PATCH 20/26] [prometheus-elasticsearch-exporter] Allow to override imageRegistry globally (#4497) * [prometheus-elasticsearch-exporter] Allow to override imageRegistry globally Signed-off-by: Jeroen van Erp * Incorporate review comments Signed-off-by: Jeroen van Erp --------- Signed-off-by: Jeroen van Erp --- .../prometheus-elasticsearch-exporter/Chart.yaml | 2 +- .../templates/_helpers.tpl | 15 +++++++++++++++ .../templates/deployment.yaml | 2 +- .../prometheus-elasticsearch-exporter/values.yaml | 2 ++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/charts/prometheus-elasticsearch-exporter/Chart.yaml b/charts/prometheus-elasticsearch-exporter/Chart.yaml index d8a4ba31d04c..186fdd65635a 100644 --- a/charts/prometheus-elasticsearch-exporter/Chart.yaml +++ b/charts/prometheus-elasticsearch-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Elasticsearch stats exporter for Prometheus name: prometheus-elasticsearch-exporter -version: 5.7.0 +version: 5.8.0 kubeVersion: ">=1.10.0-0" appVersion: "v1.7.0" home: https://github.com/prometheus-community/elasticsearch_exporter diff --git a/charts/prometheus-elasticsearch-exporter/templates/_helpers.tpl b/charts/prometheus-elasticsearch-exporter/templates/_helpers.tpl index 8a6e84852a71..68983e0dfb01 100644 --- a/charts/prometheus-elasticsearch-exporter/templates/_helpers.tpl +++ b/charts/prometheus-elasticsearch-exporter/templates/_helpers.tpl @@ -83,3 +83,18 @@ imagePullSecrets: {{- end }} {{- end }} {{- end -}} + +{{/* +Return the correct (overridden global) image registry. +*/}} +{{- define "elasticsearch-exporter.image.repository" -}} + {{- $registry := .Values.image.registry -}} + {{- if .Values.global.imageRegistry }} + {{- $registry = .Values.global.imageRegistry -}} + {{- end }} + {{- if $registry -}} + {{- printf "%s/%s" $registry .Values.image.repository -}} + {{- else -}} + {{- printf "%s" .Values.image.repository -}} + {{- end }} +{{- end -}} diff --git a/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml b/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml index 589176ef624e..7ffb349c07ca 100644 --- a/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml +++ b/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml @@ -75,7 +75,7 @@ spec: - secretRef: name: {{ .Values.envFromSecret }} {{- end }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + image: "{{- include "elasticsearch-exporter.image.repository" . }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} command: ["elasticsearch_exporter", {{- with .Values.log.format }} diff --git a/charts/prometheus-elasticsearch-exporter/values.yaml b/charts/prometheus-elasticsearch-exporter/values.yaml index dcf5d4d19f0e..acd4a0548fea 100644 --- a/charts/prometheus-elasticsearch-exporter/values.yaml +++ b/charts/prometheus-elasticsearch-exporter/values.yaml @@ -3,6 +3,7 @@ ## to set the same values for each chart (and image) separately global: imagePullSecrets: [] + imageRegistry: "" ## number of exporter instances ## @@ -13,6 +14,7 @@ replicaCount: 1 restartPolicy: Always image: + registry: "" repository: quay.io/prometheuscommunity/elasticsearch-exporter # if not set appVersion field from Chart.yaml is used tag: "" From 1a349ccae7ed942209e53315dc0d75cf60ad17cb Mon Sep 17 00:00:00 2001 From: Zero King Date: Tue, 30 Apr 2024 22:52:00 +0800 Subject: [PATCH 21/26] [prometheus-node-exporter] bump to 1.8.0 (#4499) Signed-off-by: Zero King --- charts/prometheus-node-exporter/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/prometheus-node-exporter/Chart.yaml b/charts/prometheus-node-exporter/Chart.yaml index fb82cbf659b1..282c9e5087fc 100644 --- a/charts/prometheus-node-exporter/Chart.yaml +++ b/charts/prometheus-node-exporter/Chart.yaml @@ -6,8 +6,8 @@ keywords: - prometheus - exporter type: application -version: 4.32.0 -appVersion: 1.7.0 +version: 4.33.0 +appVersion: 1.8.0 home: https://github.com/prometheus/node_exporter/ sources: - https://github.com/prometheus/node_exporter/ From 6e2da58d492f5e6fdaa19f5d0f158f604da5cc94 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Tue, 30 Apr 2024 20:46:18 +0300 Subject: [PATCH 22/26] [kube-prometheus-stack ] bump deps (#4501) --- charts/kube-prometheus-stack/Chart.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 7051d72344c0..5bc657c689fe 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -23,7 +23,7 @@ name: kube-prometheus-stack sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus -version: 58.2.2 +version: 58.3.0 appVersion: v0.73.2 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus @@ -45,11 +45,11 @@ dependencies: version: "0.0.0" condition: crds.enabled - name: kube-state-metrics - version: "5.18.*" + version: "5.19.*" repository: https://prometheus-community.github.io/helm-charts condition: kubeStateMetrics.enabled - name: prometheus-node-exporter - version: "4.32.*" + version: "4.33.*" repository: https://prometheus-community.github.io/helm-charts condition: nodeExporter.enabled - name: grafana From d23700cbbda8068a2a3c7b32030a1ff70a3299ae Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Wed, 1 May 2024 09:45:41 +0300 Subject: [PATCH 23/26] [kube-prometheus-stack] remove job ttl api check (#4503) --- charts/kube-prometheus-stack/Chart.yaml | 2 +- .../admission-webhooks/job-patch/job-createSecret.yaml | 5 +---- .../admission-webhooks/job-patch/job-patchWebhook.yaml | 5 +---- charts/kube-prometheus-stack/values.yaml | 1 + 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 5bc657c689fe..7dce1a4f2069 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -23,7 +23,7 @@ name: kube-prometheus-stack sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus -version: 58.3.0 +version: 58.3.1 appVersion: v0.73.2 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml index 96e4f9285355..6440d3cb37c5 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml @@ -14,10 +14,7 @@ metadata: app: {{ template "kube-prometheus-stack.name" $ }}-admission-create {{- include "kube-prometheus-stack.prometheus-operator-webhook.labels" $ | nindent 4 }} spec: - {{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }} - # Alpha feature since k8s 1.12 - ttlSecondsAfterFinished: 0 - {{- end }} + ttlSecondsAfterFinished: {{ .Values.prometheusOperator.admissionWebhooks.patch.ttlSecondsAfterFinished }} template: metadata: name: {{ template "kube-prometheus-stack.fullname" . }}-admission-create diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml index b53a6ded348c..92eeae39a107 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml @@ -14,10 +14,7 @@ metadata: app: {{ template "kube-prometheus-stack.name" $ }}-admission-patch {{- include "kube-prometheus-stack.prometheus-operator-webhook.labels" $ | nindent 4 }} spec: - {{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }} - # Alpha feature since k8s 1.12 - ttlSecondsAfterFinished: 0 - {{- end }} + ttlSecondsAfterFinished: {{ .Values.prometheusOperator.admissionWebhooks.patch.ttlSecondsAfterFinished }} template: metadata: name: {{ template "kube-prometheus-stack.fullname" . }}-admission-patch diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml index 662af291f7bb..a05849522774 100644 --- a/charts/kube-prometheus-stack/values.yaml +++ b/charts/kube-prometheus-stack/values.yaml @@ -2453,6 +2453,7 @@ prometheusOperator: ## Provide a priority class name to the webhook patching job ## priorityClassName: "" + ttlSecondsAfterFinished: 0 annotations: {} # argocd.argoproj.io/hook: PreSync # argocd.argoproj.io/hook-delete-policy: HookSucceeded From 6c20acc30956bffbe74d71602cc121bde9202c7f Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Thu, 2 May 2024 21:35:09 +0300 Subject: [PATCH 24/26] [kube-prometheus-stack] align pdb to single check (#4502) --- charts/kube-prometheus-stack/Chart.yaml | 2 +- .../prometheus-operator/admission-webhooks/deployment/pdb.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 7dce1a4f2069..8846a39085ec 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -23,7 +23,7 @@ name: kube-prometheus-stack sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus -version: 58.3.1 +version: 58.3.2 appVersion: v0.73.2 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/pdb.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/pdb.yaml index 52dd78f624af..04458b967583 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/pdb.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/pdb.yaml @@ -1,5 +1,5 @@ {{- if .Values.prometheusOperator.admissionWebhooks.deployment.podDisruptionBudget -}} -apiVersion: policy/v1{{ ternary "" "beta1" ($.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget") }} +apiVersion: {{ include "kube-prometheus-stack.pdb.apiVersion" . }} kind: PodDisruptionBudget metadata: name: {{ template "kube-prometheus-stack.operator.fullname" . }}-webhook From 413b4c483e85fa6452d29186463bfe117162402b Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Thu, 2 May 2024 22:32:07 +0300 Subject: [PATCH 25/26] [kube-prometheus-stack] set ttlSecondsAfterFinished relevant for argocd (#4510) --- charts/kube-prometheus-stack/Chart.yaml | 2 +- charts/kube-prometheus-stack/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 8846a39085ec..c7b7e33771ef 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -23,7 +23,7 @@ name: kube-prometheus-stack sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus -version: 58.3.2 +version: 58.3.3 appVersion: v0.73.2 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml index a05849522774..e651bc723f5f 100644 --- a/charts/kube-prometheus-stack/values.yaml +++ b/charts/kube-prometheus-stack/values.yaml @@ -2453,7 +2453,7 @@ prometheusOperator: ## Provide a priority class name to the webhook patching job ## priorityClassName: "" - ttlSecondsAfterFinished: 0 + ttlSecondsAfterFinished: 60 annotations: {} # argocd.argoproj.io/hook: PreSync # argocd.argoproj.io/hook-delete-policy: HookSucceeded From 21021a2799659dbb892c29ab661ad8cbb7bb2a1b Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Sun, 5 May 2024 12:54:42 +0300 Subject: [PATCH 26/26] bump thanos to 0.35.0 (#4516) Signed-off-by: drfaust92 --- charts/kube-prometheus-stack/Chart.yaml | 2 +- charts/kube-prometheus-stack/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index c7b7e33771ef..b4d06070c067 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -23,7 +23,7 @@ name: kube-prometheus-stack sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus -version: 58.3.3 +version: 58.4.0 appVersion: v0.73.2 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml index e651bc723f5f..26d930e6a616 100644 --- a/charts/kube-prometheus-stack/values.yaml +++ b/charts/kube-prometheus-stack/values.yaml @@ -2846,7 +2846,7 @@ prometheusOperator: thanosImage: registry: quay.io repository: thanos/thanos - tag: v0.34.1 + tag: v0.35.0 sha: "" ## Set a Label Selector to filter watched prometheus and prometheusAgent @@ -4399,7 +4399,7 @@ thanosRuler: image: registry: quay.io repository: thanos/thanos - tag: v0.34.1 + tag: v0.35.0 sha: "" ## Namespaces to be selected for PrometheusRules discovery.