Skip to content

Commit 799f237

Browse files
authored
Merge pull request #158 from kmala/charts
fix(charts):Use the common storage secret
2 parents fd74409 + 4bb00a1 commit 799f237

File tree

3 files changed

+1
-75
lines changed

3 files changed

+1
-75
lines changed

charts/database/templates/database-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@ spec:
5656
secretName: database-creds
5757
- name: objectstore-creds
5858
secret:
59-
secretName: database-storage-keyfile
59+
secretName: objectstorage-keyfile
6060
{{- end }}

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

Lines changed: 0 additions & 27 deletions
This file was deleted.

charts/database/values.yaml

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3,53 +3,6 @@ pull_policy: "Always"
33
docker_tag: canary
44
# limits_cpu: "100m"
55
# limits_memory: "50Mi"
6-
global:
7-
# Set the storage backend
8-
#
9-
# Valid values are:
10-
# - s3: Store persistent data in AWS S3 (configure in S3 section)
11-
# - azure: Store persistent data in Azure's object storage
12-
# - gcs: Store persistent data in Google Cloud Storage
13-
# - minio: Store persistent data on in-cluster Minio server
14-
storage: minio
15-
# Set the location of Workflow's PostgreSQL database
16-
#
17-
# Valid values are:
18-
# - on-cluster: Run PostgreSQL within the Kubernetes cluster (credentials are generated
19-
# automatically; backups are sent to object storage
20-
# configured above)
21-
# - off-cluster: Run PostgreSQL outside the Kubernetes cluster (configure in database section)
22-
database_location: "on-cluster"
23-
24-
s3:
25-
# Your AWS access key. Leave it empty if you want to use IAM credentials.
26-
accesskey: ""
27-
# Your AWS secret key. Leave it empty if you want to use IAM credentials.
28-
secretkey: ""
29-
# Any S3 region
30-
region: "us-west-1"
31-
# Your buckets.
32-
database_bucket: "your-database-bucket-name"
33-
34-
azure:
35-
accountname: "YOUR ACCOUNT NAME"
36-
accountkey: "YOUR ACCOUNT KEY"
37-
database_container: "your-database-container-name"
38-
39-
gcs:
40-
# key_json is expanded into a JSON file on the remote server. It must be
41-
# well-formatted JSON data.
42-
key_json: ''
43-
database_bucket: "your-database-bucket-name"
44-
45-
swift:
46-
username: "Your OpenStack Swift Username"
47-
password: "Your OpenStack Swift Password"
48-
authurl: "Swift auth URL for obtaining an auth token"
49-
# Your OpenStack tenant name if you are using auth version 2 or 3.
50-
tenant: ""
51-
authversion: "Your OpenStack swift auth version"
52-
database_container: "your-database-container-name"
536

547
postgres:
558
name: "database name"

0 commit comments

Comments
 (0)