feat(k8s): add k8s cluster domain

Author: duanhongyi

charts/monitor/templates/monitor-grafana-deployment.yaml

@@ -68,6 +68,8 @@ spec:
           value: {{.Values.grafana.user}}
         - name: "DEFAULT_USER_PASSWORD"
           value: {{.Values.grafana.password}}
+        - name: "KUBERNETES_CLUSTER_DOMAIN"
+          value: {{.Values.global.cluster_domain}}
         {{- range $key, $value := .Values.grafana.environment }}
         - name: {{ $key }}
           value: {{ $value | quote }}

charts/monitor/templates/monitor-telegraf-deployment.yaml

@@ -76,19 +76,19 @@ spec:
           - name: "AGENT_BUFFER_LIMIT"
             value: "100000"
           - name: "NSQ_CONSUMER_SERVERS"
-            value: "[{{range $i := until $nsqdNodeCount}}\"drycc-nsqd-{{$i}}.drycc-nsqd.{{ $.Release.Namespace }}.svc.cluster.local:{{$.Values.nsqd.tcp_port}}\"{{if lt (add 1 $i) $nsqdNodeCount}}, {{end}}{{end}}]"
+            value: "[{{range $i := until $nsqdNodeCount}}\"drycc-nsqd-{{$i}}.drycc-nsqd.{{$.Release.Namespace}}.svc.{{$.Values.global.cluster_domain}}:{{$.Values.nsqd.tcp_port}}\"{{if lt (add 1 $i) $nsqdNodeCount}}, {{end}}{{end}}]"
           - name: "NSQ_CONSUMER_TOPIC"
             value: "metrics"
           - name: "NSQ_ENDPOINTS"
-            value: "[{{range $i := until $nsqdNodeCount}}\"http://drycc-nsqd-{{$i}}.drycc-nsqd.{{ $.Release.Namespace }}.svc.cluster.local:{{$.Values.nsqd.http_port}}\"{{if lt (add 1 $i) $nsqdNodeCount}}, {{end}}{{end}}]"
+            value: "[{{range $i := until $nsqdNodeCount}}\"http://drycc-nsqd-{{$i}}.drycc-nsqd.{{$.Release.Namespace}}.svc.{{$.Values.global.cluster_domain}}:{{$.Values.nsqd.http_port}}\"{{if lt (add 1 $i) $nsqdNodeCount}}, {{end}}{{end}}]"
 {{- if ne .Values.global.logger_redis_location "off-cluster" }}
           - name: DRYCC_LOGGER_REDIS_PASSWORD
             valueFrom:
               secretKeyRef:
                 name: logger-redis-creds
                 key: password
           - name: "REDIS_SERVERS"
-            value: "[{{range $i := until $redisNodeCount}}\":$(DRYCC_LOGGER_REDIS_PASSWORD)@drycc-logger-redis-{{$i}}.drycc-logger-redis.{{ $.Release.Namespace }}.svc.cluster.local:{{$.Values.redis.port}}\"{{if lt (add 1 $i) $redisNodeCount}}, {{end}}{{end}}]"
+            value: "[{{range $i := until $redisNodeCount}}\":$(DRYCC_LOGGER_REDIS_PASSWORD)@drycc-logger-redis-{{$i}}.drycc-logger-redis.{{$.Release.Namespace}}.svc.{{$.Values.global.cluster_domain}}:{{$.Values.redis.port}}\"{{if lt (add 1 $i) $redisNodeCount}}, {{end}}{{end}}]"
           volumeMounts:
           - name: logger-redis-creds
             mountPath: /var/run/secrets/drycc/redis/creds

charts/monitor/values.yaml

@@ -68,6 +68,11 @@ global:
   # Role-Based Access Control for Kubernetes >= 1.5
   use_rbac: false
   ingress_class: ""
+  # 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.
+  cluster_domain: "cluster.local"
   # The public resolvable hostname to build your cluster with.
   #
   # This will be the hostname that is used to build endpoints such as "drycc.$HOSTNAME"

grafana/rootfs/usr/share/grafana/start-grafana

@@ -8,7 +8,7 @@ GRAFANA_USER=${DEFAULT_USER:-admin}
 GRAFANA_PASSWD=${DEFAULT_USER_PASSWORD:-admin}
 GRAFANA_PORT=${BIND_PORT:-3000}
 
-INFLUXDB_HOST=${DRYCC_MONITOR_INFLUXDB_SERVICE_HOST:-"drycc-monitor-influxdb.drycc.svc.cluster.local"}
+INFLUXDB_HOST=${DRYCC_MONITOR_INFLUXDB_SERVICE_HOST:-"drycc-monitor-influxdb.drycc.svc.${KUBERNETES_CLUSTER_DOMAIN}"}
 INFLUXDB_PORT=${DRYCC_MONITOR_INFLUXDB_SERVICE_PORT_TRANSPORT:-8086}
 INFLUXDB_DATABASE=${INFLUXDB_DATABASE:-kubernetes}
 INFLUXDB_USER=${INFLUXDB_USER:-admin}