chore(charts): simplify the connection controller

Author: duanhongyi

charts/victoriametrics/templates/victoriametrics/vmagent/vmagent-configmap.yaml

@@ -24,7 +24,7 @@ data:
           - role: node
         relabel_configs:
           - target_label: __address__
-            replacement: drycc-controller-api.{{.Release.Namespace}}.svc.{{.Values.global.clusterDomain}}:80
+            replacement: drycc-controller-api:80
           - source_labels: [__meta_kubernetes_node_name]
             regex: (.+)
             target_label: __metrics_path__
@@ -36,7 +36,7 @@ data:
           - role: node
         relabel_configs:
           - target_label: __address__
-            replacement: drycc-controller-api.{{.Release.Namespace}}.svc.{{.Values.global.clusterDomain}}:80
+            replacement: drycc-controller-api:80
           - source_labels: [__meta_kubernetes_node_name]
             regex: (.+)
             target_label: __metrics_path__
@@ -132,7 +132,7 @@ data:
               ]
             separator: ;
             regex: (.+);(.+)
-            replacement: $1.$2.svc.cluster.local
+            replacement: $1.$2.svc
             target_label: __address__
           - source_labels:
               [
@@ -142,7 +142,7 @@ data:
               ]
             separator: ;
             regex: (.+);(.+);(\d+)
-            replacement: $1.$2.svc.cluster.local:$3
+            replacement: $1.$2.svc:$3
             target_label: __address__
       - job_name: "kubernetes-service-endpoints"
         honor_labels: true

charts/victoriametrics/templates/victoriametrics/vmagent/vmagent-statefulset.yaml

@@ -30,10 +30,8 @@ spec:
         args:
         - netcat
         - -v
-        - -a
-        - $(DRYCC_CONTROLLER_API_SERVICE_HOST):$(DRYCC_CONTROLLER_API_SERVICE_PORT)
-        - -a
-        - {{ printf "drycc-victoriametrics-vminsert.%s.svc.%s:8480" $.Release.Namespace $.Values.global.clusterDomain }}
+        - -u
+        - http://drycc-controller-api,http://drycc-victoriametrics-vminsert:8480
       containers:
       - name: drycc-victoriametrics-vmagent
         image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/victoriametrics:{{.Values.imageTag}}
@@ -44,7 +42,7 @@ spec:
         {{- else }}
         args:
         - vmagent
-        - --remoteWrite.url={{ printf "http://drycc-victoriametrics-vminsert.%s.svc.%s:8480/insert/multitenant/prometheus/api/v1/write" $.Release.Namespace $.Values.global.clusterDomain }}
+        - --remoteWrite.url=http://drycc-victoriametrics-vminsert:8480/insert/multitenant/prometheus/api/v1/write
         - --remoteWrite.tmpDataPath=/data
         - --httpListenAddr=:8429
         - --promscrape.config=/opt/drycc/victoriametrics/config/prometheus.yaml

charts/victoriametrics/templates/victoriametrics/vminsert/vminsert-deployment.yaml

@@ -1,7 +1,7 @@
 {{- $replicas := .Values.vmstorage.replicas | int -}}
 {{- $endpoints := list -}}
 {{- range $i := until $replicas -}}
-  {{- $endpoint := printf "drycc-victoriametrics-vmstorage-%d.drycc-victoriametrics-vmstorage.%s.svc.%s:8400" $i $.Release.Namespace $.Values.global.clusterDomain -}}
+  {{- $endpoint := printf "drycc-victoriametrics-vmstorage-%d.drycc-victoriametrics-vmstorage:8400" $i -}}
   {{- $endpoints = append $endpoints $endpoint -}}
 {{- end -}}
 {{- $storageNodes := join "," $endpoints -}}

charts/victoriametrics/templates/victoriametrics/vmselect/vmselect-deployment.yaml

@@ -1,7 +1,7 @@
 {{- $replicas := .Values.vmstorage.replicas | int -}}
 {{- $endpoints := list -}}
 {{- range $i := until $replicas -}}
-  {{- $endpoint := printf "drycc-victoriametrics-vmstorage-%d.drycc-victoriametrics-vmstorage.%s.svc.%s:8401" $i $.Release.Namespace $.Values.global.clusterDomain -}}
+  {{- $endpoint := printf "drycc-victoriametrics-vmstorage-%d.drycc-victoriametrics-vmstorage:8401" $i -}}
   {{- $endpoints = append $endpoints $endpoint -}}
 {{- end -}}
 {{- $storageNodes := join "," $endpoints -}}

charts/victoriametrics/values.yaml

@@ -216,13 +216,3 @@ kubeStateMetrics:
     - storageclasses
     - validatingwebhookconfigurations
     - volumeattachments
-    # - verticalpodautoscalers # not a default resource, see also: https://github.com/kubernetes/kube-state-metrics#enabling-verticalpodautoscalers
-
-global:
-  # Admin email, used for each component to send email to administrator
-  email: "drycc@drycc.cc"
-  # A domain name consists of one or more parts.
-  # Periods (.) are used to separate these parts.
-  # Each part must be 1 to 63 characters in length and can contain lowercase letters, digits, and hyphens (-).
-  # It must start and end with a lowercase letter or digit.
-  clusterDomain: "cluster.local"