Merge pull request #71 from kmala/master

fix(charts):Use the common storage secret

Author: kmala

charts/registry/templates/registry-deployment.yaml

@@ -61,12 +61,12 @@ spec:
           volumeMounts:
             - name: registry-storage
               mountPath: /var/lib/registry
-            - name: registry-creds
+            - name: objectstorage-creds
               mountPath: /var/run/secrets/deis/registry/creds
       volumes:
         - name: registry-storage
           emptyDir: {}
-        - name: registry-creds
+        - name: objectstorage-creds
           secret:
-            secretName: registry-storage-keyfile
+            secretName: objectstorage-keyfile
 {{- end }}

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

@@ -3,53 +3,3 @@ pull_policy: "Always"
 docker_tag: canary
 # limits_cpu: "100m"
 # limits_memory: "50Mi"
-
-global:
-  # Set the storage backend
-  #
-  # Valid values are:
-  # - s3: Store persistent data in AWS S3 (configure in S3 section)
-  # - azure: Store persistent data in Azure's object storage
-  # - gcs: Store persistent data in Google Cloud Storage
-  # - minio: Store persistent data on in-cluster Minio server
-  storage: ""
-
-  # Set the location of Workflow's Registry
-  #
-  # Valid values are:
-  # - on-cluster: Run registry within the Kubernetes cluster
-  # - off-cluster: Use registry outside the Kubernetes cluster (example: dockerhub,quay.io,self-hosted)
-  # - ecr: Use Amazon's ECR
-  # - gcr: Use Google's GCR
-  registry_location: "on-cluster"
-
-
-s3:
-  # Your AWS access key. Leave it empty if you want to use IAM credentials.
-  accesskey: ""
-  # Your AWS secret key. Leave it empty if you want to use IAM credentials.
-  secretkey: ""
-  # Any S3 region
-  region: "us-west-1"
-  # Your buckets.
-  registry_bucket: "your-registry-bucket-name"
-
-azure:
-  accountname: "YOUR ACCOUNT NAME"
-  accountkey: "YOUR ACCOUNT KEY"
-  registry_container: "your-registry-container-name"
-
-gcs:
-  # key_json is expanded into a JSON file on the remote server. It must be
-  # well-formatted JSON data.
-  key_json: ''
-  registry_bucket: "your-registry-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"