Skip to content

Commit 7287b02

Browse files
feat(monitoring): upgrade victoria-metrics-operator to v0.68.4 (#2426)
## What this PR does Upgrades the vendored `victoria-metrics-operator` Helm chart from `0.59.1` to `0.61.0` (operator appVersion `v0.68.1` → `v0.68.4`) by re-running `make update` in `packages/system/victoria-metrics-operator/`. Picks up upstream bugfixes in the `v0.68.x` operator line: - Correct `VMPodScrape` port for `VMAgent` / `VLAgent` (previously misrouted, causing scrape failures) - `StatefulSet` pod *deletion* (not eviction) when `maxUnavailable=100%` — matches the minimum-downtime upgrade strategy - `VMDistributed` PVC no longer owned by both the `StatefulSet` and the top-level object - Finalizer cleanup on core Kubernetes resources and correct finalizer targeting for `VLAgent`/`VLogs`/`VMAgent`/`VMSingle` - Ingest-only `VMSingle`/`VMAgent` no longer mount scrape config secrets (avoids RBAC errors) - `StatefulSet` recreation when immutable fields change - Operator waits for PVC resize completion before continuing reconcile Chart `0.60.0` is skipped deliberately: it switched the operator Deployment's selector to `app.kubernetes.io/component`, which required Deployment recreation on upgrade. `0.61.0` reverts that change, so jumping straight from `0.59.1` to `0.61.0` avoids the disruption. Local patch `patches/disable-ca-key-rotation.patch` still applies cleanly against the new `templates/webhook.yaml`. ### Release note ```release-note [monitoring] Upgrade victoria-metrics-operator chart to 0.61.0 (operator v0.68.4) for upstream STS/PVC bugfixes, correct VMPodScrape port, and finalizer cleanup. ``` <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Added support for configuring Deployment rolling update strategy * Added Deployment unhealthyPodEvictionPolicy for Pod Disruption Budgets * Added webhook annotations configuration * Extended CRD with statefulRollingUpdateStrategyBehavior and vmauth.enabled settings * **Bug Fixes** * Reverted Deployment matchLabels change from release 0.60.0 * **Documentation** * Added changelog links to documentation <!-- end of auto-generated comment: release notes by coderabbit.ai -->
2 parents 913af01 + 83ae237 commit 7287b02

18 files changed

Lines changed: 121 additions & 52 deletions

File tree

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
dependencies:
22
- name: victoria-metrics-common
3-
repository: https://victoriametrics.github.io/helm-charts
4-
version: 0.0.46
3+
repository: oci://ghcr.io/victoriametrics/helm-charts
4+
version: 0.3.0
55
- name: crds
66
repository: ""
77
version: 0.0.*
8-
digest: sha256:43d3d210a9d1a2234e6c56518f8c477125a5ad5e8ed08d46209528f19acd9c89
9-
generated: "2025-12-23T12:58:01.428960334Z"
8+
digest: sha256:adec954bf2814f744f5b69fcf67c8b246bf21f416adb0ab37d91c9b42f72d353
9+
generated: "2026-04-16T10:14:10.795552631Z"

‎packages/system/victoria-metrics-operator/charts/victoria-metrics-operator/Chart.yaml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
annotations:
22
artifacthub.io/category: monitoring-logging
33
artifacthub.io/changes: |
4-
- updates operator to [v0.68.1](https://github.com/VictoriaMetrics/operator/releases/tag/v0.68.1) version
4+
- revert change in Deployment's matchLabels, that was introduced in release 0.60.0
55
artifacthub.io/license: Apache-2.0
66
artifacthub.io/links: |
77
- name: Sources
@@ -16,13 +16,14 @@ annotations:
1616
artifacthub.io/readme: |
1717
# VictoriaMetrics Operator Helm chart
1818
19-
Chart documentation is available [here](https://docs.victoriametrics.com/helm/victoria-metrics-operator/)
19+
Chart documentation is available [here](https://docs.victoriametrics.com/helm/victoria-metrics-operator/).
20+
Changelog is [here](https://docs.victoriametrics.com/helm/victoria-metrics-operator/changelog/).
2021
apiVersion: v2
21-
appVersion: v0.68.1
22+
appVersion: v0.68.4
2223
dependencies:
2324
- name: victoria-metrics-common
24-
repository: https://victoriametrics.github.io/helm-charts
25-
version: 0.0.*
25+
repository: oci://ghcr.io/victoriametrics/helm-charts
26+
version: 0.3.*
2627
- condition: crds.plain
2728
name: crds
2829
repository: ""
@@ -46,4 +47,4 @@ sources:
4647
- https://github.com/VictoriaMetrics/helm-charts
4748
- https://github.com/VictoriaMetrics/operator
4849
type: application
49-
version: 0.59.1
50+
version: 0.61.0
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# VictoriaMetrics Operator Helm chart
22

3-
Chart documentation is available [here](https://docs.victoriametrics.com/helm/victoria-metrics-operator/)
3+
Chart documentation is available [here](https://docs.victoriametrics.com/helm/victoria-metrics-operator/).
4+
Changelog is [here](https://docs.victoriametrics.com/helm/victoria-metrics-operator/changelog/).
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Release notes for version 0.59.1
1+
# Release notes for version 0.61.0
22

3-
**Release date:** 03 Mar 2026
3+
**Release date:** 16 Apr 2026
44

5-
![Helm: v3](https://img.shields.io/badge/Helm-v3.14%2B-informational?color=informational&logo=helm&link=https%3A%2F%2Fgithub.com%2Fhelm%2Fhelm%2Freleases%2Ftag%2Fv3.14.0) ![AppVersion: v0.68.1](https://img.shields.io/badge/v0.68.1-success?logo=VictoriaMetrics&labelColor=gray&link=https%3A%2F%2Fdocs.victoriametrics.com%2Foperator%2Fchangelog%2F%23v0681)
5+
![Helm: v3](https://img.shields.io/badge/Helm-v3.14%2B-informational?color=informational&logo=helm&link=https%3A%2F%2Fgithub.com%2Fhelm%2Fhelm%2Freleases%2Ftag%2Fv3.14.0) ![AppVersion: v0.68.4](https://img.shields.io/badge/v0.68.4-success?logo=VictoriaMetrics&labelColor=gray&link=https%3A%2F%2Fdocs.victoriametrics.com%2Foperator%2Fchangelog%2F%23v0684)
66

7-
- updates operator to [v0.68.1](https://github.com/VictoriaMetrics/operator/releases/tag/v0.68.1) version
7+
- revert change in Deployment's matchLabels, that was introduced in release 0.60.0

‎packages/system/victoria-metrics-operator/charts/victoria-metrics-operator/charts/crds/crds/crd.yaml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6079,6 +6079,7 @@ spec:
60796079
- spec
60806080
type: object
60816081
shardCount:
6082+
format: int32
60826083
type: integer
60836084
startupProbe:
60846085
type: object
@@ -6087,6 +6088,14 @@ spec:
60876088
type: boolean
60886089
statefulRollingUpdateStrategy:
60896090
type: string
6091+
statefulRollingUpdateStrategyBehavior:
6092+
properties:
6093+
maxUnavailable:
6094+
anyOf:
6095+
- type: integer
6096+
- type: string
6097+
x-kubernetes-int-or-string: true
6098+
type: object
60906099
statefulStorage:
60916100
properties:
60926101
emptyDir:
@@ -12326,6 +12335,7 @@ spec:
1232612335
type: object
1232712336
x-kubernetes-preserve-unknown-fields: true
1232812337
shardCount:
12338+
format: int32
1232912339
type: integer
1233012340
startupProbe:
1233112341
type: object
@@ -16808,6 +16818,9 @@ spec:
1680816818
type: boolean
1680916819
vmauth:
1681016820
properties:
16821+
enabled:
16822+
default: true
16823+
type: boolean
1681116824
name:
1681216825
type: string
1681316826
spec:
@@ -24727,6 +24740,14 @@ spec:
2472724740
type: boolean
2472824741
statefulRollingUpdateStrategy:
2472924742
type: string
24743+
statefulRollingUpdateStrategyBehavior:
24744+
properties:
24745+
maxUnavailable:
24746+
anyOf:
24747+
- type: integer
24748+
- type: string
24749+
x-kubernetes-int-or-string: true
24750+
type: object
2473024751
statefulStorage:
2473124752
properties:
2473224753
emptyDir:
@@ -28628,6 +28649,14 @@ spec:
2862828649
type: boolean
2862928650
statefulRollingUpdateStrategy:
2863028651
type: string
28652+
statefulRollingUpdateStrategyBehavior:
28653+
properties:
28654+
maxUnavailable:
28655+
anyOf:
28656+
- type: integer
28657+
- type: string
28658+
x-kubernetes-int-or-string: true
28659+
type: object
2863128660
statefulStorage:
2863228661
properties:
2863328662
emptyDir:

‎packages/system/victoria-metrics-operator/charts/victoria-metrics-operator/charts/victoria-metrics-common/Chart.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
annotations:
22
artifacthub.io/category: monitoring-logging
33
artifacthub.io/changes: |
4-
- allow setting global labels for each resource using `.Values.global.extraLabels`. See [#2607](https://github.com/VictoriaMetrics/helm-charts/issues/2607).
4+
- reverted usage of `app` label in `vm.selectorLabels`
55
artifacthub.io/license: Apache-2.0
66
artifacthub.io/links: |
77
- name: Sources
@@ -11,7 +11,8 @@ annotations:
1111
artifacthub.io/readme: |
1212
# VictoriaMetrics Common Helm chart
1313
14-
Chart documentation is available [here](https://docs.victoriametrics.com/helm/victoria-metrics-common/)
14+
Chart documentation is available [here](https://docs.victoriametrics.com/helm/victoria-metrics-common/).
15+
Changelog is [here](https://docs.victoriametrics.com/helm/victoria-metrics-common/changelog/).
1516
apiVersion: v2
1617
description: VictoriaMetrics Common - contains shared templates for all Victoria Metrics
1718
helm charts
@@ -29,4 +30,4 @@ name: victoria-metrics-common
2930
sources:
3031
- https://github.com/VictoriaMetrics/helm-charts
3132
type: library
32-
version: 0.0.46
33+
version: 0.3.0
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# VictoriaMetrics Common Helm chart
22

3-
Chart documentation is available [here](https://docs.victoriametrics.com/helm/victoria-metrics-common/)
3+
Chart documentation is available [here](https://docs.victoriametrics.com/helm/victoria-metrics-common/).
4+
Changelog is [here](https://docs.victoriametrics.com/helm/victoria-metrics-common/changelog/).
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Release notes for version 0.0.46
1+
# Release notes for version 0.3.0
22

3-
**Release date:** 23 Dec 2025
3+
**Release date:** 16 Apr 2026
44

55
![Helm: v3](https://img.shields.io/badge/Helm-v3.14%2B-informational?color=informational&logo=helm&link=https%3A%2F%2Fgithub.com%2Fhelm%2Fhelm%2Freleases%2Ftag%2Fv3.14.0)
66

7-
- allow setting global labels for each resource using `.Values.global.extraLabels`. See [#2607](https://github.com/VictoriaMetrics/helm-charts/issues/2607).
7+
- reverted usage of `app` label in `vm.selectorLabels`

‎packages/system/victoria-metrics-operator/charts/victoria-metrics-operator/charts/victoria-metrics-common/templates/_helpers.tpl‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ If release name contains chart name it will be used as a full name.
125125
{{- $ctx := . -}}
126126
{{- $values := $Values -}}
127127
{{- range $ak := $appKey }}
128-
{{- $values = ternary (default dict) (index $values $ak | default dict) (empty $values) -}}
129-
{{- $ctx = ternary (default dict) (index $ctx $ak | default dict) (empty $ctx) -}}
128+
{{- $values = ternary (dict) (index $values $ak | default dict) (empty $values) -}}
129+
{{- $ctx = ternary (dict) (index $ctx $ak | default dict) (empty $ctx) -}}
130130
{{- if and (empty $values) (empty $ctx) -}}
131131
{{- fail (printf "No data for appKey %s" (join "->" $appKey)) -}}
132132
{{- end -}}
@@ -187,6 +187,9 @@ If release name contains chart name it will be used as a full name.
187187
{{- include "vm.validate.args" . -}}
188188
{{- $Release := (.helm).Release | default .Release -}}
189189
{{- $labels := fromYaml (include "vm.selectorLabels" .) -}}
190+
{{- with $labels.app -}}
191+
{{- $_ := set $labels "app.kubernetes.io/component" . -}}
192+
{{- end -}}
190193
{{- $labels = mergeOverwrite $labels (.extraLabels | default dict) -}}
191194
{{- $_ := set $labels "app.kubernetes.io/managed-by" $Release.Service -}}
192195
{{- toYaml $labels -}}
@@ -197,7 +200,7 @@ If release name contains chart name it will be used as a full name.
197200
{{- include "vm.validate.args" . -}}
198201
{{- $Values := (.helm).Values | default .Values -}}
199202
{{- $globalLabels := deepCopy (($Values.global).extraLabels | default dict) -}}
200-
{{- $labels := fromYaml (include "vm.selectorLabels" .) -}}
203+
{{- $labels := fromYaml (include "vm.commonLabels" .) -}}
201204
{{- $labels = mergeOverwrite $globalLabels $labels (fromYaml (include "vm.metaLabels" .)) -}}
202205
{{- with (include "vm.image.tag" .) }}
203206
{{- $_ := set $labels "app.kubernetes.io/version" (regexReplaceAll "(.*)(@sha.*)" . "${1}") -}}
@@ -231,11 +234,16 @@ If release name contains chart name it will be used as a full name.
231234
{{- $_ := set $labels "app.kubernetes.io/name" (include "vm.name" .) -}}
232235
{{- $_ := set $labels "app.kubernetes.io/instance" (include "vm.release" .) -}}
233236
{{- with (include "vm.app.name" .) -}}
234-
{{- if eq $.style "managed" -}}
235-
{{- $_ := set $labels "app.kubernetes.io/component" (printf "%s-%s" (include "vm.name" $) .) -}}
236-
{{- else -}}
237-
{{- $_ := set $labels "app" . -}}
238-
{{- end -}}
237+
{{- $_ := set $labels "app" . -}}
239238
{{- end -}}
240239
{{- toYaml $labels -}}
241240
{{- end }}
241+
242+
{{- define "vm.commonLabels" -}}
243+
{{- $labels := fromYaml (include "vm.selectorLabels" . ) -}}
244+
{{- with $labels.app -}}
245+
{{- $_ := set $labels "app.kubernetes.io/component" . -}}
246+
{{- $_ := unset $labels "app" -}}
247+
{{- end -}}
248+
{{- toYaml $labels -}}
249+
{{- end -}}

0 commit comments

Comments
 (0)