chore(registry): change minio to storage

Author: duanhongyi

.gitignore

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

charts/registry/templates/_helper.tpl

@@ -24,30 +24,30 @@ env:
     secretKeyRef:
       name: registry-secret
       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: registry-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/registry/templates/registry-cronjob-daily.yaml

@@ -26,7 +26,7 @@ spec:
               - netcat
               - -v
               - -u
-              - $(DRYCC_MINIO_ENDPOINT)
+              - $(DRYCC_STORAGE_ENDPOINT)
             {{- include "builder.envs" . | indent 12 }}
           containers:
           - image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/registry:{{.Values.imageTag}}

charts/registry/templates/registry-deployment.yaml

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

contrib/ci/test.sh

@@ -5,33 +5,33 @@ set -eoxf pipefail
 s3Accesskey=drycc
 s3Secretkey=123456789
 
-MINIO_JOB=$(docker run -d --name minio \
-  -e DRYCC_MINIO_ACCESSKEY=$s3Accesskey \
-  -e DRYCC_MINIO_SECRETKEY=$s3Secretkey \
-  "${DEV_REGISTRY}"/drycc/minio:canary server /data/minio/ --console-address :9001)
+STORAGE_JOB=$(docker run -d --name storage \
+  -e DRYCC_STORAGE_ACCESSKEY=$s3Accesskey \
+  -e DRYCC_STORAGE_SECRETKEY=$s3Secretkey \
+  "${DEV_REGISTRY}"/drycc/storage:canary server /data/storage/ --console-address :9001)
 
 sleep 5
-docker logs "${MINIO_JOB}"
+docker logs "${STORAGE_JOB}"
 
-MINIO_IP=$(docker inspect --format "{{ .NetworkSettings.IPAddress }}" "${MINIO_JOB}")
+STORAGE_IP=$(docker inspect --format "{{ .NetworkSettings.IPAddress }}" "${STORAGE_JOB}")
 
-JOB=$(docker run --add-host minio:"${MINIO_IP}" \
+JOB=$(docker run --add-host storage:"${STORAGE_IP}" \
   -d \
   -p 5000:5000 \
   -e REGISTRY_HTTP_SECRET=drycc \
   -e DRYCC_REGISTRY_REDIRECT=false \
   -e DRYCC_REGISTRY_USERNAME=admin \
   -e DRYCC_REGISTRY_PASSWORD=admin \
-  -e DRYCC_MINIO_LOOKUP=path \
-  -e DRYCC_MINIO_BUCKET=registry \
-  -e DRYCC_MINIO_ENDPOINT=http://minio:9000 \
-  -e DRYCC_MINIO_ACCESSKEY=$s3Accesskey \
-  -e DRYCC_MINIO_SECRETKEY=$s3Secretkey \
+  -e DRYCC_STORAGE_LOOKUP=path \
+  -e DRYCC_STORAGE_BUCKET=registry \
+  -e DRYCC_STORAGE_ENDPOINT=http://storage:9000 \
+  -e DRYCC_STORAGE_ACCESSKEY=$s3Accesskey \
+  -e DRYCC_STORAGE_SECRETKEY=$s3Secretkey \
   "$1")
 
 # let the registry run for a few seconds
 sleep 5
 # check that the registry is still up
 docker logs "${JOB}"
 docker ps -q --no-trunc=true | grep "${JOB}"
-docker rm -f "${JOB}" "${MINIO_JOB}"
+docker rm -f "${JOB}" "${STORAGE_JOB}"

main.go

@@ -14,18 +14,18 @@ const (
 	registryHtpasswd       = "/opt/drycc/registry/etc/htpasswd"
 	registryConfigEnvVar   = "DRYCC_REGISTRY_CONFIG"
 	registryRedirectEnvVar = "DRYCC_REGISTRY_REDIRECT"
-	minioLookupEnvVar      = "DRYCC_MINIO_LOOKUP"
-	minioBucketEnvVar      = "DRYCC_MINIO_BUCKET"
-	minioEndpointEnvVar    = "DRYCC_MINIO_ENDPOINT"
-	minioAccesskeyEnvVar   = "DRYCC_MINIO_ACCESSKEY"
-	minioSecretkeyEnvVar   = "DRYCC_MINIO_SECRETKEY"
+	storageLookupEnvVar    = "DRYCC_STORAGE_LOOKUP"
+	storageBucketEnvVar    = "DRYCC_STORAGE_BUCKET"
+	storageEndpointEnvVar  = "DRYCC_STORAGE_ENDPOINT"
+	storageAccesskeyEnvVar = "DRYCC_STORAGE_ACCESSKEY"
+	storageSecretkeyEnvVar = "DRYCC_STORAGE_SECRETKEY"
 	defaultCommand         = "serve"
 )
 
 func main() {
 	log.Println("INFO: Starting registry...")
 	os.Setenv("REGISTRY_STORAGE", "s3")
-	mEndpoint := os.Getenv(minioEndpointEnvVar)
+	mEndpoint := os.Getenv(storageEndpointEnvVar)
 	os.Setenv("REGISTRY_STORAGE_S3_REGIONENDPOINT", mEndpoint)
 
 	region := "us-east-1" //region is required in distribution
@@ -36,12 +36,12 @@ func main() {
 	}
 	os.Setenv("REGISTRY_STORAGE_S3_REGION", region)
 
-	os.Setenv("REGISTRY_STORAGE_S3_ACCESSKEY", os.Getenv(minioAccesskeyEnvVar))
-	os.Setenv("REGISTRY_STORAGE_S3_SECRETKEY", os.Getenv(minioSecretkeyEnvVar))
-	os.Setenv("REGISTRY_STORAGE_S3_BUCKET", os.Getenv(minioBucketEnvVar))
+	os.Setenv("REGISTRY_STORAGE_S3_ACCESSKEY", os.Getenv(storageAccesskeyEnvVar))
+	os.Setenv("REGISTRY_STORAGE_S3_SECRETKEY", os.Getenv(storageSecretkeyEnvVar))
+	os.Setenv("REGISTRY_STORAGE_S3_BUCKET", os.Getenv(storageBucketEnvVar))
 	os.Setenv("REGISTRY_STORAGE_S3_ROOTDIRECTORY", "/registry")
 
-	if os.Getenv(minioLookupEnvVar) == "path" {
+	if os.Getenv(storageLookupEnvVar) == "path" {
 		os.Setenv("REGISTRY_STORAGE_S3_FORCEPATHSTYLE", "true")
 	}
 

rootfs/bin/init_registry

@@ -2,25 +2,25 @@
 
 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"
 
 htpasswd -Bbn "${DRYCC_REGISTRY_USERNAME}" "${DRYCC_REGISTRY_PASSWORD}" > "${REGISTRY_AUTH_HTPASSWD_PATH}"
 echo "create ${REGISTRY_AUTH_HTPASSWD_PATH} success"