updated ports and urls

VictoriaMetrics · Sep 23, 2024 · d4bc969 · d4bc969
1 parent a7e2630
commit d4bc969
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 23 deletions.
diff --git a/charts/victoria-metrics-distributed/README.md b/charts/victoria-metrics-distributed/README.md
@@ -304,7 +304,7 @@ topologySpreadConstraints:
       <td>availabilityZones[0].read.crossZone.vmauth.spec</td>
       <td>object</td>
       <td><pre class="helm-vars-default-value" language-yaml" lang="plaintext">
-<code class="language-yaml">{}
+<code class="language-yaml">port: "8427"
 </code>
 </pre>
 </td>
@@ -339,6 +339,7 @@ topologySpreadConstraints:
       <td><pre class="helm-vars-default-value" language-yaml" lang="plaintext">
 <code class="language-yaml">extraArgs:
     discoverBackendIPs: "true"
+port: "8427"
 </code>
 </pre>
 </td>
@@ -382,7 +383,7 @@ topologySpreadConstraints:
       <td>availabilityZones[0].vmagent.spec</td>
       <td>object</td>
       <td><pre class="helm-vars-default-value" language-yaml" lang="plaintext">
-<code class="language-yaml">{}
+<code class="language-yaml">port: "8429"
 </code>
 </pre>
 </td>
@@ -419,10 +420,12 @@ topologySpreadConstraints:
 retentionPeriod: "14"
 vminsert:
     extraArgs: {}
+    port: "8480"
     replicaCount: 2
     resources: {}
 vmselect:
     extraArgs: {}
+    port: "8481"
     replicaCount: 2
     resources: {}
 vmstorage:
@@ -474,6 +477,7 @@ vmstorage:
       <td><pre class="helm-vars-default-value" language-yaml" lang="plaintext">
 <code class="language-yaml">extraArgs:
     discoverBackendIPs: "true"
+port: "8427"
 </code>
 </pre>
 </td>
@@ -545,7 +549,7 @@ topologySpreadConstraints:
       <td>availabilityZones[1].read.crossZone.vmauth.spec</td>
       <td>object</td>
       <td><pre class="helm-vars-default-value" language-yaml" lang="plaintext">
-<code class="language-yaml">{}
+<code class="language-yaml">port: "8427"
 </code>
 </pre>
 </td>
@@ -580,6 +584,7 @@ topologySpreadConstraints:
       <td><pre class="helm-vars-default-value" language-yaml" lang="plaintext">
 <code class="language-yaml">extraArgs:
     discoverBackendIPs: "true"
+port: "8427"
 </code>
 </pre>
 </td>
@@ -623,7 +628,7 @@ topologySpreadConstraints:
       <td>availabilityZones[1].vmagent.spec</td>
       <td>object</td>
       <td><pre class="helm-vars-default-value" language-yaml" lang="plaintext">
-<code class="language-yaml">{}
+<code class="language-yaml">port: "8429"
 </code>
 </pre>
 </td>
@@ -660,10 +665,12 @@ topologySpreadConstraints:
 retentionPeriod: "14"
 vminsert:
     extraArgs: {}
+    port: "8480"
     replicaCount: 2
     resources: {}
 vmselect:
     extraArgs: {}
+    port: "8481"
     replicaCount: 2
     resources: {}
 vmstorage:
@@ -715,6 +722,7 @@ vmstorage:
       <td><pre class="helm-vars-default-value" language-yaml" lang="plaintext">
 <code class="language-yaml">extraArgs:
     discoverBackendIPs: "true"
+port: "8427"
 </code>
 </pre>
 </td>
@@ -733,6 +741,16 @@ vmstorage:
       <td><p>Common VMAgent spec, which can be overriden by each VMAgent configuration. Available parameters can be found <a href="https://docs.victoriametrics.com/operator/api/index.html#vmagentspec" target="_blank">here</a></p>
 </td>
     </tr>
+    <tr>
+      <td>common.vmauth.spec</td>
+      <td>object</td>
+      <td><pre class="helm-vars-default-value" language-yaml" lang="plaintext">
+<code class="language-yaml">{}
+</code>
+</pre>
+</td>
+      <td></td>
+    </tr>
     <tr>
       <td>common.vmcluster.spec</td>
       <td>object</td>
@@ -832,7 +850,7 @@ spec:
       <td>read.global.vmauth.spec</td>
       <td>object</td>
       <td><pre class="helm-vars-default-value" language-yaml" lang="plaintext">
-<code class="language-yaml">{}
+<code class="language-yaml">port: "8427"
 </code>
 </pre>
 </td>
@@ -895,7 +913,7 @@ vmsingle:
       <td>write.global.vmauth.spec</td>
       <td>object</td>
       <td><pre class="helm-vars-default-value" language-yaml" lang="plaintext">
-<code class="language-yaml">{}
+<code class="language-yaml">port: "8427"
 </code>
 </pre>
 </td>

diff --git a/charts/victoria-metrics-distributed/templates/extra-vmagent.yaml b/charts/victoria-metrics-distributed/templates/extra-vmagent.yaml
@@ -8,7 +8,7 @@ metadata:
   name: {{ .Values.extraVMAgent.name }}
   namespace: {{ include "vm.namespace" . }}
 {{- $spec := (deepCopy .Values.extraVMAgent.spec) }}
