chore(charts): use condition

Author: duanhongyi

charts/grafana/templates/_helpers.tmpl

@@ -5,13 +5,10 @@ env:
   valueFrom:
     fieldRef:
       fieldPath: metadata.namespace
-{{- if eq .Values.global.prometheusLocation "off-cluster" }}
+{{- if .Values.prometheusUrl }}
 - name: "PROMETHEUS_URL"
-  valueFrom:
-    secretKeyRef:
-      name: prometheus-creds
-      key: url
-{{- else }}
+  value: "{{ .Values.prometheusUrl }}"
+{{- else if .Values.prometheus.enabled }}
 - name: "PROMETHEUS_USERNAME"
   valueFrom:
     secretKeyRef:
@@ -47,7 +44,7 @@ env:
 {{- else }}
   value: http://drycc-grafana.{{ .Values.global.platformDomain }}
 {{- end }}
-{{- if eq .Values.global.passportLocation "on-cluster"}}
+{{- if .Values.passport.enabled}}
 - name: "DRYCC_PASSPORT_URL"
 {{- if .Values.global.certManagerEnabled }}
   value: https://drycc-passport.{{ .Values.global.platformDomain }}
@@ -72,16 +69,16 @@ env:
 - name: DRYCC_PASSPORT_SECRET
   value: "{{ .Values.passportSecret }}"
 {{- end }}
-- name: "PROMETHEUS_LOCATION"
-  value: {{ .Values.global.prometheusLocation }}
 - name: "VALKEY_LOCATION"
-  value: {{ .Values.global.valkeyLocation }}
+  value: {{ ternary "on-cluster" "off-cluster" .Values.valkey.enabled }}
 - name: "STORAGE_LOCATION"
-  value: {{ .Values.global.storageLocation }}
+  value: {{ ternary "on-cluster" "off-cluster" .Values.storage.enabled }}
 - name: "DATABASE_LOCATION"
-  value: {{ .Values.global.databaseLocation }}
+  value: {{ ternary "on-cluster" "off-cluster" .Values.database.enabled }}
 - name: "PASSPORT_LOCATION"
-  value: {{ .Values.global.passportLocation }}
+  value: {{ ternary "on-cluster" "off-cluster" .Values.passport.enabled }}
 - name: "REGISTRY_LOCATION"
-  value: {{ .Values.global.registryLocation }}
+  value: {{ ternary "on-cluster" "off-cluster" .Values.registry.enabled }}
+- name: "PROMETHEUS_LOCATION"
+  value: {{ ternary "on-cluster" "off-cluster" .Values.prometheus.enabled }}
 {{- end }}

charts/grafana/templates/grafana-deployment.yaml

@@ -1,4 +1,3 @@
-{{- if eq .Values.global.grafanaLocation "on-cluster" }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -61,4 +60,3 @@ spec:
         persistentVolumeClaim:
           claimName: drycc-grafana
       {{- end }}
-{{- end }}

charts/grafana/templates/grafana-svc.yaml

@@ -1,4 +1,3 @@
-{{- if eq .Values.global.grafanaLocation "on-cluster" }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -17,4 +16,3 @@ spec:
     targetPort: grafana
   selector:
     app: drycc-grafana
-{{- end }}

charts/grafana/values.yaml

@@ -55,25 +55,33 @@ environment:
 passportUrl: ""
 passportKey: ""
 passportSecret: ""
+# prometheusUrl is will no longer use the built-in prometheus component
+prometheusUrl: ""
 
 valkey:
+  enabled: true
   replicas: 1
   port: "6379"
 
+grafana:
+  enabled: true
+
+storage:
+  enabled: true
+
+database:
+  enabled: true
+
+registry:
+  enabled: true
+
+passport:
+  enabled: true
+
+prometheus:
+  enabled: true
+
 global:
-  # Set the location of Workflow's component cluster
-  #
-  # Valid values are:
-  # - on-cluster: Run component within the Kubernetes cluster
-  # - off-cluster: component is running outside of the cluster and credentials and connection information will be provided.
-  valkeyLocation: "on-cluster"
-  grafanaLocation: "on-cluster"
-  storageLocation: "on-cluster"
-  databaseLocation: "on-cluster"
-  passportLocation: "on-cluster"
-  registryLocation: "on-cluster"
-  prometheusLocation: "on-cluster"
-  ingressClass: ""
   # 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 (-).