chore(monitor): unified reids declaration

Author: duanhongyi

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

@@ -26,7 +26,7 @@ spec:
       serviceAccount: drycc-monitor-telegraf
       initContainers:
       - name: drycc-monitor-telegraf-init
-        image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/python-dev:latest
+        image: {{.Values.imageRegistry}}/{{.Values.telegraf.imageOrg}}/python-dev:latest
         imagePullPolicy: {{.Values.imagePullPolicy}}
         args:
           - netcat

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

@@ -1,4 +1,3 @@
-{{ $redisNodeCount := .Values.redis.replicas | int }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -29,7 +28,7 @@ spec:
       serviceAccount: drycc-monitor-telegraf
       initContainers:
       - name: drycc-monitor-telegraf-init
-        image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/python-dev:latest
+        image: {{.Values.imageRegistry}}/{{.Values.telegraf.imageOrg}}/python-dev:latest
         imagePullPolicy: {{.Values.imagePullPolicy}}
         args:
           - netcat
@@ -103,19 +102,15 @@ spec:
           value: "true"
         - name: "AGENT_BUFFER_LIMIT"
           value: "100000"
-{{- if ne .Values.global.redisLocation "off-cluster" }}
+{{- if eq .Values.global.redisLocation "on-cluster" }}
+        - name: DRYCC_REDIS_ADDRS
+          valueFrom:
+            secretKeyRef:
+              name: redis-creds
+              key: addrs
         - name: DRYCC_REDIS_PASSWORD
           valueFrom:
             secretKeyRef:
               name: redis-creds
               key: password
-        - name: "REDIS_SERVERS"
-          value: "[{{range $i := until $redisNodeCount}}\":$(DRYCC_REDIS_PASSWORD)@drycc-redis-{{$i}}.drycc-redis.{{$.Release.Namespace}}.svc.{{$.Values.global.clusterDomain}}:6379\"{{if lt (add 1 $i) $redisNodeCount}}, {{end}}{{end}}]"
-        volumeMounts:
-        - name: redis-creds
-          mountPath: /var/run/secrets/drycc/redis/creds
-      volumes:
-      - name: redis-creds
-        secret:
-          secretName: redis-creds
 {{- end }}

telegraf/rootfs/home/telegraf/start-telegraf

@@ -29,6 +29,16 @@ fi
 if [ -n "$INFLUXDB_URL" ] && [ "${INFLUXDB_URLS:0:1}" != "\"" ]; then
   export INFLUXDB_URLS="\"$INFLUXDB_URLS\""
 fi
+# redis servers
+if [ -n "$DRYCC_REDIS_ADDRS" ]; then
+  REDIS_SERVERS=""
+  for ADDR in $(echo "${DRYCC_REDIS_ADDRS}" | tr "," "\n")
+  do
+    REDIS_SERVERS="\":$DRYCC_REDIS_PASSWORD@$ADDR\", ${REDIS_SERVERS}"
+  done
+  REDIS_SERVERS=\["${REDIS_SERVERS::-2}"\]
+  export REDIS_SERVERS
+fi
 
 echo "Building config.toml!"
 envtpl > config.toml < config.toml.tpl | sed  '/^$/d'