Merge branch 'main' into move-crds

Signed-off-by: Jan-Otto Kröpke <[email protected]>
prometheus-community · Jul 11, 2023 · 8c39e25 · 8c39e25
2 parents c52cf6b + 3cc956d
commit 8c39e25
Show file tree

Hide file tree

Showing 24 changed files with 119 additions and 24 deletions.
diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/verticalpodautoscaler.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/verticalpodautoscaler.yaml
@@ -14,6 +14,9 @@ spec:
       {{- if .Values.prometheusOperator.verticalPodAutoscaler.controlledResources }}
       controlledResources: {{ .Values.prometheusOperator.verticalPodAutoscaler.controlledResources }}
       {{- end }}
+      {{- if .Values.prometheusOperator.verticalPodAutoscaler.controlledValues }}
+      controlledValues: {{ .Values.prometheusOperator.verticalPodAutoscaler.controlledValues }}
+      {{- end }}
       {{- if .Values.prometheusOperator.verticalPodAutoscaler.maxAllowed }}
       maxAllowed:
         {{- toYaml .Values.prometheusOperator.verticalPodAutoscaler.maxAllowed | nindent 8 }}
@@ -26,10 +29,8 @@ spec:
     apiVersion: apps/v1
     kind: Deployment
     name: {{ template "kube-prometheus-stack.fullname" . }}-operator
-  {{- if .Values.prometheusOperator.verticalPodAutoscaler.updatePolicy }}
+  {{- with .Values.prometheusOperator.verticalPodAutoscaler.updatePolicy }}
   updatePolicy:
