chore(builder): minio/minio#13799

Author: duanhongyi

README.md

@@ -21,7 +21,7 @@ The builder is primarily a git server that responds to `git push`es by executing
 1. Calls `git archive` to produce a tarball (i.e. a `.tar.gz` file) on the local file system
 2. Saves the tarball to centralized object storage according to the following rules:
 	- If the `BUILDER_STORAGE` environment variable is other than `minio`, attempts to create the appropriate storage driver and saves using this driver.
-  - Otherwise, if `BUILDER_STORAGE` is `minio` and the `DRYCC_MINIO_ENDPOINT` environment variables exist (these are standard [Kubernetes service discovery environment variables](http://kubernetes.io/docs/user-guide/services/#environment-variables)), saves to the [S3 API][s3-api-ref] compatible server at `http://$DRYCC_MINIO_ENDPOINT`
+  - Otherwise, if `BUILDER_STORAGE` is `minio` and the `DRYCC_MINIO_ENDPOINT` environment variables exist (these are standard [Kubernetes service discovery environment variables](http://kubernetes.io/docs/user-guide/services/#environment-variables)), saves to the [S3 API][s3-api-ref] compatible server at `$DRYCC_MINIO_ENDPOINT`
 3. Starts a new [Kubernetes Pod](http://kubernetes.io/docs/user-guide/pods/) to build the code, according to the following rules:
   - If there is a `Dockerfile`, build the container with imagebuilder
   - Otherwise, use imagebuilder to build CNCF native buildpack

charts/builder/templates/_helpers.tpl

@@ -39,7 +39,7 @@ env:
   value: {{.Values.builder_pod_node_selector}}
 {{- 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/builder/templates/builder-deployment.yaml

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

pkg/conf/config.go

@@ -3,6 +3,9 @@ package conf
 import (
 	"fmt"
 	"io/ioutil"
+	"net"
+	"net/url"
+	"os"
 	"strings"
 
 	"github.com/drycc/builder/pkg/sys"
@@ -50,9 +53,15 @@ func GetStorageParams(env sys.Env) (Parameters, error) {
 		params[file.Name()] = string(data)
 	}
 	params["bucket"] = params["builder-bucket"]
-	mEndpointVar := env.Get(minioEndpointVar)
-	params["region"] = "us-east-1"
-	params["regionendpoint"] = fmt.Sprintf("http://%s", mEndpointVar)
-	params["secure"] = false
+	mEndpoint := env.Get(minioEndpointVar)
+	params["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)
+
 	return params, nil
 }

pkg/conf/config_test.go

@@ -69,7 +69,7 @@ func TestGetStorageParams(t *testing.T) {
 	env := sys.NewFakeEnv()
 	env.Envs = map[string]string{
 		"BUILDER_STORAGE":      "minio",
-		"DRYCC_MINIO_ENDPOINT": "localhost:8088",
+		"DRYCC_MINIO_ENDPOINT": "http://localhost:8088",
 	}
 	params, err = GetStorageParams(env)
 	if err != nil {

rootfs/bin/normalize_storage

@@ -16,6 +16,7 @@ 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}"
+# force aws signv4 to avoid probe
+mc config host add minio "${MINIO_ENDPOINT}" "${MINIO_ACCESS_KEY}" "${MINIO_SECRET_KEY}" --api s3v4