-{{- $remoteWrites := list (dict "url" (printf "%s/prometheus/api/v1/write" (include "vm.url" $ctx))) }}
+{{- $remoteWrites := list (dict "url" (printf "%s/prometheus/api/v1/write" (trimSuffix "/" (include "vm.url" $ctx)))) }}
 {{- $_ := set $spec "remoteWrite" (concat $remoteWrites ($spec.remoteWrite | default list)) }}
 spec: {{ tpl (toYaml $spec) . | nindent 2 }}
 {{- end }}
diff --git a/charts/victoria-metrics-distributed/templates/grafana-datasource.yaml b/charts/victoria-metrics-distributed/templates/grafana-datasource.yaml
@@ -1,6 +1,6 @@
 {{ if and .Values.read.global.vmauth.enabled (index .Values "victoria-metrics-k8s-stack" "grafana" "enabled") }}
 {{- $ctx := dict "helm" . "appKey" (list "read" "global" "vmauth") "prefix" "read-global" "style" "managed" }}
-{{- $url := (printf "%s/select/0/prometheus/" (include "vm.url" $ctx)) }}
+{{- $url := (printf "%s/select/0/prometheus/" (trimSuffix "/" (include "vm.url" $ctx))) }}
 ---
 apiVersion: v1
 kind: ConfigMap

diff --git a/charts/victoria-metrics-distributed/templates/per-az/vmauth-read-balancer.yaml b/charts/victoria-metrics-distributed/templates/per-az/vmauth-read-balancer.yaml
@@ -13,7 +13,7 @@ metadata:
   {{- with $zone.read.perZone.vmauth.annotations }}
   annotations: {{ toYaml . | nindent 4 }}
   {{- end  }}
-{{- $spec := mergeOverwrite (deepCopy (($zone.common).spec)) (deepCopy (((($zone.read).perZone).vmauth).spec)) }}
+{{- $spec := mergeOverwrite (deepCopy $.Values.common.vmauth.spec) (deepCopy (($zone.common).spec)) (deepCopy (((($zone.read).perZone).vmauth).spec)) }}
 spec: {{ toYaml (omit $spec "unauthorizedAccessConfig") | nindent 2 }}
   unauthorizedAccessConfig:
   - src_paths:

diff --git a/charts/victoria-metrics-distributed/templates/per-az/vmauth-read-proxy.yaml b/charts/victoria-metrics-distributed/templates/per-az/vmauth-read-proxy.yaml
@@ -13,7 +13,7 @@ metadata:
   {{- with $zone.read.crossZone.vmauth.annotations }}
   annotations: {{ toYaml . | nindent 4 }}
   {{- end }}
-{{- $spec := mergeOverwrite (deepCopy (($zone.common).spec)) (deepCopy (((($zone.read).crossZone).vmauth).spec)) }}
+{{- $spec := mergeOverwrite (deepCopy $.Values.common.vmauth.spec) (deepCopy (($zone.common).spec)) (deepCopy (((($zone.read).crossZone).vmauth).spec)) }}
 spec: {{ toYaml (omit $spec "unauthorizedAccessConfig") | nindent 2 }}
   unauthorizedAccessConfig:
   - src_paths:

diff --git a/charts/victoria-metrics-distributed/templates/per-az/vmauth-write-balancer.yaml b/charts/victoria-metrics-distributed/templates/per-az/vmauth-write-balancer.yaml
@@ -14,7 +14,7 @@ metadata:
   annotations: {{ toYaml . | nindent 4 }}
   {{- end  }}
 {{- $spec := $zone.spec | default dict }}
-{{- $spec = merge (deepCopy $spec) (deepCopy $zone.write.vmauth.spec) }}
+{{- $spec = merge (deepCopy $.Values.common.vmauth.spec) (deepCopy $spec) (deepCopy $zone.write.vmauth.spec) }}
 spec: {{ toYaml (omit $spec "unauthorizedAccessConfig") | nindent 2 }}
   {{- $_ := set $ctx "style" "managed" }}
   {{- $_ := set $ctx "appKey" (list "availabilityZones" $i "vmcluster" "spec" "vminsert") }}

diff --git a/charts/victoria-metrics-distributed/templates/vmauth-read.yaml b/charts/victoria-metrics-distributed/templates/vmauth-read.yaml
@@ -11,7 +11,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end  }}
-{{- $spec := .Values.read.global.vmauth.spec }}
+{{- $spec := mergeOverwrite (deepCopy .Values.common.vmauth.spec) (deepCopy .Values.read.global.vmauth.spec) }}
 spec:
   {{- with (omit $spec "unauthorizedAccessConfig") }}
   {{- toYaml . | nindent 2 }}

diff --git a/charts/victoria-metrics-distributed/templates/vmauth-write.yaml b/charts/victoria-metrics-distributed/templates/vmauth-write.yaml
@@ -10,7 +10,7 @@ metadata:
   {{- with .Values.write.global.vmauth.annotations }}
   annotations: {{ toYaml . | nindent 4 }}
   {{- end  }}
