diff --git a/charts/alertmanager/Chart.yaml b/charts/alertmanager/Chart.yaml index 4b0884111b8d..842cae8d7d01 100644 --- a/charts/alertmanager/Chart.yaml +++ b/charts/alertmanager/Chart.yaml @@ -6,7 +6,7 @@ icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/a sources: - https://github.com/prometheus/alertmanager type: application -version: 1.7.0 +version: 1.8.0 appVersion: v0.26.0 kubeVersion: ">=1.19.0-0" keywords: diff --git a/charts/alertmanager/templates/statefulset.yaml b/charts/alertmanager/templates/statefulset.yaml index 25d81a921345..807fd683988e 100644 --- a/charts/alertmanager/templates/statefulset.yaml +++ b/charts/alertmanager/templates/statefulset.yaml @@ -12,6 +12,7 @@ metadata: namespace: {{ include "alertmanager.namespace" . }} spec: replicas: {{ .Values.replicaCount }} + minReadySeconds: {{ .Values.minReadySeconds }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} selector: matchLabels: diff --git a/charts/alertmanager/values.yaml b/charts/alertmanager/values.yaml index fa3b355a5114..532ab9f6086d 100644 --- a/charts/alertmanager/values.yaml +++ b/charts/alertmanager/values.yaml @@ -235,6 +235,13 @@ topologySpreadConstraints: [] statefulSet: annotations: {} +## Minimum number of seconds for which a newly created pod should be ready without any of its container crashing for it to +## be considered available. Defaults to 0 (pod will be considered available as soon as it is ready). +## This is an alpha field from kubernetes 1.22 until 1.24 which requires enabling the StatefulSetMinReadySeconds +## feature gate. +## Ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#minimum-ready-seconds +minReadySeconds: 0 + podAnnotations: {} podLabels: {} diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index d798c8e65d11..137802290b7d 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: 56.6.0 +version: 56.6.2 appVersion: v0.71.2 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/templates/_helpers.tpl b/charts/kube-prometheus-stack/templates/_helpers.tpl index fb5bac34e1c4..aa0ed4c73623 100644 --- a/charts/kube-prometheus-stack/templates/_helpers.tpl +++ b/charts/kube-prometheus-stack/templates/_helpers.tpl @@ -24,10 +24,15 @@ The longest name that gets created adds and extra 37 characters, so truncation s {{- end -}} {{- end -}} -{{/* Fullname suffixed with operator */}} +{{/* Fullname suffixed with -operator */}} +{{/* Adding 9 to 26 truncation of kube-prometheus-stack.fullname */}} {{- define "kube-prometheus-stack.operator.fullname" -}} +{{- if .Values.prometheusOperator.fullnameOverride -}} +{{- .Values.prometheusOperator.fullnameOverride | trunc 35 | trimSuffix "-" -}} +{{- else -}} {{- printf "%s-operator" (include "kube-prometheus-stack.fullname" .) -}} {{- end }} +{{- end }} {{/* Prometheus custom resource instance name */}} {{- define "kube-prometheus-stack.prometheus.crname" -}} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/deployment.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/deployment.yaml index 350810daef6c..7ce357bb9440 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/deployment.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator-webhook + name: {{ template "kube-prometheus-stack.operator.fullname" . }}-webhook namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: app: {{ template "kube-prometheus-stack.name" . }}-operator-webhook 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 48459ad55a54..52dd78f624af 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 @@ -2,7 +2,7 @@ apiVersion: policy/v1{{ ternary "" "beta1" ($.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget") }} kind: PodDisruptionBudget metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator-webhook + name: {{ template "kube-prometheus-stack.operator.fullname" . }}-webhook namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator-webhook.labels" . | nindent 4 }} 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 18f96efe3c4c..b06c129123b0 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 @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator-webhook + name: {{ template "kube-prometheus-stack.operator.fullname" . }}-webhook namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: app: {{ template "kube-prometheus-stack.name" . }}-operator-webhook diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/ciliumnetworkpolicy.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/ciliumnetworkpolicy.yaml index 018c4e3c9c99..07e2e9996776 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/ciliumnetworkpolicy.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/ciliumnetworkpolicy.yaml @@ -2,7 +2,7 @@ apiVersion: cilium.io/v2 kind: CiliumNetworkPolicy metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrole.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrole.yaml index ee9f44ea1271..fd11b69eed4c 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrole.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrole.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} rules: diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrolebinding.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrolebinding.yaml index 93b5a1d16f91..ad9e3ef6c537 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrolebinding.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrolebinding.yaml @@ -2,13 +2,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} subjects: - kind: ServiceAccount name: {{ template "kube-prometheus-stack.operator.serviceAccountName" . }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml index 1d19d2ce7f96..5889bd234665 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml @@ -4,7 +4,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/networkpolicy.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/networkpolicy.yaml index 1953cf2fe374..cfd5b0b8c753 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/networkpolicy.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/networkpolicy.yaml @@ -2,7 +2,7 @@ apiVersion: {{ template "kube-prometheus-stack.prometheus.networkPolicy.apiVersion" . }} kind: NetworkPolicy metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrole.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrole.yaml index 31d2ff164c0e..97662389681b 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrole.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrole.yaml @@ -3,7 +3,7 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator-psp + name: {{ template "kube-prometheus-stack.operator.fullname" . }}-psp labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} rules: @@ -16,6 +16,6 @@ rules: resources: ['podsecuritypolicies'] verbs: ['use'] resourceNames: - - {{ template "kube-prometheus-stack.fullname" . }}-operator + - {{ template "kube-prometheus-stack.operator.fullname" . }} {{- end }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrolebinding.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrolebinding.yaml index aa33292511fb..01f5f3d9dd87 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrolebinding.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrolebinding.yaml @@ -3,13 +3,13 @@ kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator-psp + name: {{ template "kube-prometheus-stack.operator.fullname" . }}-psp labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "kube-prometheus-stack.fullname" . }}-operator-psp + name: {{ template "kube-prometheus-stack.operator.fullname" . }}-psp subjects: - kind: ServiceAccount name: {{ template "kube-prometheus-stack.operator.serviceAccountName" . }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/psp.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/psp.yaml index beb4fe1e3d57..0943b5f56361 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/psp.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/psp.yaml @@ -3,7 +3,7 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} {{- if .Values.global.rbac.pspAnnotations }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/service.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/service.yaml index f424c4be99bf..d45ab22d0861 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/service.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/servicemonitor.yaml index ee6e3a4c5737..d5ad94a185dd 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/servicemonitor.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/servicemonitor.yaml @@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/verticalpodautoscaler.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/verticalpodautoscaler.yaml index 2d9906300fb5..f225d16dde3a 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/verticalpodautoscaler.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/verticalpodautoscaler.yaml @@ -2,7 +2,7 @@ apiVersion: autoscaling.k8s.io/v1 kind: VerticalPodAutoscaler metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} @@ -32,7 +32,7 @@ spec: targetRef: apiVersion: apps/v1 kind: Deployment - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} {{- with .Values.prometheusOperator.verticalPodAutoscaler.updatePolicy }} updatePolicy: {{- toYaml . | nindent 4 }} diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml index 0502300c5fa7..529f5d048484 100644 --- a/charts/kube-prometheus-stack/values.yaml +++ b/charts/kube-prometheus-stack/values.yaml @@ -2073,6 +2073,9 @@ prometheus-node-exporter: prometheusOperator: enabled: true + ## Use '{{ template "kube-prometheus-stack.fullname" . }}-operator' by default + fullnameOverride: "" + ## Number of old replicasets to retain ## ## The default value is 10, 0 will garbage-collect old replicasets ## revisionHistoryLimit: 10 diff --git a/charts/prom-label-proxy/Chart.yaml b/charts/prom-label-proxy/Chart.yaml index 9210411bafc8..1356cb781a6e 100644 --- a/charts/prom-label-proxy/Chart.yaml +++ b/charts/prom-label-proxy/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: prom-label-proxy description: A proxy that enforces a given label in a given PromQL query. type: application -version: 0.7.0 -appVersion: "v0.8.0" +version: 0.7.1 +appVersion: "v0.8.1" home: "https://github.com/prometheus-community/prom-label-proxy" keywords: - metric diff --git a/charts/prometheus-nats-exporter/Chart.yaml b/charts/prometheus-nats-exporter/Chart.yaml index 48a677ad5a06..c794bd295fe4 100644 --- a/charts/prometheus-nats-exporter/Chart.yaml +++ b/charts/prometheus-nats-exporter/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 0.14.0 description: A Helm chart for prometheus-nats-exporter name: prometheus-nats-exporter -version: 2.15.0 +version: 2.16.0 home: https://github.com/nats-io/prometheus-nats-exporter sources: - https://github.com/nats-io/prometheus-nats-exporter diff --git a/charts/prometheus-nats-exporter/templates/deployment.yaml b/charts/prometheus-nats-exporter/templates/deployment.yaml index 45daa106df86..83822a53091c 100644 --- a/charts/prometheus-nats-exporter/templates/deployment.yaml +++ b/charts/prometheus-nats-exporter/templates/deployment.yaml @@ -31,12 +31,18 @@ spec: {{- if .Values.config.metrics.varz }} - "-varz" {{- end }} + {{- if .Values.config.metrics.accstatz }} + - "-accstatz" + {{- end }} {{- if .Values.config.metrics.channelz }} - "-channelz" {{- end }} {{- if .Values.config.metrics.connz }} - "-connz" {{- end }} + {{- if .Values.config.metrics.connz_detailed }} + - "-connz_detailed" + {{- end }} {{- if .Values.config.metrics.routez }} - "-routez" {{- end }} diff --git a/charts/prometheus-nats-exporter/values.yaml b/charts/prometheus-nats-exporter/values.yaml index d47b27ae5bb7..202b66473172 100644 --- a/charts/prometheus-nats-exporter/values.yaml +++ b/charts/prometheus-nats-exporter/values.yaml @@ -43,8 +43,10 @@ config: namespace: default port: 8222 metrics: + accstatz: true channelz: true connz: true + connz_detailed: true jsz: true gatewayz: true leafz: true diff --git a/charts/prometheus-statsd-exporter/Chart.yaml b/charts/prometheus-statsd-exporter/Chart.yaml index fba8b0f842c4..1350723bba9b 100644 --- a/charts/prometheus-statsd-exporter/Chart.yaml +++ b/charts/prometheus-statsd-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: prometheus-statsd-exporter description: A Helm chart for prometheus stats-exporter -version: 0.12.0 +version: 0.13.0 appVersion: v0.26.0 home: https://github.com/prometheus/statsd_exporter sources: diff --git a/charts/prometheus-statsd-exporter/templates/deployment.yaml b/charts/prometheus-statsd-exporter/templates/deployment.yaml index 69953f531b57..9c5204e636f1 100644 --- a/charts/prometheus-statsd-exporter/templates/deployment.yaml +++ b/charts/prometheus-statsd-exporter/templates/deployment.yaml @@ -115,3 +115,7 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.topologySpreadConstraints }} + topologySpreadConstraints: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/charts/prometheus-statsd-exporter/values.yaml b/charts/prometheus-statsd-exporter/values.yaml index cd52d788c587..c66156e40896 100644 --- a/charts/prometheus-statsd-exporter/values.yaml +++ b/charts/prometheus-statsd-exporter/values.yaml @@ -172,3 +172,5 @@ nodeSelector: {} tolerations: [] affinity: {} + +topologySpreadConstraints: []