fixed domain

VictoriaMetrics · Sep 14, 2024 · 59f4822 · 59f4822
1 parent 46fd965
commit 59f4822
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/...etrics-cluster/templates/auth-config.yaml → ...rics-cluster/templates/vmauth-config.yaml b/...etrics-cluster/templates/auth-config.yaml → ...rics-cluster/templates/vmauth-config.yaml
@@ -1,4 +1,4 @@
-{{- if empty .Values.vmauth.configSecretName }}
+{{- if and (empty .Values.vmauth.configSecretName) .Values.vmauth.enabled }}
 {{- $ctx := dict "helm" . "appKey" "vmauth" }}
 apiVersion: v1
 kind: Secret

diff --git a/charts/victoria-metrics-cluster/templates/vmauth-deployment.yaml b/charts/victoria-metrics-cluster/templates/vmauth-deployment.yaml
@@ -68,6 +68,8 @@ spec:
           {{- end }}
           {{- if or $app.extraVolumeMounts (include "vm.license.mount" .) }}
           volumeMounts:
+            - name: config
+              mountPath: /config
             {{- with $app.extraVolumeMounts }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
@@ -97,6 +99,9 @@ spec:
       {{- end }}
       {{- if or (and .Values.license.secret.name .Values.license.secret.key) $app.extraVolumes }}
       volumes:
+        - name: config
+          secret:
+            secretName: {{ ternary (include "vm.plain.fullname" $ctx) .Values.configSecretName (empty .Values.configSecretName) }}
         {{- with $app.extraVolumes }}
         {{- toYaml . | nindent 8 }}
         {{- end }}

diff --git a/charts/victoria-metrics-cluster/values.yaml b/charts/victoria-metrics-cluster/values.yaml
@@ -8,9 +8,10 @@ global:
   compatibility:
     openshift:
       adaptSecurityContext: "auto"
+  # -- k8s cluster domain suffix, uses for building storage pods' FQDN. Details are [here](https://kubernetes.io/docs/tasks/administer-cluster/dns-custom-nameservers/)
+  cluster:
+    dnsDomain: cluster.local
 
-# -- k8s cluster domain suffix, uses for building storage pods' FQDN. Details are [here](https://kubernetes.io/docs/tasks/administer-cluster/dns-custom-nameservers/)
-clusterDomainSuffix: cluster.local
 printNotes: true
 
 rbac: