chore(charts): use condition

Author: duanhongyi

charts/fluentbit/templates/_helpers.tpl

@@ -0,0 +1,19 @@
+{{/* Generate fluentbit envs */}}
+{{- define "fluentbit.envs" }}
+env:
+{{- if (.Values.valkeyUrl) }}
+- name: DRYCC_VALKEY_URL
+  valueFrom:
+    secretKeyRef:
+      name: logger-fluentbit-creds
+      key: valkey-url
+{{- else if .Values.valkey.enabled }}
+- name: VALKEY_PASSWORD
+  valueFrom:
+    secretKeyRef:
+      name: valkey-creds
+      key: password
+- name: DRYCC_VALKEY_URL
+  value: "redis://:$(VALKEY_PASSWORD)@drycc-valkey.{{.Release.Namespace}}.svc.{{.Values.global.clusterDomain}}:16379/2"
+{{- end }}
+{{- end }}

charts/fluentbit/templates/logger-fluentbit-daemon.yaml

@@ -30,22 +30,7 @@ spec:
         - -v
         - -u
         - $(DRYCC_VALKEY_URL)
-        env:
-        {{- if (.Values.valkeyUrl) }}
-        - name: DRYCC_VALKEY_URL
-          valueFrom:
-            secretKeyRef:
-              name: logger-fluentbit-creds
-              key: valkey-url
-        {{- else if eq .Values.global.valkeyLocation "on-cluster"  }}
-        - name: VALKEY_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: valkey-creds
-              key: password
-        - name: DRYCC_VALKEY_URL
-          value: "redis://:$(VALKEY_PASSWORD)@drycc-valkey.{{.Release.Namespace}}.svc.{{.Values.global.clusterDomain}}:16379/2"
-        {{- end }}
+        {{- include "fluentbit.envs" . | indent 8 }}
       containers:
       - name: drycc-logger-fluentbit
         image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/fluentbit:{{.Values.imageTag}}
@@ -64,27 +49,7 @@ spec:
             memory: {{.Values.limitsMemory}}
             {{- end}}
         {{- end}}
-        env:
-        {{- if (.Values.valkeyUrl) }}
-        - name: DRYCC_VALKEY_URL
-          valueFrom:
-            secretKeyRef:
-              name: logger-fluentbit-creds
-              key: valkey-url
-        {{- else if eq .Values.global.valkeyLocation "on-cluster"  }}
-        - name: VALKEY_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: valkey-creds
-              key: password
-        - name: DRYCC_VALKEY_URL
-          value: "redis://:$(VALKEY_PASSWORD)@drycc-valkey.{{.Release.Namespace}}.svc.{{.Values.global.clusterDomain}}:16379/2"
-        {{- end }}
-        - name: DRYCC_VALKEY_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: valkey-creds
-              key: password
+        {{- include "fluentbit.envs" . | indent 8 }}
         volumeMounts:
         - name: varlog
           mountPath: /var/log

charts/fluentbit/values.yaml

@@ -92,3 +92,6 @@ config:
   plugins: |
     [PLUGINS]
         Path                ${FLUENT_BIT_PLUGINS_PATH}/out_drycc.so
+
+valkey:
+  enabled: true