chore(database): change minio to storage

Author: duanhongyi

.gitignore

@@ -1 +1,2 @@
 contrib/ci/tmp
+.vscode/

Makefile

@@ -34,9 +34,9 @@ test: test-style test-functional
 test-style:
 	${DEV_ENV_CMD} shellcheck $(SHELL_SCRIPTS)
 
-test-functional: test-functional-minio
+test-functional: test-functional-storage
 
-test-functional-minio:
-	contrib/ci/test-minio.sh ${IMAGE}
+test-functional-storage:
+	contrib/ci/test-storage.sh ${IMAGE}
 
 .PHONY: all docker-build docker-push test

charts/database/templates/_helper.tpl

@@ -14,30 +14,30 @@ env:
     secretKeyRef:
       name: database-creds
       key: password
-- name: "DRYCC_MINIO_LOOKUP"
+- name: "DRYCC_STORAGE_LOOKUP"
   valueFrom:
     secretKeyRef:
-      name: minio-creds
+      name: storage-creds
       key: lookup
-- name: "DRYCC_MINIO_BUCKET"
+- name: "DRYCC_STORAGE_BUCKET"
   valueFrom:
     secretKeyRef:
-      name: minio-creds
+      name: storage-creds
       key: database-bucket
-- name: "DRYCC_MINIO_ENDPOINT"
+- name: "DRYCC_STORAGE_ENDPOINT"
   valueFrom:
     secretKeyRef:
-      name: minio-creds
+      name: storage-creds
       key: endpoint
-- name: "DRYCC_MINIO_ACCESSKEY"
+- name: "DRYCC_STORAGE_ACCESSKEY"
   valueFrom:
     secretKeyRef:
-      name: minio-creds
+      name: storage-creds
       key: accesskey
-- name: "DRYCC_MINIO_SECRETKEY"
+- name: "DRYCC_STORAGE_SECRETKEY"
   valueFrom:
     secretKeyRef:
-      name: minio-creds
+      name: storage-creds
       key: secretkey
 {{- end }}
 

charts/database/templates/database-deployment.yaml

@@ -32,7 +32,7 @@ spec:
           - netcat
           - -v
           - -u
-          - $(DRYCC_MINIO_ENDPOINT)
+          - $(DRYCC_STORAGE_ENDPOINT)
         {{- include "database.envs" . | indent 8 }}
       containers:
       - name: drycc-database

contrib/ci/test-minio.sh contrib/ci/test-storage.shcontrib/ci/test-minio.sh renamed to contrib/ci/test-storage.sh

@@ -3,7 +3,7 @@
 set -eof pipefail
 
 cleanup() {
-  kill-containers "${MINIO_JOB}" "${PG_JOB}"
+  kill-containers "${STORAGE_JOB}" "${PG_JOB}"
 }
 trap cleanup EXIT
 
@@ -16,46 +16,46 @@ CURRENT_DIR=$(cd "$(dirname "$0")"; pwd)
 
 create-postgres-creds
 
-puts-step "creating fake minio credentials"
+puts-step "creating fake storage credentials"
 
 s3Accesskey="1234567890123456789012345678901234567890"
 s3Secretkey="1234567890123456789012345678901234567890"
-# boot minio
+# boot storage
 mkdir -p "${CURRENT_DIR}"/tmp/bin
 echo "ls /data/database/*/basebackups_005" > "${CURRENT_DIR}"/tmp/bin/backups.sh
-MINIO_JOB=$(docker run -d \
-  -e DRYCC_MINIO_ACCESSKEY=$s3Accesskey \
-  -e DRYCC_MINIO_SECRETKEY=$s3Secretkey \
+STORAGE_JOB=$(docker run -d \
+  -e DRYCC_STORAGE_ACCESSKEY=$s3Accesskey \
+  -e DRYCC_STORAGE_SECRETKEY=$s3Secretkey \
   -v "${CURRENT_DIR}"/tmp/bin:/tmp/bin \
-  "${DEV_REGISTRY}"/drycc/minio:canary server /data/)
+  "${DEV_REGISTRY}"/drycc/storage:canary server /data/)
 
-puts-step "minio starting, wait 30s."
+puts-step "storage starting, wait 30s."
 sleep 30
 