-{{- $spec := .Values.write.global.vmauth.spec }}
+{{- $spec := mergeOverwrite (deepCopy .Values.common.vmauth.spec) (deepCopy .Values.write.global.vmauth.spec) }}
 spec:
   {{- with (omit $spec "unauthorizedAccessConfig") }}
   {{- toYaml . | nindent 2 }}

diff --git a/charts/victoria-metrics-distributed/values.yaml b/charts/victoria-metrics-distributed/values.yaml
@@ -8,6 +8,8 @@ fullnameOverride: ""
 global: {}
 
 common:
+  vmauth:
+    spec: {}
   vmagent:
     # -- Common VMAgent spec, which can be overriden by each VMAgent configuration.
     # Available parameters can be found [here](https://docs.victoriametrics.com/operator/api/index.html#vmagentspec)
@@ -32,7 +34,8 @@ write:
       # -- Override the name of the vmauth object
       name: ""
       # -- Spec for VMAuth CRD, see [here](https://docs.victoriametrics.com/operator/api#vmauthspec)
-      spec: {}
+      spec:
+        port: "8427"
 
 read:
   global:
@@ -42,7 +45,8 @@ read:
       # -- Override the name of the vmauth object
       name: ""
       # -- Spec for VMAuth CRD, see [here](https://docs.victoriametrics.com/operator/api#vmauthspec)
-      spec: {}
+      spec:
+        port: "8427"
 
 # Config per availability zone components, including vmagent, vmcluster, vmauth etc
 availabilityZones:
@@ -80,6 +84,7 @@ availabilityZones:
         name: ""
         # -- Spec for VMAuth CRD, see [here](https://docs.victoriametrics.com/operator/api#vmauthspec)
         spec:
+          port: "8427"
           extraArgs:
             # vmauth discovers backend IPs via periodic DNS queries,
             # and performs load balancing between vminsert instances
@@ -96,6 +101,7 @@ availabilityZones:
           name: ""
           # -- Spec for VMAuth CRD, see [here](https://docs.victoriametrics.com/operator/api#vmauthspec)
           spec:
+            port: "8427"
             extraArgs:
               discoverBackendIPs: "true"
       crossZone:
@@ -105,7 +111,8 @@ availabilityZones:
           # -- Override the name of the vmauth object
           name: ""
           # -- Spec for VMAuth CRD, see [here](https://docs.victoriametrics.com/operator/api#vmauthspec)
-          spec: {}
+          spec:
+            port: "8427"
     # vmagent here only meant to proxy write requests to each az,
     # doesn't support customized other remote write address.
     vmagent:
@@ -116,7 +123,8 @@ availabilityZones:
       # -- VMAgent remote write proxy annotations
       annotations: {}
       # -- Spec for VMAgent CRD, see [here](https://docs.victoriametrics.com/operator/api#vmagentspec)
-      spec: {}
+      spec:
+        port: "8429"
     vmcluster:
       # -- Create VMCluster
       enabled: true
@@ -133,11 +141,12 @@ availabilityZones:
         vmselect:
           replicaCount: 2
           extraArgs: {}
-          resources:
-            {}
+          port: "8481"
+          resources: {}
         vminsert:
           replicaCount: 2
           extraArgs: {}
+          port: "8480"
           resources: {}
   - 
     # -- Availability zone name
@@ -173,6 +182,7 @@ availabilityZones:
         name: ""
         # -- Spec for VMAuth CRD, see [here](https://docs.victoriametrics.com/operator/api#vmauthspec)
         spec:
+          port: "8427"
           extraArgs:
             # vmauth discovers backend IPs via periodic DNS queries,
             # and performs load balancing between vminsert instances
@@ -189,6 +199,7 @@ availabilityZones:
           name: ""
           # -- Spec for VMAuth CRD, see [here](https://docs.victoriametrics.com/operator/api#vmauthspec)
           spec:
+            port: "8427"
             extraArgs:
               discoverBackendIPs: "true"
       crossZone:
@@ -198,7 +209,8 @@ availabilityZones:
           # -- Override the name of the vmauth object
           name: ""
           # -- Spec for VMAuth CRD, see [here](https://docs.victoriametrics.com/operator/api#vmauthspec)
-          spec: {}
+          spec:
+            port: "8427"
     # vmagent here only meant to proxy write requests to each az,
     # doesn't support customized other remote write address.
     vmagent:
@@ -209,7 +221,8 @@ availabilityZones:
       # -- VMAgent remote write proxy annotations
       annotations: {}
       # -- Spec for VMAgent CRD, see [here](https://docs.victoriametrics.com/operator/api#vmagentspec)
-      spec: {}
+      spec:
+        port: "8429"
     vmcluster:
       # -- Create VMCluster
       enabled: true
@@ -226,11 +239,12 @@ availabilityZones:
         vmselect:
           replicaCount: 2
           extraArgs: {}
-          resources:
-            {}
+          port: "8481"
+          resources: {}
         vminsert:
           replicaCount: 2
           extraArgs: {}
+          port: "8480"
           resources: {}