docs(workflow): object storage config

Author: duanhongyi

_scripts/install.sh

@@ -37,7 +37,7 @@ init_registry() {
 
 function clean_before_exit {
     # delay before exiting, so stdout/stderr flushes through the logging system
-    rm -rf /tmp/drycc-values.yaml /etc/rancher/k3s/registries.yaml
+    rm -rf /tmp/drycc-values.yaml 
     configure_registries runtime
     sleep 3
 }
@@ -87,24 +87,23 @@ function configure_os {
 
 function configure_registries {
   mkdir -p /etc/rancher/k3s
-  if [[ "$1" == "runtime" ]] ; then
-    if [[ -f "${REGISTRIES_FILE}" ]] ; then
-      cat "${REGISTRIES_FILE}" > /etc/rancher/k3s/registries.yaml
-    elif [[ "${INSTALL_DRYCC_MIRROR}" == "cn" ]] ; then
+  if [[ -f  "${REGISTRIES_FILE}" ]]; then
+    cat "${REGISTRIES_FILE}" > /etc/rancher/k3s/registries.yaml
+  elif [[ "${INSTALL_DRYCC_MIRROR}" == "cn" ]]; then
+    if [[ "$1" == "runtime" ]] ; then
       cat << EOF > "/etc/rancher/k3s/registries.yaml"
 mirrors:
   "docker.io":
     endpoint:
     - "https://hub-mirror.c.163.com"
     - "https://registry-1.docker.io"
 EOF
-    fi
-  else
-    cat << EOF > "/etc/rancher/k3s/registries.yaml"
+    else
+      cat << EOF > "/etc/rancher/k3s/registries.yaml"
 mirrors:
   "docker.io":
     endpoint:
-    - "https://gcr-mirror.drycc.cc"
+    - "https://docker-mirror.drycc.cc"
     - "https://registry-1.docker.io"
   "quay.io":
     endpoint:
@@ -119,12 +118,13 @@ mirrors:
     - "https://k8s-mirror.drycc.cc"
     - "https://k8s.gcr.io"
 EOF
+    fi
   fi
 }
 
 function configure_mirrors {
+  configure_registries
   if [[ "${INSTALL_DRYCC_MIRROR}" == "cn" ]] ; then
-    configure_registries
     INSTALL_K3S_MIRROR="${INSTALL_DRYCC_MIRROR}"
     export INSTALL_K3S_MIRROR
     k3s_install_url="http://rancher-mirror.cnrancher.com/k3s/k3s-install.sh"

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

@@ -8,8 +8,8 @@ Drycc Workflow ships with [Minio][minio] by default, which provides in-cluster,
 
 Every component that relies on object storage uses two inputs for configuration:
 
-1. Component-specific environment variables (e.g. `BUILDER_STORAGE` and `REGISTRY_STORAGE`)
-2. Access credentials stored as a Kubernetes secret named `objectstorage-keyfile`
+1. You must use object storage services that are compatible with S3 API
+2. Access credentials stored as a Kubernetes secret named `minio-creds`
 
 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.