feat(charts): add minio gateway suppport

Author: duanhongyi

charts/workflow/templates/objectstorage-secret.yaml

@@ -7,29 +7,40 @@ metadata:
   annotations:
     drycc.cc/objectstorage: "{{ .Values.global.storage }}"
 type: Opaque
-data: {{ if eq .Values.global.storage "gcs"}}
+data:
+{{ if eq .Values.global.storage "gcs"}}
+  accesskey: {{.Values.gcs.accesskey | b64enc }}
+  secretkey: {{ .Values.gcs.secretkey | b64enc }}
   key.json: {{.Values.gcs.key_json}}
+  projectid: {{ .Values.gcs.projectid | b64enc }}
   builder-bucket: {{.Values.gcs.builder_bucket | b64enc }}
   registry-bucket: {{.Values.gcs.registry_bucket | b64enc }}
-  database-bucket: {{.Values.gcs.database_bucket | b64enc }}{{ else if eq .Values.global.storage "azure"}}
-  accountname: {{.Values.azure.accountname | b64enc }}
-  accountkey: {{ .Values.azure.accountkey | b64enc }}
-  builder-container: {{ .Values.azure.builder_container | b64enc }}
-  database-container: {{ .Values.azure.database_container | b64enc }}
-  registry-container: {{ .Values.azure.registry_container | b64enc }}{{ else if eq .Values.global.storage "s3"}}
+  database-bucket: {{.Values.gcs.database_bucket | b64enc }}
+{{ else if eq .Values.global.storage "azure"}}
+  accesskey: {{.Values.azure.accesskey | b64enc }}
+  secretkey: {{ .Values.azure.secretkey | b64enc }}
+  endpoint: {{ .Values.azure.endpoint | b64enc }}
+  builder-bucket: {{ .Values.azure.builder_bucket | b64enc }}
+  registry-bucket: {{ .Values.azure.registry_bucket | b64enc }}
+  database-bucket: {{ .Values.azure.database_bucket | b64enc }}
+{{ else if eq .Values.global.storage "s3"}}
   accesskey: {{ .Values.s3.accesskey | b64enc }}
   secretkey: {{ .Values.s3.secretkey | b64enc }}
-  region: {{ .Values.s3.region | b64enc }}
+  endpoint: {{ .Values.s3.endpoint | b64enc }}
   builder-bucket: {{ .Values.s3.builder_bucket | b64enc }}
   registry-bucket: {{.Values.s3.registry_bucket | b64enc }}
-  database-bucket: {{.Values.s3.database_bucket | b64enc }}{{ else if eq .Values.global.storage "swift"}}
-  username: {{ .Values.swift.username | b64enc }}
-  password: {{ .Values.swift.password | b64enc }}
-  authurl: {{ .Values.swift.authurl | b64enc }}
-  tenant: {{ .Values.swift.tenant | b64enc }}
-  authversion: {{ .Values.swift.authversion | b64enc }}
-  builder-container: {{ .Values.swift.builder_container | b64enc }}
-  database-container: {{ .Values.swift.database_container | b64enc }}
-  registry-container: {{ .Values.swift.registry_container | b64enc }}{{else if eq .Values.global.storage "minio"}}
-  accesskey: OFRaUlkySlJXTVBUNlVNWFI2STU=
-  secretkey: Z2JzdHJPdm90TU1jZzJzTWZHVWhBNWE2RXQvRUk1QUx0SUhzb2JZaw=={{ end }}
+  database-bucket: {{.Values.s3.database_bucket | b64enc }}
+{{ else if eq .Values.global.storage "oss"}}
+  accesskey: {{ .Values.oss.accesskey | b64enc }}
+  secretkey: {{ .Values.oss.secretkey | b64enc }}
+  endpoint: {{ .Values.oss.endpoint | b64enc }}
+  builder-bucket: {{ .Values.oss.builder_bucket | b64enc }}
+  registry-bucket: {{.Values.oss.registry_bucket | b64enc }}
+  database-bucket: {{.Values.oss.database_bucket | b64enc }}
+{{else if eq .Values.global.storage "minio"}}
+  accesskey: {{ .Values.minio.accesskey | b64enc }}
+  secretkey: {{ .Values.minio.secretkey | b64enc }}
+  builder-bucket: {{ .Values.minio.builder_bucket | b64enc }}
+  registry-bucket: {{.Values.minio.registry_bucket | b64enc }}
+  database-bucket: {{.Values.minio.database_bucket | b64enc }}
+{{ end }}

charts/workflow/values.yaml

@@ -82,37 +82,45 @@ s3:
   # Your AWS secret key. Leave it empty if you want to use IAM credentials.
   secretkey: ""
   # Any S3 region
-  region: "us-west-1"
+  endpoint: "your-s3-endpoint"
   # Your buckets.
+  builder_bucket: "your-builder-bucket-name"
   registry_bucket: "your-registry-bucket-name"
   database_bucket: "your-database-bucket-name"
+
+oss:
+  accesskey: ""
+  secretkey: ""
+  endpoint: "your-oos-endpoint"
   builder_bucket: "your-builder-bucket-name"
+  registry_bucket: "your-registry-bucket-name"
+  database_bucket: "your-database-bucket-name"
 
 azure:
-  accountname: "YOUR ACCOUNT NAME"
-  accountkey: "YOUR ACCOUNT KEY"
-  registry_container: "your-registry-container-name"
-  database_container: "your-database-container-name"
-  builder_container: "your-builder-container-name"
+  accesskey: "YOUR ACCOUNT NAME"
+  secretkey: "YOUR ACCOUNT KEY"
+  endpoint: "your-azure-endpoint"
+  builder_bucket: "your-builder-container-name"
+  registry_bucket: "your-registry-container-name"
+  database_bucket: "your-database-container-name"
 
 gcs:
   # key_json is expanded into a JSON file on the remote server. It must be
   # well-formatted JSON data.
+  accesskey: "your accessKey for minio gateway"
+  secretkey: "your secretkey for minio gateway"
   key_json: <base64-encoded JSON data>
+  projectid: "your-gcs-projectid"
+  builder_bucket: "your-builder-bucket-name"
   registry_bucket: "your-registry-bucket-name"
   database_bucket: "your-database-bucket-name"
-  builder_bucket: "your-builder-bucket-name"
 
-swift:
-  username: "Your OpenStack Swift Username"
-  password: "Your OpenStack Swift Password"
-  authurl: "Swift auth URL for obtaining an auth token"
-  # Your OpenStack tenant name if you are using auth version 2 or 3.
-  tenant: ""
-  authversion: "Your OpenStack swift auth version"
-  registry_container: "your-registry-container-name"
-  database_container: "your-database-container-name"
-  builder_container: "your-builder-container-name"
+minio:
+  accesskey: "8TZRY2JRWMPT6UMXR6I5"
+  secretkey: "gbstrOvotMMcg2sMfGUhA5a6Et/EI5ALtIHsobYk"
+  builder_bucket: "0fad60517a9e4225a07d77d7b9b58629"
+  registry_bucket: "c2da53f11c7a455db35797c3ba625d80"
+  database_bucket: "e95eb5c54c3a4047abe5269a68fa9a67"
 
 # Set the default (global) way of how Application (your own) images are
 # pulled from within the Controller.