-# boot postgres, linking the minio container and setting DRYCC_MINIO_ENDPOINT
-MINIO_IP=$(docker inspect --format "{{ .NetworkSettings.IPAddress }}" "${MINIO_JOB}")
+# boot postgres, linking the storage container and setting DRYCC_STORAGE_ENDPOINT
+STORAGE_IP=$(docker inspect --format "{{ .NetworkSettings.IPAddress }}" "${STORAGE_JOB}")
 PG_CMD="docker run -d \
-  --add-host minio.local:${MINIO_IP} \
+  --add-host storage.local:${STORAGE_IP} \
   -e PGCTLTIMEOUT=1200 \
   -e BACKUP_FREQUENCY=1s \
-  -e DATABASE_STORAGE=minio \
-  -e DRYCC_MINIO_LOOKUP=path \
-  -e DRYCC_MINIO_BUCKET=database \
-  -e DRYCC_MINIO_ENDPOINT=http://minio.local:9000 \
-  -e DRYCC_MINIO_ACCESSKEY=$s3Accesskey \
-  -e DRYCC_MINIO_SECRETKEY=$s3Secretkey $1"
+  -e DATABASE_STORAGE=storage \
+  -e DRYCC_STORAGE_LOOKUP=path \
+  -e DRYCC_STORAGE_BUCKET=database \
+  -e DRYCC_STORAGE_ENDPOINT=http://storage.local:9000 \
+  -e DRYCC_STORAGE_ACCESSKEY=$s3Accesskey \
+  -e DRYCC_STORAGE_SECRETKEY=$s3Secretkey $1"
 
 start-postgres "${PG_CMD}"
 
 # display logs for debugging purposes
-puts-step "displaying minio logs"
-docker logs "${MINIO_JOB}"
+puts-step "displaying storage logs"
+docker logs "${STORAGE_JOB}"
 
 check-postgres "${PG_JOB}"
 
-# check if minio has the 5 backups
-puts-step "checking if minio has 5 backups"
-BACKUPS="$(docker exec "${MINIO_JOB}" sh /tmp/bin/backups.sh | grep json)"
+# check if storage has the 5 backups
+puts-step "checking if storage has 5 backups"
+BACKUPS="$(docker exec "${STORAGE_JOB}" sh /tmp/bin/backups.sh | grep json)"
 
 NUM_BACKUPS="$(echo "${BACKUPS}" | wc -w)"
 # NOTE (bacongobbler): the BACKUP_FREQUENCY is only 1 second, so we could technically be checking

rootfs/bin/create_bucket

@@ -2,22 +2,22 @@
 
 set -e
 
-mc config host add minio \
-  "${DRYCC_MINIO_ENDPOINT}" \
-  "${DRYCC_MINIO_ACCESSKEY}" \
-  "${DRYCC_MINIO_SECRETKEY}" \
-  --lookup "${DRYCC_MINIO_LOOKUP}" \
+mc config host add storage \
+  "${DRYCC_STORAGE_ENDPOINT}" \
+  "${DRYCC_STORAGE_ACCESSKEY}" \
+  "${DRYCC_STORAGE_SECRETKEY}" \
+  --lookup "${DRYCC_STORAGE_LOOKUP}" \
   --api s3v4
 
 has_bucket(){
-    mc ls minio -json|jq -r '.key'|grep -w "${DRYCC_MINIO_BUCKET}"
+    mc ls storage -json|jq -r '.key'|grep -w "${DRYCC_STORAGE_BUCKET}"
 }
 
 if  [ -z "$(has_bucket)" ] ;then
-    mc mb minio/"${DRYCC_MINIO_BUCKET}"
+    mc mb storage/"${DRYCC_STORAGE_BUCKET}"
     if  [ -z "$(has_bucket)" ] ;then
-        echo "create bucket ${DRYCC_MINIO_BUCKET} error"
+        echo "create bucket ${DRYCC_STORAGE_BUCKET} error"
         exit 1
     fi
 fi
-echo "create bucket ${DRYCC_MINIO_BUCKET} success"
+echo "create bucket ${DRYCC_STORAGE_BUCKET} success"

rootfs/docker-entrypoint-initdb.d/001_setup_envdir.sh

@@ -2,11 +2,11 @@
 
 cd "$WALG_ENVDIR"
 
-echo $DRYCC_MINIO_ACCESSKEY > AWS_ACCESS_KEY_ID
-echo $DRYCC_MINIO_SECRETKEY > AWS_SECRET_ACCESS_KEY
-echo "s3://$DRYCC_MINIO_BUCKET/$PG_MAJOR" > WALE_S3_PREFIX
-echo "${DRYCC_MINIO_ENDPOINT}" > AWS_ENDPOINT
-if [ "${DRYCC_MINIO_LOOKUP}" == "path" ]; then
+echo $DRYCC_STORAGE_ACCESSKEY > AWS_ACCESS_KEY_ID
+echo $DRYCC_STORAGE_SECRETKEY > AWS_SECRET_ACCESS_KEY
+echo "s3://$DRYCC_STORAGE_BUCKET/$PG_MAJOR" > WALE_S3_PREFIX
+echo "${DRYCC_STORAGE_ENDPOINT}" > AWS_ENDPOINT
+if [ "${DRYCC_STORAGE_LOOKUP}" == "path" ]; then
   echo "true" > AWS_S3_FORCE_PATH_STYLE
 fi
-echo $DRYCC_MINIO_BUCKET > BUCKET_NAME
+echo $DRYCC_STORAGE_BUCKET > BUCKET_NAME