Skip to content

Commit

Permalink
minor fix
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrewChubatiuk committed Sep 24, 2024
1 parent 2be65e4 commit d478a24
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
2 changes: 1 addition & 1 deletion charts/victoria-metrics-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ name: ""
</code>
</pre>
</td>
<td><p>Enable deployment of vmauth component. Deployment is used</p>
<td><p>Enable deployment of vmauth component. With vmauth enabled please set <code>service.clusterIP: None</code> and <code>service.type: ClusterIP</code> for <code>vminsert</code> and <code>vmselect</code> to use vmauth balancing benefits.</p>
</td>
</tr>
<tr>
Expand Down
15 changes: 12 additions & 3 deletions charts/victoria-metrics-cluster/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ app: {{ $Values.vmauth.name | default "vmauth" }}
{{- if and (not $app.suppressStorageFQDNsRender) (and $storage.enabled $storage.replicaCount) }}
{{- $storageNodes := default list }}
{{- $fqdn := include "vm.fqdn" . }}
{{- if and $Values.autoDiscovery (eq (include "vm.enterprise.disabled" . ) "false") }}
{{- if $Values.autoDiscovery }}
{{- if (include "vm.enterprise.disabled" . ) "true" }}
{{- fail "SRV autodiscovery is only supported in enterprise. Either define license or set `autoDiscovery` to `false`" }}
{{- end }}
{{- $storageNode := printf "srv+_vminsert._tcp.%s" $fqdn }}
{{- $storageNodes = append $storageNodes $storageNode }}
{{- else }}
Expand Down Expand Up @@ -143,7 +146,10 @@ app: {{ $Values.vmauth.name | default "vmauth" }}
{{- if and (not $app.suppressStorageFQDNsRender) (and $storage.enabled $storage.replicaCount) }}
{{- $storageNodes := default list }}
{{- $fqdn := include "vm.fqdn" . }}
{{- if and $Values.autoDiscovery (eq (include "vm.enterprise.disabled" . ) "false") }}
{{- if $Values.autoDiscovery }}
{{- if (include "vm.enterprise.disabled" . ) "true" }}
{{- fail "SRV autodiscovery is only supported in enterprise. Either define license or set `autoDiscovery` to `false`" }}
{{- end }}
{{- $storageNode := printf "srv+_vmselect._tcp.%s" $fqdn }}
{{- $storageNodes = append $storageNodes $storageNode }}
{{- else }}
Expand All @@ -161,7 +167,10 @@ app: {{ $Values.vmauth.name | default "vmauth" }}
{{- $selectNodes := default list }}
{{- $_ := set . "appKey" "vmselect" }}
{{- $fqdn := include "vm.fqdn" . }}
{{- if and $Values.autoDiscovery (eq (include "vm.enterprise.disabled" . ) "false") }}
{{- if $Values.autoDiscovery }}
{{- if (include "vm.enterprise.disabled" . ) "true" }}
{{- fail "SRV autodiscovery is only supported in enterprise. Either define license or set `autoDiscovery` to `false`" }}
{{- end }}
{{- $selectNode := printf "srv+_http._tcp.%s" $fqdn }}
{{- $selectNodes = append $selectNodes $selectNode }}
{{- else }}
Expand Down
3 changes: 2 additions & 1 deletion charts/victoria-metrics-cluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,8 @@ vminsert:
metricRelabelings: []

vmauth:
# -- Enable deployment of vmauth component. Deployment is used
# -- Enable deployment of vmauth component.
# With vmauth enabled please set `service.clusterIP: None` and `service.type: ClusterIP` for `vminsert` and `vmselect` to use vmauth balancing benefits.
enabled: false
# -- VMAuth container name
name: ""
Expand Down

0 comments on commit d478a24

Please sign in to comment.