-    {{- if .Values.prometheusOperator.verticalPodAutoscaler.updatePolicy.updateMode }}
-    updateMode: {{ .Values.prometheusOperator.verticalPodAutoscaler.updatePolicy.updateMode  }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 {{- end }}
diff --git a/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml b/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml
@@ -437,4 +437,8 @@ spec:
   hostAliases:
 {{ toYaml .Values.prometheus.prometheusSpec.hostAliases | indent 4 }}
 {{- end }}
+{{- if .Values.prometheus.prometheusSpec.tracingConfig }}
+  tracingConfig:
+{{ toYaml .Values.prometheus.prometheusSpec.tracingConfig | indent 4 }}
+{{- end }}
 {{- end }}
diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
@@ -2299,6 +2299,8 @@ prometheusOperator:
     enabled: false
     # List of resources that the vertical pod autoscaler can control. Defaults to cpu and memory
     controlledResources: []
+    # Specifies which resource values should be controlled: RequestsOnly or RequestsAndLimits.
+    # controlledValues: RequestsAndLimits
 
     # Define the max allowed resources for the pod
     maxAllowed: {}
@@ -2310,6 +2312,8 @@ prometheusOperator:
     # memory: 100Mi
 
     updatePolicy:
+      # Specifies minimal number of replicas which need to be alive for VPA Updater to attempt pod eviction
+      # minReplicas: 1
       # Specifies whether recommended updates are applied when a Pod is started and whether recommended updates
       # are applied during the life of a Pod. Possible values are "Off", "Initial", "Recreate", and "Auto".
       updateMode: Auto
@@ -3468,6 +3472,10 @@ prometheus:
     #      - a1.app.local
     #      - b1.app.local
 
+    ## TracingConfig configures tracing in Prometheus.
+    ## See https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#prometheustracingconfig
+    tracingConfig: {}
+
   additionalRulesForClusterRole: []
   #  - apiGroups: [ "" ]
   #    resources:

diff --git 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.3.0
+version: 0.4.0
 appVersion: "v0.6.0"
 home: "https://github.com/prometheus-community/prom-label-proxy"
 keywords:

diff --git a/charts/prom-label-proxy/templates/service.yaml b/charts/prom-label-proxy/templates/service.yaml
@@ -5,6 +5,10 @@ metadata:
   namespace: {{ template "prom-label-proxy.namespace" . }}
   labels:
     {{- include "prom-label-proxy.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: ClusterIP
   ports:

diff --git 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.0.0
+version: 8.1.0
 appVersion: v0.24.0
 home: https://github.com/prometheus/blackbox_exporter
 sources:

diff --git a/charts/prometheus-blackbox-exporter/templates/verticalpodautoscaler.yaml b/charts/prometheus-blackbox-exporter/templates/verticalpodautoscaler.yaml
@@ -0,0 +1,39 @@
+{{- if and (.Capabilities.APIVersions.Has "autoscaling.k8s.io/v1") (.Values.verticalPodAutoscaler.enabled) }}
+apiVersion: autoscaling.k8s.io/v1
+kind: VerticalPodAutoscaler
+metadata:
+  name: {{ include "prometheus-blackbox-exporter.fullname" . }}
+  namespace: {{ template "prometheus-blackbox-exporter.namespace" . }}
+  labels:
+    {{- include "prometheus-blackbox-exporter.labels" . | nindent 4 }}
+spec:
+  resourcePolicy:
+    containerPolicies:
+    - containerName: blackbox-exporter
+      {{- if .Values.verticalPodAutoscaler.controlledResources }}
+      controlledResources: {{ .Values.verticalPodAutoscaler.controlledResources }}
+      {{- end }}
+      {{- if .Values.verticalPodAutoscaler.controlledValues }}
+      controlledValues: {{ .Values.verticalPodAutoscaler.controlledValues }}
+      {{- end }}
+      {{- if .Values.verticalPodAutoscaler.maxAllowed }}
+      maxAllowed:
+        {{ toYaml .Values.verticalPodAutoscaler.maxAllowed | nindent 8 }}
+      {{- end }}
+      {{- if .Values.verticalPodAutoscaler.minAllowed }}
+      minAllowed:
+        {{ toYaml .Values.verticalPodAutoscaler.minAllowed | nindent 8 }}
+      {{- end }}
+  targetRef:
+    apiVersion: apps/v1
+    {{- if (eq .Values.kind "DaemonSet") }}
+    kind: DaemonSet
+    {{- else }}
+    kind: Deployment
+    {{- end }}
+    name:  {{ template "prometheus-blackbox-exporter.fullname" . }}
+  {{- with .Values.verticalPodAutoscaler.updatePolicy }}
+  updatePolicy:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/charts/prometheus-blackbox-exporter/values.yaml b/charts/prometheus-blackbox-exporter/values.yaml
@@ -319,3 +319,27 @@ extraManifests: []
 
 # global common labels, applied to all ressources
 commonLabels: {}
+
+# Enable vertical pod autoscaler support for prometheus-blackbox-exporter
+verticalPodAutoscaler:
+  enabled: false
+  # List of resources that the vertical pod autoscaler can control. Defaults to cpu and memory
+  controlledResources: []
+  # Specifies which resource values should be controlled: RequestsOnly or RequestsAndLimits.
+  # controlledValues: RequestsAndLimits
+
+  # Define the max allowed resources for the pod
+  maxAllowed: {}
+  # cpu: 200m
+  # memory: 100Mi
+  # Define the min allowed resources for the pod
+  minAllowed: {}
+  # cpu: 200m
+  # memory: 100Mi
+
+  updatePolicy:
+    # Specifies minimal number of replicas which need to be alive for VPA Updater to attempt pod eviction
+    # minReplicas: 1
+    # Specifies whether recommended updates are applied when a Pod is started and whether recommended updates
+    # are applied during the life of a Pod. Possible values are "Off", "Initial", "Recreate", and "Auto".
+    updateMode: Auto
diff --git a/charts/prometheus-rabbitmq-exporter/Chart.yaml b/charts/prometheus-rabbitmq-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Rabbitmq metrics exporter for prometheus
 name: prometheus-rabbitmq-exporter
-version: 1.6.0
+version: 1.7.0
 appVersion: v0.29.0
 home: https://github.com/kbudde/rabbitmq_exporter
 sources:

diff --git a/charts/prometheus-rabbitmq-exporter/templates/deployment.yaml b/charts/prometheus-rabbitmq-exporter/templates/deployment.yaml
@@ -40,7 +40,7 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: RABBIT_URL
-              value: "{{ .Values.rabbitmq.url }}"
+              value: "{{ tpl .Values.rabbitmq.url . }}"
             - name: RABBIT_USER
               value: "{{ .Values.rabbitmq.user }}"
             {{- if .Values.rabbitmq.existingPasswordSecret }}

diff --git a/charts/prometheus-rabbitmq-exporter/values.yaml b/charts/prometheus-rabbitmq-exporter/values.yaml
@@ -34,6 +34,7 @@ affinity: {}
 
 loglevel: info
 rabbitmq:
+  # This field also accepts templated values
   url: http://myrabbit:15672
   user: guest
   password: guest

diff --git 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: 1.5.0
+version: 1.6.0
 appVersion: v0.21.0
 home: https://github.com/prometheus/snmp_exporter
 sources:

diff --git a/charts/prometheus-snmp-exporter/templates/_helpers.tpl b/charts/prometheus-snmp-exporter/templates/_helpers.tpl
@@ -64,4 +64,15 @@ Selector labels
 {{- define "prometheus-snmp-exporter.selectorLabels" }}
 app.kubernetes.io/name: {{ include "prometheus-snmp-exporter.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
+{{- end }}
+
+{{/*
+Namespace override
+*/}}
+{{- define "prometheus-snmp-exporter.namespace" -}}
+  {{- if .Values.namespaceOverride -}}
+    {{- .Values.namespaceOverride -}}
+  {{- else -}}
+    {{- .Release.namespace -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/prometheus-snmp-exporter/templates/configmap.yaml b/charts/prometheus-snmp-exporter/templates/configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "prometheus-snmp-exporter.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-snmp-exporter.namespace" . }}
   labels:
     {{- include "prometheus-snmp-exporter.labels" . | indent 4 }}
 data:

diff --git a/charts/prometheus-snmp-exporter/templates/daemonset.yaml b/charts/prometheus-snmp-exporter/templates/daemonset.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ template "prometheus-snmp-exporter.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-snmp-exporter.namespace" . }}
   labels:
     {{- include "prometheus-snmp-exporter.labels" . | indent 4 }}
 spec:

diff --git a/charts/prometheus-snmp-exporter/templates/deployment.yaml b/charts/prometheus-snmp-exporter/templates/deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "prometheus-snmp-exporter.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-snmp-exporter.namespace" . }}
   labels:
     {{- include "prometheus-snmp-exporter.labels" . | indent 4 }}
 spec:

diff --git a/charts/prometheus-snmp-exporter/templates/ingress.yaml b/charts/prometheus-snmp-exporter/templates/ingress.yaml
@@ -17,7 +17,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ template "prometheus-snmp-exporter.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-snmp-exporter.namespace" . }}
   labels:
     {{- include "prometheus-snmp-exporter.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}

diff --git a/charts/prometheus-snmp-exporter/templates/role.yaml b/charts/prometheus-snmp-exporter/templates/role.yaml
@@ -3,7 +3,7 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ template "prometheus-snmp-exporter.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-snmp-exporter.namespace" . }}
   labels:
     {{- include "prometheus-snmp-exporter.labels" . | indent 4 }}
 rules:

diff --git a/charts/prometheus-snmp-exporter/templates/rolebinding.yaml b/charts/prometheus-snmp-exporter/templates/rolebinding.yaml
@@ -3,7 +3,7 @@ kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ template "prometheus-snmp-exporter.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-snmp-exporter.namespace" . }}
   labels:
     {{- include "prometheus-snmp-exporter.labels" . | indent 4 }}
 subjects:

diff --git a/charts/prometheus-snmp-exporter/templates/service.yaml b/charts/prometheus-snmp-exporter/templates/service.yaml
@@ -2,7 +2,7 @@ kind: Service
 apiVersion: v1
 metadata:
   name: {{ template "prometheus-snmp-exporter.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-snmp-exporter.namespace" . }}
   {{- if .Values.service.annotations }}
   annotations:
 {{ toYaml .Values.service.annotations | indent 4 }}

diff --git a/charts/prometheus-snmp-exporter/templates/serviceaccount.yaml b/charts/prometheus-snmp-exporter/templates/serviceaccount.yaml
@@ -5,5 +5,5 @@ metadata:
   labels:
     {{- include "prometheus-snmp-exporter.labels" . | indent 4 }}
   name: {{ template "prometheus-snmp-exporter.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ template "prometheus-snmp-exporter.namespace" . }}
 {{- end -}}
diff --git a/charts/prometheus-snmp-exporter/values.yaml b/charts/prometheus-snmp-exporter/values.yaml
@@ -13,6 +13,9 @@ nodeSelector: {}
 tolerations: []
 affinity: {}
 
+## Provide a namespace to substitude for the namespace on resources
+namespaceOverride: ""
+
 ## Security context to be added to snmp-exporter pods
 securityContext: {}
   # fsGroup: 1000

diff --git a/charts/prometheus/Chart.lock b/charts/prometheus/Chart.lock
@@ -4,12 +4,12 @@ dependencies:
   version: 0.33.1
 - name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
-  version: 5.8.1
+  version: 5.8.2
 - name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
   version: 4.18.1
 - name: prometheus-pushgateway
   repository: https://prometheus-community.github.io/helm-charts
-  version: 2.3.0
-digest: sha256:8d4f6a9def838e338d9abf528e3e45a35ea87ae2bf9d4cc8d96e4df6832c4278
-generated: "2023-06-27T10:44:03.318233083Z"
+  version: 2.4.0
+digest: sha256:4c9532cc9070f769288379a49748d5a03291ec689e058f32bc9f03ffdd8c8835
+generated: "2023-07-10T22:40:16.1594561+09:00"
diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: prometheus
 appVersion: v2.45.0
-version: 23.0.0
+version: 23.1.0
 kubeVersion: ">=1.16.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.3.*"
+    version: "2.4.*"
     repository: https://prometheus-community.github.io/helm-charts
     condition: prometheus-pushgateway.enabled
 keywords: