Skip to content

Commit ee8e01f

Browse files
committed
chore(workflow): change minio to storage
1 parent 4613bc2 commit ee8e01f

15 files changed

Lines changed: 43 additions & 57 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ _build/
2323

2424
.DS_Store
2525
.idea/*
26+
.vscode/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Please see below for links and descriptions of each component:
2121
- [monitor](https://github.com/drycc/monitor) - The platform monitoring components
2222
- [influxdb](https://github.com/drycc/influxdb) - The monitor database
2323
- [rabbitmq](https://github.com/drycc/rabbitmq) - RabbitMQ is a message broker used with controller celery
24-
- [minio](https://github.com/drycc/minio) - The in-cluster, ephemeral, development-only object storage system
24+
- [storage](https://github.com/drycc/storage) - The in-cluster, ephemeral, development-only object storage system
2525
- [workflow-cli](https://github.com/drycc/workflow-cli) - Workflow CLI `drycc`
2626

2727
We welcome your input! If you have feedback, please [submit an issue][issues]. If you'd like to participate in development, please read the "Working on Documentation" section below and [submit a pull request][prs].

_scripts/install.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -352,15 +352,15 @@ redis:
352352
size: ${REDIS_PERSISTENCE_SIZE:-5Gi}
353353
storageClass: ${REDIS_PERSISTENCE_STORAGE_CLASS:-""}
354354
355-
minio:
356-
zone: ${MINIO_ZONE:-1}
357-
drives: ${MINIO_DRIVES:-4}
358-
replicas: ${MINIO_REPLICAS:-1}
355+
storage:
356+
zone: ${STORAGE_ZONE:-1}
357+
drives: ${STORAGE_DRIVES:-4}
358+
replicas: ${STORAGE_REPLICAS:-1}
359359
imageRegistry: ${DRYCC_REGISTRY}
360360
persistence:
361361
enabled: true
362-
size: ${MINIO_PERSISTENCE_SIZE:-20Gi}
363-
storageClass: ${MINIO_PERSISTENCE_STORAGE_CLASS:-""}
362+
size: ${STORAGE_PERSISTENCE_SIZE:-20Gi}
363+
storageClass: ${STORAGE_PERSISTENCE_STORAGE_CLASS:-""}
364364
365365
rabbitmq:
366366
imageRegistry: ${DRYCC_REGISTRY}

charts/workflow/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ dependencies:
2323
- name: logger
2424
version: <logger-tag>
2525
repository: https://charts.drycc.cc/stable/logger
26-
- name: minio
27-
version: <minio-tag>
28-
repository: https://charts.drycc.cc/stable/minio
26+
- name: storage
27+
version: <storage-tag>
28+
repository: https://charts.drycc.cc/stable/storage
2929
- name: monitor
3030
version: <monitor-tag>
3131
repository: https://charts.drycc.cc/stable/monitor

charts/workflow/values.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# If the service is used by a component alone, it needs to be configured inside the component.
44
# Refer to rabbitmqUrl and databaseUrl of the controller component.
55
# If the service is dependent on multiple components and there is state synchronization,
6-
# it needs to be configured separately, such as minio and influxdb.
6+
# it needs to be configured separately, such as storage and influxdb.
77

88
global:
99
# Admin email, used for each component to send email to administrator
@@ -12,9 +12,9 @@ global:
1212
# Set the location of Workflow's Object Storage
1313
#
1414
# Valid values are:
15-
# - on-cluster: Run minio within the Kubernetes cluster
16-
# - off-cluster: Run Object Storage outside the Kubernetes cluster (Compatible with s3 API)
17-
minioLocation: "on-cluster"
15+
# - on-cluster: Run drycc storage within the Kubernetes cluster
16+
# - off-cluster: Run Storage outside the Kubernetes cluster (Compatible with s3 API)
17+
storageLocation: "on-cluster"
1818

1919
# Set the location of Workflow's PostgreSQL database
2020
#
@@ -91,15 +91,15 @@ global:
9191
# - off-cluster: Use passport outside the Kubernetes cluster
9292
passportLocation: "on-cluster"
9393

94-
minio:
94+
storage:
9595
# bucket lookup supported by the server.
9696
# Valid options are '[dns, path]'
97-
# When the minio is off-cluster, this value can be set
97+
# When the storage is off-cluster, this value can be set
9898
# Otherwise, Hard coded as `path`
9999
lookup: "path"
100-
# endpoint configuration is only available in off-cluster minio database
100+
# endpoint configuration is only available in off-cluster storage
101101
endpoint: ""
102-
# If minio is off-cluster, accesskey and secretkey must be specified
102+
# If storage is off-cluster, accesskey and secretkey must be specified
103103
# Otherwise, they are generated randomly, if they are empty
104104
accesskey: ""
105105
secretkey: ""
@@ -108,12 +108,12 @@ minio:
108108
builderBucket: "drycc-builder-bucket"
109109
registryBucket: "drycc-registry-bucket"
110110
databaseBucket: "drycc-database-bucket"
111-
# Configure the following ONLY if you want persistence for on-cluster minio
111+
# Configure the following ONLY if you want persistence for on-cluster storage
112112
persistence:
113113
enabled: false # Set to true to enable persistence
114114
accessMode: ReadWriteOnce
115115
size: 5Gi # PVC size
116-
## minio data Persistent Volume Storage Class
116+
## storage data Persistent Volume Storage Class
117117
## If defined, storageClassName: <storageClass>
118118
## If set to "-", storageClassName: "", which disables dynamic provisioning
119119
## If undefined (the default) or set to null, no storageClassName spec is

src/_includes/install-workflow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ drycc-database-rad1o 1/1 Running 0 5m
5757
drycc-logger-fluentd-1v8uk 1/1 Running 0 5m
5858
drycc-logger-fluentd-esm60 1/1 Running 0 5m
5959
drycc-logger-sm8b3 1/1 Running 0 5m
60-
drycc-minio-4ww3t 1/1 Running 0 5m
60+
drycc-storage-4ww3t 1/1 Running 0 5m
6161
drycc-registry-asozo 1/1 Running 1 5m
6262
drycc-rabbitmq-0 1/1 Running 0 5m
6363
```

src/installing-workflow/configuring-object-storage.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
A variety of Drycc Workflow components rely on an object storage system to do their work including storing application slugs, Docker images and database logs.
44

5-
Drycc Workflow ships with [Minio][minio] by default, which provides in-cluster, ephemeral object storage. This means that _if the Minio server crashes, all data will be lost_. Therefore, **Minio should be used for development or testing only**.
5+
Drycc Workflow ships with [Storage][storage] by default, which provides in-cluster.
66

77
## Configuring off-cluster Object Storage
88

99
Every component that relies on object storage uses two inputs for configuration:
1010

1111
1. You must use object storage services that are compatible with S3 API
12-
2. Access credentials stored as a Kubernetes secret named `minio-creds`
12+
2. Access credentials stored as a Kubernetes secret named `storage-creds`
1313

1414
The helm chart for Drycc Workflow can be easily configured to connect Workflow components to off-cluster object storage. Drycc Workflow currently supports Google Compute Storage, Amazon S3, [Azure Blob Storage][] and OpenStack Swift Storage.
1515

@@ -50,6 +50,6 @@ Operators should configure object storage by editing the Helm values file before
5050
You are now ready to run `helm install drycc/workflow --namespace drycc -f values.yaml` using your desired object storage.
5151

5252

53-
[minio]: ../understanding-workflow/components.md#object-storage
53+
[storage]: ../understanding-workflow/components.md#object-storage
5454
[aws-iam]: http://docs.aws.amazon.com/IAM/latest/UserGuide/introduction.html
5555
[Azure Blob Storage]: https://azure.microsoft.com/en-us/services/storage/blobs/

src/installing-workflow/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ $ helm install --namespace drycc \
8282
--set influxdb.imageRegistry=quay.io \
8383
--set rabbitmq.imageRegistry=quay.io \
8484
--set logger.imageRegistry=quay.io \
85-
--set minio.imageRegistry=quay.io \
85+
--set storage.imageRegistry=quay.io \
8686
--set monitor.imageRegistry=quay.io \
8787
--set registry.imageRegistry=quay.io \
8888
--set registry-proxy.imageRegistry=quay.io \
@@ -120,7 +120,7 @@ drycc-influxdb-2729788615-m9b5n 1/1 Running 0 4m
120120
drycc-logger-176328999-wjckx 1/1 Running 4 4m
121121
drycc-logger-fluentd-zxnqb 1/1 Running 0 4m
122122
drycc-redis-304849759-1f35p 1/1 Running 0 4m
123-
drycc-minio-676004970-nxqgt 1/1 Running 0 4m
123+
drycc-storage-676004970-nxqgt 1/1 Running 0 4m
124124
drycc-monitor-grafana-432627134-lnl2h 1/1 Running 0 4m
125125
drycc-monitor-telegraf-wmcmn 1/1 Running 1 4m
126126
drycc-registry-756475849-lwc6b 1/1 Running 1 4m

src/installing-workflow/ingress.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Depending on the order in which the Workflow components initialize, some pods ma
4141
installation: if a component's dependencies are not yet available, that component will exit and Kubernetes will
4242
automatically restart it.
4343

44-
Here, it can be seen that the controller, builder and registry all took a few loops waiting for minio before they were able to start:
44+
Here, it can be seen that the controller, builder and registry all took a few loops waiting for storage before they were able to start:
4545

4646
```
4747
$ kubectl --namespace=drycc get pods
@@ -53,7 +53,7 @@ drycc-database-rad1o 1/1 Running 0 5m
5353
drycc-logger-fluentd-1v8uk 1/1 Running 0 5m
5454
drycc-logger-fluentd-esm60 1/1 Running 0 5m
5555
drycc-logger-sm8b3 1/1 Running 0 5m
56-
drycc-minio-4ww3t 1/1 Running 0 5m
56+
drycc-storage-4ww3t 1/1 Running 0 5m
5757
drycc-registry-asozo 1/1 Running 1 5m
5858
drycc-rabbitmq-0 1/1 Running 0 5m
5959
```

src/installing-workflow/system-requirements.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ Workflow also supports the [OSB](https://github.com/openservicebrokerapi/service
2222
A variety of Drycc Workflow components rely on an object storage system to do their work, including storing application
2323
slugs, Docker images and database logs.
2424

25-
Drycc Workflow ships with Minio by default, which provides in-cluster, ephemeral object storage. This means that if the
26-
Minio server crashes, all data will be lost. Therefore, Minio should be used for development or testing only.
25+
Drycc Workflow ships with drycc storage by default, which provides in-cluster.
2726

2827
Workflow supports Amazon Simple Storage Service (S3), Google Cloud Storage (GCS), OpenShift Swift, and Azure Blob
2928
Storage. See [configuring object storage](configuring-object-storage) for setup instructions.

0 commit comments

Comments
 (0)