chore(charts): use condition

Author: duanhongyi

charts/storage/templates/storage-secret-creds.yaml

@@ -6,17 +6,5 @@ metadata:
     heritage: drycc
 type: Opaque
 data:
-  {{- if eq .Values.global.storageLocation "on-cluster"}}
-  lookup: {{ "path" | b64enc }}
-  {{- $endpoint := (printf "http://drycc-storage.%s.svc.%s:9000" .Release.Namespace .Values.global.clusterDomain) }}
-  endpoint: {{ $endpoint | b64enc }}
-  builder-bucket: {{ "builder" | b64enc }}
-  registry-bucket: {{ "registry" | b64enc }}
-  {{- else }}
-  lookup: {{ .Values.lookup | b64enc }}
-  endpoint: {{ .Values.endpoint | b64enc }}
-  builder-bucket: {{ .Values.builderBucket | b64enc }}
-  registry-bucket: {{ .Values.registryBucket | b64enc }}
-  {{- end }}
   accesskey: {{ include "common.secrets.lookup" (dict "secret" "storage-creds" "key" "accesskey" "defaultValue" (include "storage.accesskey" .) "context" $) }}
-  secretkey: {{ include "common.secrets.lookup" (dict "secret" "storage-creds" "key" "secretkey" "defaultValue" (include "storage.secretkey" .) "context" $) }}
+  secretkey: {{ include "common.secrets.lookup" (dict "secret" "storage-creds" "key" "secretkey" "defaultValue" (include "storage.secretkey" .) "context" $) }}

charts/storage/templates/storage-service-account.yaml

@@ -1,8 +1,6 @@
-{{- if eq .Values.global.storageLocation "on-cluster" }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: drycc-storage
   labels:
     heritage: drycc
-{{- end }}

charts/storage/templates/storage-service.yaml

@@ -1,4 +1,3 @@
-{{- if eq .Values.global.storageLocation "on-cluster" }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -21,4 +20,3 @@ spec:
     port: 9000
   - name: console
     port: 9001
-{{- end }}

charts/storage/templates/storage-statefulset.yaml

@@ -1,4 +1,3 @@
-{{- if eq .Values.global.storageLocation "on-cluster" }}
 {{- $zoneCount := int .Values.zones }}
 {{- $driveCount := int .Values.drives }}
 {{- $replicaCount := int .Values.replicas }}
@@ -118,4 +117,3 @@ spec:
         emptyDir: {}
       {{- end }}
   {{- end }}
-{{- end }}

charts/storage/values.yaml

@@ -45,9 +45,3 @@ global:
   # 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.
   clusterDomain: "cluster.local"
-  # Set the location of Workflow's Object Storage
-  #
-  # Valid values are:
-  # - on-cluster: Run drycc storage within the Kubernetes cluster
-  # - off-cluster: Run Storage outside the Kubernetes cluster (Compatible with s3 API)
-  storageLocation: on-cluster