Skip to content

Commit 14a7d58

Browse files
renovate[bot]cwrau
renovate[bot]
and
cwrau
authored
chore(base-cluster/dependencies): update helm release kube-prometheus-stack to v54 (#631)
[![Mend Renovate logo banner](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [kube-prometheus-stack](https://togithub.com/prometheus-operator/kube-prometheus) ([source](https://togithub.com/prometheus-community/helm-charts)) | major | `51.x` -> `54.x` | --- ### Release Notes <details> <summary>prometheus-community/helm-charts (kube-prometheus-stack)</summary> ### [`v54.0.1`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-54.0.1) [Compare Source](https://togithub.com/prometheus-community/helm-charts/compare/kube-prometheus-stack-54.0.0...kube-prometheus-stack-54.0.1) kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. #### What's Changed - \[kube-prometheus-stack] Add missing RABC permission for Prometheus Operator by [@&#8203;jkroepke](https://togithub.com/jkroepke) in [https://github.com/prometheus-community/helm-charts/pull/4005](https://togithub.com/prometheus-community/helm-charts/pull/4005) **Full Changelog**: prometheus-community/helm-charts@kube-prometheus-stack-54.0.0...kube-prometheus-stack-54.0.1 ### [`v54.0.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-54.0.0) [Compare Source](https://togithub.com/prometheus-community/helm-charts/compare/kube-prometheus-stack-53.0.0...kube-prometheus-stack-54.0.0) kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. #### What's Changed - \[kube-prometheus-stack] Bump grafana and kube-state-metrics charts by [@&#8203;jkroepke](https://togithub.com/jkroepke) in [https://github.com/prometheus-community/helm-charts/pull/4000](https://togithub.com/prometheus-community/helm-charts/pull/4000) **Full Changelog**: prometheus-community/helm-charts@kube-prometheus-stack-53.0.0...kube-prometheus-stack-54.0.0 ### [`v53.0.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-53.0.0) [Compare Source](https://togithub.com/prometheus-community/helm-charts/compare/kube-prometheus-stack-52.1.0...kube-prometheus-stack-53.0.0) kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. ##### What's Changed - \[kube-prometheus-stack] Bump to 0.69.1 by [@&#8203;DrFaust92](https://togithub.com/DrFaust92) in [https://github.com/prometheus-community/helm-charts/pull/3988](https://togithub.com/prometheus-community/helm-charts/pull/3988) **Full Changelog**: prometheus-community/helm-charts@prometheus-25.6.0...kube-prometheus-stack-53.0.0 ### [`v52.1.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-52.1.0) [Compare Source](https://togithub.com/prometheus-community/helm-charts/compare/kube-prometheus-stack-52.0.1...kube-prometheus-stack-52.1.0) kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. #### What's Changed - Populating dynamic honorLabels and honorTimestamps in kubelet ServiceMonitor by [@&#8203;andrejshapal](https://togithub.com/andrejshapal) in [https://github.com/prometheus-community/helm-charts/pull/3934](https://togithub.com/prometheus-community/helm-charts/pull/3934) **Full Changelog**: prometheus-community/helm-charts@kube-prometheus-stack-52.0.1...kube-prometheus-stack-52.1.0 ### [`v52.0.1`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-52.0.1) [Compare Source](https://togithub.com/prometheus-community/helm-charts/compare/kube-prometheus-stack-52.0.0...kube-prometheus-stack-52.0.1) kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. #### What's Changed - \[kube-prometheus-stack] Update Thanos with critical fixes for objstorage and HTTP/2 CVE by [@&#8203;dragoangel](https://togithub.com/dragoangel) in [https://github.com/prometheus-community/helm-charts/pull/3935](https://togithub.com/prometheus-community/helm-charts/pull/3935) #### New Contributors - [@&#8203;dragoangel](https://togithub.com/dragoangel) made their first contribution in [https://github.com/prometheus-community/helm-charts/pull/3935](https://togithub.com/prometheus-community/helm-charts/pull/3935) **Full Changelog**: prometheus-community/helm-charts@prometheus-25.3.1...kube-prometheus-stack-52.0.1 ### [`v52.0.0`](https://togithub.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-52.0.0) [Compare Source](https://togithub.com/prometheus-community/helm-charts/compare/kube-prometheus-stack-51.10.0...kube-prometheus-stack-52.0.0) kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. #### What's Changed - \[kube-prometheus-stack] fixes thanos configs by [@&#8203;thameezb](https://togithub.com/thameezb) in [https://github.com/prometheus-community/helm-charts/pull/3918](https://togithub.com/prometheus-community/helm-charts/pull/3918) **Full Changelog**: prometheus-community/helm-charts@prometheus-25.3.0...kube-prometheus-stack-52.0.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/teutonet/teutonet-helm-charts). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40Ni4wIiwidXBkYXRlZEluVmVyIjoiMzcuNDYuMCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Chris Werner Rau <[email protected]>
1 parent 54a6512 commit 14a7d58

File tree

8 files changed

+44
-66
lines changed

8 files changed

+44
-66
lines changed

‎charts/base-cluster/templates/backup/velero.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
cleanUpCRDs: true
3030
initContainers:
3131
- name: velero-plugin-for-aws
32-
image: docker.io/velero/velero-plugin-for-aws:v1.7.0
32+
image: {{ printf "%s/velero/velero-plugin-for-aws:v1.7.0" (.Values.global.imageRegistry | default "docker.io") }}
3333
imagePullPolicy: IfNotPresent
3434
volumeMounts:
3535
- mountPath: /target

‎charts/base-cluster/templates/ingress/nginx.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ spec:
2828
{{- if .Values.monitoring.tracing.enabled }}
2929
opentelemetry:
3030
enabled: true
31+
{{- if and .Values.global.imageRegistry false }}
32+
# TODO: this is not really viable, therefore we skip this image for mirroring until this is adjusted upstream
33+
image: {{ printf "%s/ingress-nginx/opentelemetry:v20230721-3e2062ee5@sha256:13bee3f5223883d3ca62fee7309ad02d22ec00ff0d7033e3e9aca7a9f60fd472" .Values.global.imageRegistry }}
34+
{{- end }}
3135
{{- end }}
3236
config:
3337
use-proxy-protocol: true
@@ -84,4 +88,4 @@ spec:
8488
image:
8589
registry: {{ .Values.global.imageRegistry }}
8690
{{- end }}
87-
{{ end }}
91+
{{ end }}

‎charts/base-cluster/templates/kyverno/kyverno.yaml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ spec:
2424
repository: {{ printf "%s/kyverno/kyverno" $.Values.global.imageRegistry }}
2525
initImage:
2626
repository: {{ printf "%s/kyverno/kyvernopre" $.Values.global.imageRegistry }}
27-
cleanupController:
28-
image:
29-
repository: {{ printf "%s/kyverno/cleanup-controller" $.Values.global.imageRegistry }}
3027
{{- end }}
3128
installCRDs: true
3229
networkPolicy:
@@ -40,15 +37,24 @@ spec:
4037
priorityClassName: system-cluster-critical
4138
# this only works in version 3
4239
{{- if and .Values.monitoring.tracing.enabled .Values.monitoring.prometheus.enabled }}
43-
admissionController: &tracingConfig
44-
tracing:
40+
admissionController:
41+
tracing: &tracingConfig
4542
enabled: true
4643
address: open-telemetry-collector-opentelemetry-collector.monitoring
4744
port: 14250 # jaeger-grpc
48-
backgroundController: *tracingConfig
49-
cleanupController: *tracingConfig
50-
reportsController: *tracingConfig
45+
backgroundController:
46+
tracing: *tracingConfig
47+
reportsController:
48+
tracing: *tracingConfig
5149
{{- end }}
50+
cleanupController:
51+
{{- if and .Values.monitoring.tracing.enabled .Values.monitoring.prometheus.enabled }}
52+
tracing: *tracingConfig
53+
{{- end }}
54+
{{- if .Values.global.imageRegistry }}
55+
image:
56+
repository: {{ printf "%s/kyverno/cleanup-controller" $.Values.global.imageRegistry }}
57+
{{- end }}
5258
podDisruptionBudget:
5359
enabled: true
5460
minAvailable: 1

‎charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
{{- define "base-cluster.prometheus-stack.grafana.config" -}}
2-
{{- if $.Values.global.imageRegistry }}
3-
testFramework:
4-
image: {{ printf "%s/bats/bats" .Values.global.imageRegistry }}
5-
image:
6-
repository: {{ printf "%s/grafana/grafana" .Values.global.imageRegistry }}
7-
downloadDashboardsImage:
8-
repository: {{ printf "%s/curlimages/curl" .Values.global.imageRegistry }}
9-
{{- end }}
102
imageRenderer:
113
enabled: true
124
securityContext:
@@ -15,10 +7,6 @@ imageRenderer:
157
runAsNonRoot: true
168
runAsUser: 472
179
runAsGroup: 472
18-
{{- if $.Values.global.imageRegistry }}
19-
image:
20-
repository: {{ printf "%s/grafana/grafana-image-renderer" .Values.global.imageRegistry }}
21-
{{- end }}
2210
enabled: true
2311
securityContext:
2412
seccompProfile:
@@ -62,10 +50,6 @@ dashboardProviders:
6250
options:
6351
path: /var/lib/grafana/dashboards/custom
6452
sidecar:
65-
{{- if .Values.global.imageRegistry }}
66-
image:
67-
repository: {{ printf "%s/kiwigrid/k8s-sidecar" .Values.global.imageRegistry }}
68-
{{- end }}
6953
dashboards:
7054
enabled: true
7155
resource: configmap

‎charts/base-cluster/templates/monitoring/kube-prometheus-stack/_kube-state-metrics-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{- define "base-cluster.prometheus-stack.kube-state-metrics.config" -}}
22
{{- if .Values.global.imageRegistry }}
33
image:
4-
repository: {{ printf "%s/kube-state-metrics/kube-state-metrics" .Values.global.imageRegistry }}
4+
registry: {{ .Values.global.imageRegistry }}
55
{{- end }}
66
resources: {{- .Values.monitoring.prometheus.kubeStateMetrics.resources | toYaml | nindent 2 }}
77
{{- $metricLabelsAllowList := list -}}

‎charts/base-cluster/templates/monitoring/kube-prometheus-stack/_node-exporter-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{- define "base-cluster.prometheus-stack.node-exporter.config" -}}
22
{{- if .Values.global.imageRegistry }}
33
image:
4-
repository: {{ printf "%s/prometheus/node-exporter" .Values.global.imageRegistry }}
4+
registry: {{ .Values.global.imageRegistry }}
55
{{- end }}
66
resources: {{- .Values.monitoring.prometheus.nodeExporter.resources | toYaml | nindent 2 }}
77
priorityClassName: monitoring-components

‎charts/base-cluster/values.schema.json

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,21 @@
1717
"default": "None"
1818
},
1919
"clusterName": {
20-
"type": [
21-
"string",
22-
"null"
23-
],
20+
"type": "string",
2421
"description": "The name of the cluster, used as subdomain under `baseDomain` and as label `cluster` on all alerts",
2522
"examples": [
2623
"eu-2"
2724
]
2825
},
2926
"baseDomain": {
30-
"type": [
31-
"string",
32-
"null"
33-
],
27+
"type": "string",
3428
"description": "The base domain to be used for cluster ingress",
3529
"examples": [
3630
"teuto.net"
3731
]
3832
},
3933
"imageRegistry": {
40-
"type": [
41-
"string",
42-
"null"
43-
],
34+
"type": "string",
4435
"description": "The global container image proxy, e.g. [Nexus](https://artifacthub.io/packages/helm/sonatype/nexus-repository-manager), this needs to support various registries",
4536
"examples": [
4637
"nexus.teuto.net"
@@ -260,7 +251,9 @@
260251
"default": "PreemptLowerPriority"
261252
}
262253
},
263-
"required": ["value"],
254+
"required": [
255+
"value"
256+
],
264257
"additionalProperties": false
265258
},
266259
"propertyNames": {
@@ -439,10 +432,7 @@
439432
"type": "object",
440433
"properties": {
441434
"adminPassword": {
442-
"type": [
443-
"string",
444-
"null"
445-
]
435+
"type": "string"
446436
},
447437
"ingress": {
448438
"$ref": "#/$defs/toolIngress"
@@ -1251,10 +1241,7 @@
12511241
"default": "ALL"
12521242
},
12531243
"storageClass": {
1254-
"type": [
1255-
"string",
1256-
"null"
1257-
],
1244+
"type": "string",
12581245
"description": "The storageClass to use for persistence, e.g. for prometheus, otherwise use the cluster default (teutostack-ssd)"
12591246
},
12601247
"toolIngress": {
@@ -1268,10 +1255,7 @@
12681255
"description": "The subdomain to use under `.global.customerName`.`.global.baseDomain`"
12691256
},
12701257
"customDomain": {
1271-
"type": [
1272-
"string",
1273-
"null"
1274-
],
1258+
"type": "string",
12751259
"description": "The full custom domain to use"
12761260
}
12771261
},

‎charts/base-cluster/values.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
global:
22
serviceLevelAgreement: None
3-
clusterName: null
4-
baseDomain: null
5-
imageRegistry: null
3+
clusterName: ""
4+
baseDomain: ""
5+
imageRegistry: ""
66
imageCredentials: {}
77
priorityClasses: {}
88
namespaces:
@@ -52,7 +52,7 @@ global:
5252
{{- end }}
5353
targetNamespaces: ALL
5454
condition: "{{ not (empty .Values.global.baseDomain) }}"
55-
storageClass: null
55+
storageClass: ""
5656
kubectl:
5757
image:
5858
registry: docker.io
@@ -82,7 +82,7 @@ global:
8282
prometheus:
8383
url: https://prometheus-community.github.io/helm-charts
8484
charts:
85-
kube-prometheus-stack: 51.x
85+
kube-prometheus-stack: 54.x
8686
condition: "{{ .Values.monitoring.prometheus.enabled }}"
8787
interval: 5m
8888
grafana:
@@ -160,11 +160,11 @@ monitoring:
160160
labels:
161161
managed.by/monitoring: teutonet
162162
grafana:
163-
adminPassword: null
163+
adminPassword: ""
164164
ingress:
165165
enabled: true
166166
host: grafana
167-
customDomain: null
167+
customDomain: ""
168168
additionalDashboards: {}
169169
additionalPlugins: []
170170
config: {}
@@ -196,7 +196,7 @@ monitoring:
196196
retentionDuration: 4w
197197
retentionSize: 90GB
198198
persistence:
199-
storageClass: null
199+
storageClass: ""
200200
size: 100Gi
201201
resources:
202202
requests:
@@ -246,21 +246,21 @@ monitoring:
246246
ingress:
247247
enabled: false
248248
host: prometheus
249-
customDomain: null
249+
customDomain: ""
250250
alertmanager:
251251
ingress:
252252
enabled: false
253253
host: alertmanager
254-
customDomain: null
254+
customDomain: ""
255255
replicas: 1
256256
retentionDuration: 120h
257257
persistence:
258-
storageClass: null
258+
storageClass: ""
259259
size: 1Gi
260260
loki:
261261
enabled: true
262262
persistence:
263-
storageClass: null
263+
storageClass: ""
264264
size: 10Gi
265265
replicas: 1
266266
resources:
@@ -384,7 +384,7 @@ storage:
384384
storageClass:
385385
name: teutostack-nfs
386386
persistence:
387-
storageClass: null
387+
storageClass: ""
388388
size: 5Gi
389389

390390
reflector:

0 commit comments

Comments
 (0)