added autoDiscovery flag to disable SRV records discovery for enterpr…

…ise setups
VictoriaMetrics · Sep 22, 2024 · ae04a03 · ae04a03
1 parent 97ae5e1
commit ae04a03
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/charts/victoria-metrics-cluster/README.md b/charts/victoria-metrics-cluster/README.md
@@ -132,6 +132,16 @@ Change the values according to the need of the environment in ``victoria-metrics
     <th class="helm-vars-description">Description</th>
   </thead>
   <tbody>
+    <tr>
+      <td>autoDiscovery</td>
+      <td>bool</td>
+      <td><pre class="helm-vars-default-value" language-yaml" lang="">
+<code class="language-yaml">false
+</code>
+</pre>
+</td>
+      <td></td>
+    </tr>
     <tr>
       <td>clusterDomainSuffix</td>
       <td>string</td>

diff --git a/charts/victoria-metrics-cluster/templates/_helpers.tpl b/charts/victoria-metrics-cluster/templates/_helpers.tpl
@@ -100,7 +100,7 @@ app: {{ $Values.vmauth.name | default "vmauth" }}
   {{- if and (not $app.suppressStorageFQDNsRender) (and $storage.enabled $storage.replicaCount) }}
     {{- $storageNodes := default list }}
     {{- $fqdn := include "vm.fqdn" . }}
-    {{- if eq (include "vm.enterprise.disabled" . ) "false" }}
+    {{- if and $Values.autoDiscovery (eq (include "vm.enterprise.disabled" . ) "false") }}
       {{- $storageNode := printf "srv+_vminsert._tcp.%s" $fqdn }}
       {{- $storageNodes = append $storageNodes $storageNode }}
     {{- else }}
@@ -143,7 +143,7 @@ app: {{ $Values.vmauth.name | default "vmauth" }}
   {{- if and (not $app.suppressStorageFQDNsRender) (and $storage.enabled $storage.replicaCount) }}
     {{- $storageNodes := default list }}
     {{- $fqdn := include "vm.fqdn" . }}
-    {{- if eq (include "vm.enterprise.disabled" . ) "false" }}
+    {{- if and $Values.autoDiscovery (eq (include "vm.enterprise.disabled" . ) "false") }}
       {{- $storageNode := printf "srv+_vmselect._tcp.%s" $fqdn }}
       {{- $storageNodes = append $storageNodes $storageNode }}
     {{- else }}
@@ -161,7 +161,7 @@ app: {{ $Values.vmauth.name | default "vmauth" }}
     {{- $selectNodes := default list }}
     {{- $_ := set . "appKey" "vmselect" }}
     {{- $fqdn := include "vm.fqdn" . }}
-    {{- if eq (include "vm.enterprise.disabled" . ) "false" }}
+    {{- if and $Values.autoDiscovery (eq (include "vm.enterprise.disabled" . ) "false") }}
       {{- $selectNode := printf "srv+_http._tcp.%s" $fqdn }}
       {{- $selectNodes = append $selectNodes $selectNode }}
     {{- else }}

diff --git a/charts/victoria-metrics-cluster/values.yaml b/charts/victoria-metrics-cluster/values.yaml
@@ -19,6 +19,9 @@ global:
 clusterDomainSuffix: cluster.local
 printNotes: true
 
+# use SRV discovery for storageNode and selectNode flags for enterprise version
+autoDiscovery: false
+
 rbac:
   # -- Enables Role/RoleBinding creation
   create: true