Skip to content

Commit

Permalink
fixed templates
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrewChubatiuk committed Oct 4, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 7fb3861 commit a84237d
Showing 4 changed files with 2 additions and 71 deletions.
44 changes: 0 additions & 44 deletions charts/victoria-metrics-cluster/README.md
Original file line number Diff line number Diff line change
@@ -287,50 +287,6 @@ name: ""
</pre>
</td>
<td><p>Print information after deployment</p>
</td>
</tr>
<tr>
<td>rbac.annotations</td>
<td>object</td>
<td><pre class="helm-vars-default-value" language-yaml" lang="plaintext">
<code class="language-yaml">{}
</code>
</pre>
</td>
<td><p>Role/RoleBinding annotations</p>
</td>
</tr>
<tr>
<td>rbac.create</td>
<td>bool</td>
<td><pre class="helm-vars-default-value" language-yaml" lang="">
<code class="language-yaml">true
</code>
</pre>
</td>
<td><p>Enables Role/RoleBinding creation</p>
</td>
</tr>
<tr>
<td>rbac.extraLabels</td>
<td>object</td>
<td><pre class="helm-vars-default-value" language-yaml" lang="plaintext">
<code class="language-yaml">{}
</code>
</pre>
</td>
<td><p>Role/RoleBinding labels</p>
</td>
</tr>
<tr>
<td>rbac.namespaced</td>
<td>bool</td>
<td><pre class="helm-vars-default-value" language-yaml" lang="">
<code class="language-yaml">false
</code>
</pre>
</td>
<td><p>If true and <code>rbac.enabled</code>, will deploy a Role/RoleBinding instead of a ClusterRole/ClusterRoleBinding</p>
</td>
</tr>
<tr>
13 changes: 0 additions & 13 deletions charts/victoria-metrics-cluster/values.yaml
Original file line number Diff line number Diff line change
@@ -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
12 changes: 0 additions & 12 deletions charts/victoria-metrics-k8s-stack/README.md
Original file line number Diff line number Diff line change
@@ -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
</code>
@@ -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:
<td>object</td>
<td><pre class="helm-vars-default-value" language-yaml" lang="plaintext">
<code class="language-yaml">extraArgs: {}
image:
tag: v1.104.0
port: "8429"
replicaCount: 1
retentionPeriod: "1"
4 changes: 2 additions & 2 deletions charts/victoria-metrics-k8s-stack/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -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 .) -}}

0 comments on commit a84237d

Please sign in to comment.