diff --git a/charts/victoria-metrics-cluster/templates/vmauth-deployment.yaml b/charts/victoria-metrics-cluster/templates/vmauth-deployment.yaml
index f518df053..7da7acb5d 100644
--- a/charts/victoria-metrics-cluster/templates/vmauth-deployment.yaml
+++ b/charts/victoria-metrics-cluster/templates/vmauth-deployment.yaml
@@ -45,7 +45,7 @@ spec:
workingDir: {{ . }}
{{- end }}
{{- if $app.securityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" $app.securityContext "context" .) | nindent 12 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.securityContext "helm" .) | nindent 12 }}
{{- end }}
args: {{ include "vmauth.args" . | nindent 12 }}
{{- with $app.envFrom }}
@@ -83,7 +83,7 @@ spec:
nodeSelector: {{ toYaml . | nindent 8 }}
{{- end }}
{{- if $app.podSecurityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" $app.podSecurityContext "context" .) | nindent 8 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.podSecurityContext "helm" .) | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "vm.sa.name" . }}
{{- with $app.tolerations }}
diff --git a/charts/victoria-metrics-cluster/templates/vminsert-deployment.yaml b/charts/victoria-metrics-cluster/templates/vminsert-deployment.yaml
index e9594fdd9..befb77dfe 100644
--- a/charts/victoria-metrics-cluster/templates/vminsert-deployment.yaml
+++ b/charts/victoria-metrics-cluster/templates/vminsert-deployment.yaml
@@ -45,7 +45,7 @@ spec:
workingDir: {{ . }}
{{- end }}
{{- if $app.securityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" $app.securityContext "context" .) | nindent 12 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.securityContext "helm" .) | nindent 12 }}
{{- end }}
args: {{ include "vminsert.args" . | nindent 12 }}
{{- with $app.envFrom }}
@@ -117,7 +117,7 @@ spec:
nodeSelector: {{ toYaml . | nindent 8 }}
{{- end }}
{{- if $app.podSecurityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" $app.podSecurityContext "context" .) | nindent 8 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.podSecurityContext "helm" .) | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "vm.sa.name" . }}
{{- with $app.tolerations }}
diff --git a/charts/victoria-metrics-cluster/templates/vmselect-deployment.yaml b/charts/victoria-metrics-cluster/templates/vmselect-deployment.yaml
index f257ae016..7c70ad9b9 100644
--- a/charts/victoria-metrics-cluster/templates/vmselect-deployment.yaml
+++ b/charts/victoria-metrics-cluster/templates/vmselect-deployment.yaml
@@ -46,7 +46,7 @@ spec:
workingDir: {{ . }}
{{- end }}
{{- if $app.securityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" $app.securityContext "context" .) | nindent 12 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.securityContext "helm" .) | nindent 12 }}
{{- end }}
args: {{ include "vmselect.args" . | nindent 12 }}
{{- with $app.envFrom }}
@@ -99,7 +99,7 @@ spec:
nodeSelector: {{ toYaml . | nindent 8 }}
{{- end }}
{{- if $app.podSecurityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" $app.podSecurityContext "context" .) | nindent 8 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.podSecurityContext "helm" .) | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "vm.sa.name" . }}
{{- with $app.tolerations }}
diff --git a/charts/victoria-metrics-cluster/templates/vmselect-statefulset.yaml b/charts/victoria-metrics-cluster/templates/vmselect-statefulset.yaml
index 565a49f4f..a2ae3276d 100644
--- a/charts/victoria-metrics-cluster/templates/vmselect-statefulset.yaml
+++ b/charts/victoria-metrics-cluster/templates/vmselect-statefulset.yaml
@@ -42,7 +42,7 @@ spec:
workingDir: {{ . }}
{{- end }}
{{- if $app.securityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" $app.securityContext "context" .) | nindent 12 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.securityContext "helm" .) | nindent 12 }}
{{- end }}
args: {{ include "vmselect.args" . | nindent 12 }}
{{- with $app.envFrom }}
@@ -95,7 +95,7 @@ spec:
nodeSelector: {{ toYaml . | nindent 8 }}
{{- end }}
{{- if $app.podSecurityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" $app.podSecurityContext "context" .) | nindent 8 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.podSecurityContext "helm" .) | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "vm.sa.name" . }}
{{- with $app.tolerations }}
diff --git a/charts/victoria-metrics-cluster/templates/vmstorage-statefulset.yaml b/charts/victoria-metrics-cluster/templates/vmstorage-statefulset.yaml
index ea1078769..f076e0c41 100644
--- a/charts/victoria-metrics-cluster/templates/vmstorage-statefulset.yaml
+++ b/charts/victoria-metrics-cluster/templates/vmstorage-statefulset.yaml
@@ -43,7 +43,7 @@ spec:
image: {{ include "vm.image" (merge (deepCopy .) (dict "app" $manager)) }}
imagePullPolicy: {{ $app.image.pullPolicy }}
{{- if $app.securityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" $app.securityContext "context" .) | nindent 12 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.securityContext "helm" .) | nindent 12 }}
{{- end }}
args: {{ include "vmbackupmanager.restore.args" . | nindent 12 }}
{{- with $manager.resources }}
@@ -82,7 +82,7 @@ spec:
workingDir: {{ . }}
{{- end }}
{{- if $app.securityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" $app.securityContext "context" .) | nindent 12 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.securityContext "helm" .) | nindent 12 }}
{{- end }}
args: {{ include "vmstorage.args" . | nindent 12 }}
ports:
@@ -161,7 +161,7 @@ spec:
image: {{ include "vm.image" (dict "helm" . "app" $manager) }}
imagePullPolicy: {{ $app.image.pullPolicy }}
{{- if $app.securityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" $app.securityContext "context" .) | nindent 12 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.securityContext "helm" .) | nindent 12 }}
{{- end }}
args: {{ include "vmbackupmanager.args" . }}
{{- with $manager.resources }}
@@ -214,7 +214,7 @@ spec:
nodeSelector: {{ toYaml . | nindent 8 }}
{{- end }}
{{- if $app.podSecurityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" $app.podSecurityContext "context" .) | nindent 8 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.podSecurityContext "helm" .) | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "vm.sa.name" . }}
{{- with $app.tolerations }}
diff --git a/charts/victoria-metrics-cluster/values.yaml b/charts/victoria-metrics-cluster/values.yaml
index a25814cf3..8850f0995 100644
--- a/charts/victoria-metrics-cluster/values.yaml
+++ b/charts/victoria-metrics-cluster/values.yaml
@@ -23,19 +23,6 @@ printNotes: true
# use SRV discovery for storageNode and selectNode flags for enterprise version
autoDiscovery: false
-rbac:
- # -- Enables Role/RoleBinding creation
- create: true
-
- # -- If true and `rbac.enabled`, will deploy a Role/RoleBinding instead of a ClusterRole/ClusterRoleBinding
- namespaced: false
-
- # -- Role/RoleBinding labels
- extraLabels: {}
-
- # -- Role/RoleBinding annotations
- annotations: {}
-
serviceAccount:
# -- Specifies whether a service account should be created
create: true
diff --git a/charts/victoria-metrics-common/CHANGELOG.md b/charts/victoria-metrics-common/CHANGELOG.md
index 29a97bf5f..d5bd92c11 100644
--- a/charts/victoria-metrics-common/CHANGELOG.md
+++ b/charts/victoria-metrics-common/CHANGELOG.md
@@ -4,6 +4,14 @@
- TODO
+## 0.0.14
+
+**Release date:** 2024-10-04
+
+
+
+- Fixed openshift compatibility templates
+
## 0.0.13
**Release date:** 2024-09-16
diff --git a/charts/victoria-metrics-common/Chart.yaml b/charts/victoria-metrics-common/Chart.yaml
index b1f2dbf5b..2a8cdbd71 100644
--- a/charts/victoria-metrics-common/Chart.yaml
+++ b/charts/victoria-metrics-common/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
type: library
description: Victoria Metrics Common - contains shared templates for all Victoria Metrics helm charts
name: victoria-metrics-common
-version: 0.0.13
+version: 0.0.14
sources:
- https://github.com/VictoriaMetrics/helm-charts
kubeVersion: ">=1.23.0-0"
diff --git a/charts/victoria-metrics-common/templates/_pod.tpl b/charts/victoria-metrics-common/templates/_pod.tpl
index 0ddbb8311..05866cffb 100644
--- a/charts/victoria-metrics-common/templates/_pod.tpl
+++ b/charts/victoria-metrics-common/templates/_pod.tpl
@@ -9,9 +9,9 @@
{{- /*
Return true if the detected platform is Openshift
Usage:
-{{- include "vm.compatibility.isOpenshift" . -}}
+{{- include "vm.isOpenshift" . -}}
*/ -}}
-{{- define "vm.compatibility.isOpenshift" -}}
+{{- define "vm.isOpenshift" -}}
{{- $Capabilities := (.helm).Capabilities | default .Capabilities -}}
{{- if $Capabilities.APIVersions.Has "security.openshift.io/v1" -}}
{{- true -}}
@@ -19,23 +19,21 @@ Usage:
{{- end -}}
{{- /*
-Render a compatible securityContext depending on the platform. By default it is maintained as it is. In other platforms like Openshift we remove default user/group values that do not work out of the box with the restricted-v1 SCC
+Render a compatible securityContext depending on the platform.
Usage:
-{{- include "vm.compatibility.renderSecurityContext" (dict "secContext" .Values.containerSecurityContext "helm" $) -}}
+{{- include "vm.securityContext" (dict "securityContext" .Values.containerSecurityContext "helm" .) -}}
*/ -}}
-{{- define "vm.compatibility.renderSecurityContext" -}}
- {{- $adaptedContext := .secContext -}}
+{{- define "vm.securityContext" -}}
+ {{- $securityContext := .securityContext -}}
{{- $Values := (.helm).Values | default .Values -}}
- {{- $adaptSecurityCtx := (((($Values).global).compatibility).openshift).adaptSecurityContext | default "" -}}
- {{- if or (eq $adaptSecurityCtx "force") (and (eq $adaptSecurityCtx "auto") (include "vm.compatibility.isOpenshift" .)) -}}
- {{- /* Remove incompatible user/group values that do not work in Openshift out of the box */ -}}
- {{- $adaptedContext = omit $adaptedContext "fsGroup" "runAsUser" "runAsGroup" -}}
- {{- if not $adaptedContext.seLinuxOptions -}}
- {{- /* If it is an empty object, we remove it from the resulting context because it causes validation issues */ -}}
- {{- $adaptedContext = omit $adaptedContext "seLinuxOptions" -}}
+ {{- $adaptMode := (((($Values).global).compatibility).openshift).adaptSecurityContext | default "" -}}
+ {{- if or (eq $adaptMode "force") (and (eq $adaptMode "auto") (include "vm.isOpenshift" .)) -}}
+ {{- $securityContext = omit $securityContext "fsGroup" "runAsUser" "runAsGroup" -}}
+ {{- if not $securityContext.seLinuxOptions -}}
+ {{- $securityContext = omit $securityContext "seLinuxOptions" -}}
{{- end -}}
{{- end -}}
- {{- omit $adaptedContext "enabled" | toYaml -}}
+ {{- omit $securityContext "enabled" | toYaml -}}
{{- end -}}
{{- /*
diff --git a/charts/victoria-metrics-gateway/CHANGELOG.md b/charts/victoria-metrics-gateway/CHANGELOG.md
index 89d848ea0..ca9e26d83 100644
--- a/charts/victoria-metrics-gateway/CHANGELOG.md
+++ b/charts/victoria-metrics-gateway/CHANGELOG.md
@@ -2,6 +2,15 @@
- TODO
+## 0.5.1
+
+**Release date:** 2024-10-04
+
+
+
+
+- upgraded common chart dependency
+
## 0.5.0
**Release date:** 2024-10-02
diff --git a/charts/victoria-metrics-gateway/Chart.lock b/charts/victoria-metrics-gateway/Chart.lock
index 9882bf130..5df1ff545 100644
--- a/charts/victoria-metrics-gateway/Chart.lock
+++ b/charts/victoria-metrics-gateway/Chart.lock
@@ -1,6 +1,6 @@
dependencies:
- name: victoria-metrics-common
repository: https://victoriametrics.github.io/helm-charts
- version: 0.0.13
-digest: sha256:6d82d9a15a778259efa73e4798f46d461877cea5a8f382b7bf7eb4164fccfc1b
-generated: "2024-10-04T05:49:59.296319676Z"
+ version: 0.0.14
+digest: sha256:8a18703917e7d2fb9b470691d8d30e5fc0921309f09180c7194103933765d9d1
+generated: "2024-10-04T07:50:25.498727924Z"
diff --git a/charts/victoria-metrics-gateway/Chart.yaml b/charts/victoria-metrics-gateway/Chart.yaml
index 04455ab98..736a35647 100644
--- a/charts/victoria-metrics-gateway/Chart.yaml
+++ b/charts/victoria-metrics-gateway/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
type: application
description: Victoria Metrics Gateway - Auth & Rate-Limitting proxy for Victoria Metrics
name: victoria-metrics-gateway
-version: 0.5.0
+version: 0.5.1
appVersion: v1.104.0
sources:
- https://github.com/VictoriaMetrics/helm-charts
diff --git a/charts/victoria-metrics-gateway/README.md b/charts/victoria-metrics-gateway/README.md
index a2eb718bd..dbdc05183 100644
--- a/charts/victoria-metrics-gateway/README.md
+++ b/charts/victoria-metrics-gateway/README.md
@@ -1,4 +1,4 @@
- 
+ 
[](https://artifacthub.io/packages/helm/victoriametrics/victoria-metrics-gateway)
[](https://slack.victoriametrics.com/)
diff --git a/charts/victoria-metrics-gateway/templates/deployment.yaml b/charts/victoria-metrics-gateway/templates/deployment.yaml
index aa748beec..7951016e6 100644
--- a/charts/victoria-metrics-gateway/templates/deployment.yaml
+++ b/charts/victoria-metrics-gateway/templates/deployment.yaml
@@ -51,7 +51,7 @@ spec:
spec:
serviceAccountName: {{ include "chart.serviceAccountName" . }}
{{- if .Values.podSecurityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" .Values.podSecurityContext "context" .) | nindent 8 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" .Values.podSecurityContext "helm" .) | nindent 8 }}
{{- end }}
{{- with (.Values.imagePullSecrets | default .Values.global.imagePullSecrets) }}
imagePullSecrets: {{ toYaml . | nindent 8 }}
@@ -59,7 +59,7 @@ spec:
containers:
- name: vmgateway
{{- if .Values.securityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" .Values.securityContext "context" .) | nindent 12 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" .Values.securityContext "helm" .) | nindent 12 }}
{{- end }}
image: {{ include "vm.image" (merge (deepCopy $global) (dict "app" .Values)) }}
workingDir: {{ .Values.containerWorkingDir }}
diff --git a/charts/victoria-metrics-k8s-stack/CHANGELOG.md b/charts/victoria-metrics-k8s-stack/CHANGELOG.md
index 8fae21578..c15955d8e 100644
--- a/charts/victoria-metrics-k8s-stack/CHANGELOG.md
+++ b/charts/victoria-metrics-k8s-stack/CHANGELOG.md
@@ -1,6 +1,7 @@
## Next release
- Moved crds to a shared chart and import them as a dependency
+- Generate VM components tag version from chart app name by default
## 0.27.0
diff --git a/charts/victoria-metrics-k8s-stack/Chart.lock b/charts/victoria-metrics-k8s-stack/Chart.lock
index e9c2df92a..b67574d61 100644
--- a/charts/victoria-metrics-k8s-stack/Chart.lock
+++ b/charts/victoria-metrics-k8s-stack/Chart.lock
@@ -1,7 +1,7 @@
dependencies:
- name: victoria-metrics-common
repository: https://victoriametrics.github.io/helm-charts
- version: 0.0.13
+ version: 0.0.14
- name: victoria-metrics-operator
repository: https://victoriametrics.github.io/helm-charts
version: 0.35.2
@@ -17,5 +17,5 @@ dependencies:
- name: prometheus-operator-crds
repository: https://prometheus-community.github.io/helm-charts
version: 11.0.0
-digest: sha256:22118e37e481c36e00ed42621f11f3678a759493cfe3bf995a6cef6077f12a0a
-generated: "2024-10-04T06:13:36.78032043Z"
+digest: sha256:fbf342a0a913322e53d81a78d71288f5d222df6c045c76e0cb52ef7a47095eca
+generated: "2024-10-04T07:50:28.359548051Z"
diff --git a/charts/victoria-metrics-k8s-stack/README.md b/charts/victoria-metrics-k8s-stack/README.md
index 0a868a996..d2d699d3a 100644
--- a/charts/victoria-metrics-k8s-stack/README.md
+++ b/charts/victoria-metrics-k8s-stack/README.md
@@ -2159,8 +2159,6 @@ tls: []
extraArgs:
promscrape.dropOriginalLabels: "true"
promscrape.streamParse: "true"
-image:
- tag: v1.104.0
port: "8429"
scrapeInterval: 20s
selectAllByDefault: true
@@ -2252,8 +2250,6 @@ tls: []
externalLabels: {}
extraArgs:
http.pathPrefix: /
-image:
- tag: v1.104.0
port: "8080"
selectAllByDefault: true
@@ -2634,16 +2630,12 @@ port: "8427"
retentionPeriod: "1"
vminsert:
extraArgs: {}
- image:
- tag: v1.104.0-cluster
port: "8480"
replicaCount: 2
resources: {}
vmselect:
cacheMountPath: /select-cache
extraArgs: {}
- image:
- tag: v1.104.0-cluster
port: "8481"
replicaCount: 2
resources: {}
@@ -2654,8 +2646,6 @@ vmselect:
requests:
storage: 2Gi
vmstorage:
- image:
- tag: v1.104.0-cluster
replicaCount: 2
resources: {}
storage:
@@ -2808,8 +2798,6 @@ vmstorage:
| object |
extraArgs: {}
-image:
- tag: v1.104.0
port: "8429"
replicaCount: 1
retentionPeriod: "1"
diff --git a/charts/victoria-metrics-k8s-stack/templates/_helpers.tpl b/charts/victoria-metrics-k8s-stack/templates/_helpers.tpl
index 4429e725e..9d290d9af 100644
--- a/charts/victoria-metrics-k8s-stack/templates/_helpers.tpl
+++ b/charts/victoria-metrics-k8s-stack/templates/_helpers.tpl
@@ -241,6 +241,7 @@ If release name contains chart name it will be used as a full name.
{{- /* VMAlert spec */ -}}
{{- define "vm.alert.spec" -}}
{{- $Values := (.helm).Values | default .Values }}
+ {{- $Chart := (.helm).Chart | default .Chart }}
{{- $extraArgs := dict "remoteWrite.disablePathAppend" "true" -}}
{{- if $Values.vmalert.templateFiles -}}
{{- $ruleTmpl := (printf "/etc/vm/configs/%s-vmalert-extra-tpl/*.tmpl" (include "victoria-metrics-k8s-stack.fullname" .)) -}}
@@ -248,7 +249,7 @@ If release name contains chart name it will be used as a full name.
{{- end -}}
{{- $vmAlertRemotes := (include "vm.alert.remotes" . | fromYaml) -}}
{{- $vmAlertTemplates := (include "vm.alert.templates" . | fromYaml) -}}
- {{- $spec := dict "extraArgs" $extraArgs -}}
+ {{- $spec := dict "extraArgs" $extraArgs "image" (dict "tag" $Chart.AppVersion) -}}
{{- with (include "vm.license.global" .) -}}
{{- $_ := set $spec "license" (fromYaml .) -}}
{{- end -}}
@@ -276,10 +277,12 @@ If release name contains chart name it will be used as a full name.
{{- /* VMAgent spec */ -}}
{{- define "vm.agent.spec" -}}
{{- $Values := (.helm).Values | default .Values }}
+ {{- $Chart := (.helm).Chart | default .Chart }}
{{- $spec := (include "vm.agent.remote.write" . | fromYaml) -}}
{{- with (include "vm.license.global" .) -}}
{{- $_ := set $spec "license" (fromYaml .) -}}
{{- end -}}
+ {{- $_ := set $spec "image" (dict "tag" $Chart.AppVersion) -}}
{{- tpl (deepCopy $Values.vmagent.spec | mergeOverwrite $spec | toYaml) . -}}
{{- end }}
@@ -344,12 +347,13 @@ If release name contains chart name it will be used as a full name.
{{- /* Single spec */ -}}
{{- define "vm.single.spec" -}}
{{- $Values := (.helm).Values | default .Values }}
+ {{- $Chart := (.helm).Chart | default .Chart }}
{{- $extraArgs := default dict -}}
{{- if $Values.vmalert.enabled }}
{{- $ctx := dict "helm" . "appKey" "vmalert" -}}
{{- $_ := set $extraArgs "vmalert.proxyURL" (include "vm.url" $ctx) -}}
{{- end -}}
- {{- $spec := dict "extraArgs" $extraArgs -}}
+ {{- $spec := dict "extraArgs" $extraArgs "image" (dict "tag" $Chart.AppVersion) -}}
{{- with (include "vm.license.global" .) -}}
{{- $_ := set $spec "license" (fromYaml .) -}}
{{- end -}}
@@ -359,18 +363,22 @@ If release name contains chart name it will be used as a full name.
{{- /* Cluster spec */ -}}
{{- define "vm.select.spec" -}}
{{- $Values := (.helm).Values | default .Values }}
+ {{- $Chart := (.helm).Chart | default .Chart }}
{{- $extraArgs := default dict -}}
{{- if $Values.vmalert.enabled -}}
{{- $ctx := dict "helm" . "appKey" "vmalert" -}}
{{- $_ := set $extraArgs "vmalert.proxyURL" (include "vm.url" $ctx) -}}
{{- end -}}
- {{- $spec := dict "extraArgs" $extraArgs -}}
+ {{- $spec := dict "extraArgs" $extraArgs "image" (dict "tag" (printf "%s-cluster" $Chart.AppVersion)) -}}
{{- toYaml $spec -}}
{{- end -}}
{{- define "vm.cluster.spec" -}}
{{- $Values := (.helm).Values | default .Values }}
+ {{- $Chart := (.helm).Chart | default .Chart }}
{{- $spec := (include "vm.select.spec" . | fromYaml) -}}
+ {{- $_ := set $spec "vminsert" (dict "image" (dict "tag" (printf "%s-cluster" $Chart.AppVersion))) -}}
+ {{- $_ := set $spec "vmstorage" (dict "image" (dict "tag" (printf "%s-cluster" $Chart.AppVersion))) -}}
{{- $clusterSpec := (deepCopy $Values.vmcluster.spec) -}}
{{- with (include "vm.license.global" .) -}}
{{- $_ := set $clusterSpec "license" (fromYaml .) -}}
diff --git a/charts/victoria-metrics-k8s-stack/values.yaml b/charts/victoria-metrics-k8s-stack/values.yaml
index 5e34abfd6..5bcc7d7b4 100644
--- a/charts/victoria-metrics-k8s-stack/values.yaml
+++ b/charts/victoria-metrics-k8s-stack/values.yaml
@@ -257,8 +257,6 @@ vmsingle:
# -- Full spec for VMSingle CRD. Allowed values describe [here](https://docs.victoriametrics.com/operator/api#vmsinglespec)
spec:
port: "8429"
- image:
- tag: v1.104.0
# -- Data retention period. Possible units character: h(ours), d(ays), w(eeks), y(ears), if no unit character specified - month. The minimum retention period is 24h. See these [docs](https://docs.victoriametrics.com/single-server-victoriametrics/#retention)
retentionPeriod: "1"
replicaCount: 1
@@ -316,8 +314,6 @@ vmcluster:
retentionPeriod: "1"
replicationFactor: 2
vmstorage:
- image:
- tag: v1.104.0-cluster
replicaCount: 2
storageDataPath: "/vm-data"
storage:
@@ -333,8 +329,6 @@ vmcluster:
# memory: 1500Mi
vmselect:
port: "8481"
- image:
- tag: v1.104.0-cluster
replicaCount: 2
cacheMountPath: "/select-cache"
extraArgs: {}
@@ -354,8 +348,6 @@ vmcluster:
# memory: "500Mi"
vminsert:
port: "8480"
- image:
- tag: v1.104.0-cluster
replicaCount: 2
extraArgs: {}
resources:
@@ -663,8 +655,6 @@ vmalert:
spec:
port: "8080"
selectAllByDefault: true
- image:
- tag: v1.104.0
evaluationInterval: 15s
extraArgs:
http.pathPrefix: "/"
@@ -744,8 +734,6 @@ vmagent:
spec:
port: "8429"
selectAllByDefault: true
- image:
- tag: v1.104.0
scrapeInterval: 20s
externalLabels: {}
# For multi-cluster setups it is useful to use "cluster" label to identify the metrics source.
diff --git a/charts/victoria-metrics-operator/CHANGELOG.md b/charts/victoria-metrics-operator/CHANGELOG.md
index 95dfa99c0..69d769c0c 100644
--- a/charts/victoria-metrics-operator/CHANGELOG.md
+++ b/charts/victoria-metrics-operator/CHANGELOG.md
@@ -2,6 +2,7 @@
- Moved crds to a shared chart and import them as a dependency
- replaced `crd.enabled` property to `crds.plain`. Instead of disabling CRDs it selects if CRDs should be rendered from template or as plain CRDs
+- upgraded common chart dependency
## 0.35.2
diff --git a/charts/victoria-metrics-operator/README.md b/charts/victoria-metrics-operator/README.md
index f33a2df42..3283dcbeb 100644
--- a/charts/victoria-metrics-operator/README.md
+++ b/charts/victoria-metrics-operator/README.md
@@ -673,7 +673,7 @@ labels: {}
| podSecurityContext |
object |
-{}
+enabled: true
|
@@ -790,7 +790,7 @@ view:
securityContext |
object |
-{}
+enabled: true
|
diff --git a/charts/victoria-metrics-operator/templates/deployment.yaml b/charts/victoria-metrics-operator/templates/deployment.yaml
index 95c0d46ce..4eb30c16c 100644
--- a/charts/victoria-metrics-operator/templates/deployment.yaml
+++ b/charts/victoria-metrics-operator/templates/deployment.yaml
@@ -24,8 +24,8 @@ spec:
{{- $_ := set $ctx "extraLabels" .Values.podLabels }}
labels: {{ include "vm-operator.selectorLabels" $ctx | nindent 8}}
spec:
- {{- with .Values.podSecurityContext }}
- securityContext: {{ toYaml . | nindent 8 }}
+ {{- if .Values.podSecurityContext.enabled }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" .Values.podSecurityContext "helm" .) | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "vm-operator.serviceAccountName" . }}
{{- with (.Values.imagePullSecrets | default .Values.global.imagePullSecrets) }}
@@ -119,8 +119,8 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
resources: {{ toYaml .Values.resources | nindent 12 }}
- {{- with .Values.securityContext }}
- securityContext: {{ toYaml . | nindent 12 }}
+ {{- if .Values.securityContext.enabled }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" .Values.securityContext "helm" .) | nindent 12 }}
{{- end }}
{{- with.Values.extraContainers }}
{{- toYaml . | nindent 8 }}
diff --git a/charts/victoria-metrics-operator/values.yaml b/charts/victoria-metrics-operator/values.yaml
index 95b1a1d91..8c2f5b885 100644
--- a/charts/victoria-metrics-operator/values.yaml
+++ b/charts/victoria-metrics-operator/values.yaml
@@ -79,10 +79,12 @@ podLabels: {}
annotations: {}
# -- Pod's security context. Details are [here](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/)
-podSecurityContext: {}
+podSecurityContext:
+ enabled: true
# -- Security context to be added to server pods
-securityContext: {}
+securityContext:
+ enabled: true
operator:
# -- By default, operator converts prometheus-operator objects.
diff --git a/charts/victoria-metrics-single/CHANGELOG.md b/charts/victoria-metrics-single/CHANGELOG.md
index 6697a3983..1ec46da39 100644
--- a/charts/victoria-metrics-single/CHANGELOG.md
+++ b/charts/victoria-metrics-single/CHANGELOG.md
@@ -2,6 +2,15 @@
- TODO
+## 0.12.1
+
+**Release date:** 2024-10-04
+
+
+
+
+- upgraded common chart dependency
+
## 0.12.0
**Release date:** 2024-10-02
diff --git a/charts/victoria-metrics-single/Chart.lock b/charts/victoria-metrics-single/Chart.lock
index 716723c50..9a1c5a0a4 100644
--- a/charts/victoria-metrics-single/Chart.lock
+++ b/charts/victoria-metrics-single/Chart.lock
@@ -1,6 +1,6 @@
dependencies:
- name: victoria-metrics-common
repository: https://victoriametrics.github.io/helm-charts
- version: 0.0.13
-digest: sha256:6d82d9a15a778259efa73e4798f46d461877cea5a8f382b7bf7eb4164fccfc1b
-generated: "2024-10-04T05:50:09.69640125Z"
+ version: 0.0.14
+digest: sha256:8a18703917e7d2fb9b470691d8d30e5fc0921309f09180c7194103933765d9d1
+generated: "2024-10-04T07:50:35.098340221Z"
diff --git a/charts/victoria-metrics-single/Chart.yaml b/charts/victoria-metrics-single/Chart.yaml
index 219ae071e..473dd439b 100644
--- a/charts/victoria-metrics-single/Chart.yaml
+++ b/charts/victoria-metrics-single/Chart.yaml
@@ -3,7 +3,7 @@ type: application
appVersion: v1.104.0
description: Victoria Metrics Single version - high-performance, cost-effective and scalable TSDB, long-term remote storage for Prometheus
name: victoria-metrics-single
-version: 0.12.0
+version: 0.12.1
sources:
- https://github.com/VictoriaMetrics/helm-charts
kubeVersion: ">=1.25.0-0"
diff --git a/charts/victoria-metrics-single/README.md b/charts/victoria-metrics-single/README.md
index db9a43c12..4742f194c 100644
--- a/charts/victoria-metrics-single/README.md
+++ b/charts/victoria-metrics-single/README.md
@@ -1,4 +1,4 @@
- 
+ 
[](https://artifacthub.io/packages/helm/victoriametrics/victoria-metrics-single)
Victoria Metrics Single version - high-performance, cost-effective and scalable TSDB, long-term remote storage for Prometheus
diff --git a/charts/victoria-metrics-single/templates/server-deployment.yaml b/charts/victoria-metrics-single/templates/server-deployment.yaml
index 992f99591..fc5789ad8 100644
--- a/charts/victoria-metrics-single/templates/server-deployment.yaml
+++ b/charts/victoria-metrics-single/templates/server-deployment.yaml
@@ -82,7 +82,7 @@ spec:
containers:
- name: vmsingle
{{- if $app.securityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" $app.securityContext "context" .) | nindent 12 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.securityContext "helm" .) | nindent 12 }}
{{- end }}
image: {{ include "vm.image" (merge (deepCopy $global) (dict "app" $app)) }}
imagePullPolicy: {{ $app.image.pullPolicy }}
@@ -237,7 +237,7 @@ spec:
nodeSelector: {{ toYaml . | nindent 8 }}
{{- end }}
{{- if $app.podSecurityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" $app.podSecurityContext "context" .) | nindent 8 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.podSecurityContext "helm" .) | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "victoria-metrics.serviceAccountName" . }}
{{- with $app.tolerations }}
diff --git a/charts/victoria-metrics-single/templates/server-statefulset.yaml b/charts/victoria-metrics-single/templates/server-statefulset.yaml
index 5016be1eb..bdde9151f 100644
--- a/charts/victoria-metrics-single/templates/server-statefulset.yaml
+++ b/charts/victoria-metrics-single/templates/server-statefulset.yaml
@@ -78,7 +78,7 @@ spec:
containers:
- name: vmsingle
{{- if $app.securityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" $app.securityContext "context" .) | nindent 12 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.securityContext "helm" .) | nindent 12 }}
{{- end }}
image: {{ include "vm.image" (merge (deepCopy $global) (dict "app" $app)) }}
imagePullPolicy: {{ $app.image.pullPolicy }}
@@ -208,7 +208,7 @@ spec:
resources: {{ toYaml . | nindent 12 }}
{{- end }}
{{- if $app.securityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" $app.securityContext "context" .) | nindent 12 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.securityContext "helm" .) | nindent 12 }}
{{- end }}
{{- with $manager.env }}
env: {{ toYaml . | nindent 12 }}
@@ -236,7 +236,7 @@ spec:
nodeSelector: {{ toYaml . | nindent 8 }}
{{- end }}
{{- if $app.podSecurityContext.enabled }}
- securityContext: {{ include "vm.compatibility.renderSecurityContext" (dict "secContext" $app.podSecurityContext "context" .) | nindent 8 }}
+ securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.podSecurityContext "helm" .) | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "victoria-metrics.serviceAccountName" . }}
{{- with $app.tolerations }}
|