diff --git a/charts/victoria-metrics-cluster/README.md b/charts/victoria-metrics-cluster/README.md
index 7055fc949..0817ae337 100644
--- a/charts/victoria-metrics-cluster/README.md
+++ b/charts/victoria-metrics-cluster/README.md
@@ -287,50 +287,6 @@ name: ""
Print information after deployment
- |
-
-
- rbac.annotations |
- object |
-
-{}
-
-
- |
- Role/RoleBinding annotations
- |
-
-
- rbac.create |
- bool |
-
-true
-
-
- |
- Enables Role/RoleBinding creation
- |
-
-
- rbac.extraLabels |
- object |
-
-{}
-
-
- |
- Role/RoleBinding labels
- |
-
-
- rbac.namespaced |
- bool |
-
-false
-
-
- |
- If true and rbac.enabled , will deploy a Role/RoleBinding instead of a ClusterRole/ClusterRoleBinding
|
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-k8s-stack/README.md b/charts/victoria-metrics-k8s-stack/README.md
index b3ddb8c17..8059ced37 100644
--- a/charts/victoria-metrics-k8s-stack/README.md
+++ b/charts/victoria-metrics-k8s-stack/README.md
@@ -2164,8 +2164,6 @@ tls: []
extraArgs:
promscrape.dropOriginalLabels: "true"
promscrape.streamParse: "true"
-image:
- tag: v1.104.0
port: "8429"
scrapeInterval: 20s
selectAllByDefault: true
@@ -2257,8 +2255,6 @@ tls: []
externalLabels: {}
extraArgs:
http.pathPrefix: /
-image:
- tag: v1.104.0
port: "8080"
selectAllByDefault: true
@@ -2639,16 +2635,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: {}
@@ -2659,8 +2651,6 @@ vmselect:
requests:
storage: 2Gi
vmstorage:
- image:
- tag: v1.104.0-cluster
replicaCount: 2
resources: {}
storage:
@@ -2813,8 +2803,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 1bdfd4453..a7e80c964 100644
--- a/charts/victoria-metrics-k8s-stack/templates/_helpers.tpl
+++ b/charts/victoria-metrics-k8s-stack/templates/_helpers.tpl
@@ -377,8 +377,8 @@ If release name contains chart name it will be used as a full name.
{{- $Values := (.helm).Values | default .Values }}
{{- $Chart := (.helm).Chart | default .Chart }}
{{- $spec := (include "vm.select.spec" . | fromYaml) -}}
- {{- $_ := set $spec.vminsert.image.tag (printf "%s-cluster" $Chart.AppVersion) -}}
- {{- $_ := set $spec.vmstorage.image.tag (printf "%s-cluster" $Chart.AppVersion) -}}
+ {{- $_ := set $spec.vminsert "image" (dict "tag" (printf "%s-cluster" $Chart.AppVersion)) -}}
+ {{- $_ := set $spec.vmstorage "image" (dict "tag" (printf "%s-cluster" $Chart.AppVersion)) -}}
{{- $clusterSpec := (deepCopy $Values.vmcluster.spec) -}}
{{- with (include "vm.license.global" .) -}}
{{- $_ := set $clusterSpec "license" (fromYaml .) -}}
|