chore(registry): minio/minio#13799

Author: duanhongyi

charts/registry/templates/_helper.tpl

@@ -1,7 +1,7 @@
 {{- define "registry.envs" -}}
 {{- if eq .Values.global.minioLocation "on-cluster" }}
 - name: "DRYCC_MINIO_ENDPOINT"
-  value: ${DRYCC_MINIO_SERVICE_HOST}:${DRYCC_MINIO_SERVICE_PORT}
+  value: http://${DRYCC_MINIO_SERVICE_HOST}:${DRYCC_MINIO_SERVICE_PORT}
 {{- else }}
 - name: "DRYCC_MINIO_ENDPOINT"
   value: "{{ .Values.minio.endpoint }}"

charts/registry/templates/registry-deployment.yaml

@@ -31,7 +31,7 @@ spec:
         args:
           - netcat
           - -v
-          - -a
+          - -u
           - $(DRYCC_MINIO_ENDPOINT)
         {{- include "builder.envs" . | indent 8 }}
       containers:

charts/registry/templates/registry-secret.yaml

@@ -1,4 +1,4 @@
-{{- if ne .Values.global.registryLocation "on-cluster" }}
+{{- if ne .Values.global.registryLocation "off-cluster" }}
 apiVersion: v1
 kind: Secret
 metadata:

contrib/ci/test.sh

@@ -12,7 +12,7 @@ echo "1234567890123456789012345678901234567890" > "${CURRENT_DIR}"/tmp/aws-user/
 
 MINIO_JOB=$(docker run -d --name minio \
   -v "${CURRENT_DIR}"/tmp/aws-user:/var/run/secrets/drycc/minio/creds \
-  "${DEV_REGISTRY}"/drycc/minio:canary server /data/minio/)
+  "${DEV_REGISTRY}"/drycc/minio:canary server /data/minio/ --console-address :9001)
 
 sleep 5
 docker logs "${MINIO_JOB}"
@@ -21,7 +21,7 @@ MINIO_IP=$(docker inspect --format "{{ .NetworkSettings.IPAddress }}" "${MINIO_J
 
 JOB=$(docker run --add-host minio:"${MINIO_IP}" \
   -d \
-  -e DRYCC_MINIO_ENDPOINT=minio:9000 \
+  -e DRYCC_MINIO_ENDPOINT=http://minio:9000 \
   -v "${CURRENT_DIR}"/tmp/aws-user:/var/run/secrets/drycc/minio/creds \
   "$1")
 

main.go

@@ -1,11 +1,13 @@
 package main
 
 import (
-	"fmt"
 	"io/ioutil"
 	"log"
+	"net"
+	"net/url"
 	"os"
 	"os/exec"
+	"strings"
 )
 
 const (
@@ -17,10 +19,16 @@ const (
 
 func main() {
 	log.Println("INFO: Starting registry...")
-	mEndpoint := os.Getenv(minioEndpointEnvVar)
 	os.Setenv("REGISTRY_STORAGE", "s3")
-	os.Setenv("REGISTRY_STORAGE_S3_BACKEND", "minio")
-	os.Setenv("REGISTRY_STORAGE_S3_REGIONENDPOINT", fmt.Sprintf("http://%s", mEndpoint))
+	mEndpoint := os.Getenv(minioEndpointEnvVar)
+	os.Setenv("REGISTRY_STORAGE_S3_REGIONENDPOINT", mEndpoint)
+	region := "us-east-1" //region is required in distribution
+	if endpointURL, err := url.Parse(mEndpoint); err == nil {
+		if endpointURL.Hostname() != "" && net.ParseIP(endpointURL.Hostname()) == nil {
+			region = strings.Split(endpointURL.Hostname(), ".")[0]
+		}
+	}
+	os.Setenv("REGISTRY_STORAGE_S3_REGION", region)
 
 	if accesskey, err := ioutil.ReadFile("/var/run/secrets/drycc/minio/creds/accesskey"); err != nil {
 		log.Fatal(err)
@@ -45,8 +53,6 @@ func main() {
 		os.Setenv("REGISTRY_STORAGE_S3_BUCKET", "registry") // default bucket
 	}
 
-	os.Setenv("REGISTRY_STORAGE_S3_REGION", "us-east-1")
-
 	// run /bin/create_bucket
 	cmd := exec.Command("/bin/create_bucket")
 	cmd.Stdout = os.Stdout

rootfs/bin/normalize_storage

@@ -18,6 +18,6 @@ if [ -f $SECRET_KEY_FILE ]; then
   export MINIO_SECRET_KEY
 fi
 
-export MINIO_ENDPOINT=http://"${DRYCC_MINIO_ENDPOINT}"
+export MINIO_ENDPOINT="${DRYCC_MINIO_ENDPOINT}"
 
-mc config host add minio "${MINIO_ENDPOINT}" "${MINIO_ACCESS_KEY}" "${MINIO_SECRET_KEY}"
+mc config host add minio "${MINIO_ENDPOINT}" "${MINIO_ACCESS_KEY}" "${MINIO_SECRET_KEY}" --api s3v4