Skip to content

Commit d6b4375

Browse files
committed
chore(redis): remove logger from redis conf
1 parent 9fed787 commit d6b4375

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,19 @@ spec:
8181
value: "metrics"
8282
- name: "NSQ_ENDPOINTS"
8383
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}}]"
84-
{{- if ne .Values.global.logger_redis_location "off-cluster" }}
85-
- name: DRYCC_LOGGER_REDIS_PASSWORD
84+
{{- if ne .Values.global.redis_location "off-cluster" }}
85+
- name: DRYCC_REDIS_PASSWORD
8686
valueFrom:
8787
secretKeyRef:
88-
name: logger-redis-creds
88+
name: redis-creds
8989
key: password
9090
- name: "REDIS_SERVERS"
91-
value: "[{{range $i := until $redisNodeCount}}\":$(DRYCC_LOGGER_REDIS_PASSWORD)@drycc-redis-{{$i}}.drycc-redis.{{$.Release.Namespace}}.svc.{{$.Values.global.cluster_domain}}:{{$.Values.redis.port}}\"{{if lt (add 1 $i) $redisNodeCount}}, {{end}}{{end}}]"
91+
value: "[{{range $i := until $redisNodeCount}}\":$(DRYCC_REDIS_PASSWORD)@drycc-redis-{{$i}}.drycc-redis.{{$.Release.Namespace}}.svc.{{$.Values.global.cluster_domain}}:{{$.Values.redis.port}}\"{{if lt (add 1 $i) $redisNodeCount}}, {{end}}{{end}}]"
9292
volumeMounts:
93-
- name: logger-redis-creds
93+
- name: redis-creds
9494
mountPath: /var/run/secrets/drycc/redis/creds
9595
volumes:
96-
- name: logger-redis-creds
96+
- name: redis-creds
9797
secret:
98-
secretName: logger-redis-creds
98+
secretName: redis-creds
9999
{{- end }}

charts/monitor/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ global:
5959
# - on-cluster: Run Grafana within the Kubernetes cluster
6060
# - off-cluster: Grafana is running outside of the cluster
6161
grafana_location: "on-cluster"
62-
# Set the location of Workflow's logger-specific Redis instance
62+
# Set the location of Workflow's redis instance
6363
#
6464
# Valid values are:
6565
# - on-cluster: Run Redis within the Kubernetes cluster
66-
# - off-cluster: Run Redis outside the Kubernetes cluster (configure in loggerRedis section)
67-
logger_redis_location: "on-cluster"
66+
# - off-cluster: Run Redis outside the Kubernetes cluster (configure in redis section)
67+
redis_location: "on-cluster"
6868
# Role-Based Access Control for Kubernetes >= 1.5
6969
use_rbac: false
7070
ingress_class: ""

0 commit comments

Comments
 (0)