chore(builder): minio/minio#14331

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_SERVICE_HOST` and `DRYCC_MINIO_SERVICE_PORT` 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_SERVICE_HOST:$DRYCC_MINIO_SERVICE_HOST`
+  - 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`
 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/builder-deployment.yaml

@@ -31,7 +31,8 @@ spec:
           - netcat
           - -v
           - -a
-          - $(DRYCC_MINIO_SERVICE_HOST):$(DRYCC_MINIO_SERVICE_PORT)
+          - $(DRYCC_MINIO_ENDPOINT)
+        {{- include "builder.envs" . | indent 8 }}
       containers:
       - name: drycc-builder
         image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/builder:{{.Values.imageTag}}
@@ -41,58 +42,8 @@ spec:
             name: ssh
           - containerPort: 8092
             name: healthsrv
-{{- if or (.Values.limitsCpu) (.Values.limitsMemory)}}
-        resources:
-          limits:
-{{- if (.Values.limitsCpu) }}
-            cpu: {{.Values.limitsCpu}}
-{{- end}}
-{{- if (.Values.limitsMemory) }}
-            memory: {{.Values.limitsMemory}}
-{{- end}}
-{{- end}}
-        env:
-          # NOTE(bacongobbler): use drycc/registry_proxy to work around Docker --insecure-registry requirements
-          - name: "DRYCC_REGISTRY_PROXY_HOST"
-            value: "127.0.0.1"
-          - name: "DRYCC_REGISTRY_PROXY_PORT"
-            value: "{{ .Values.global.registryProxyPort }}"
-          - name: "HEALTH_SERVER_PORT"
-            value: "8092"
-          - name: "EXTERNAL_PORT"
-            value: "2223"
-          - name: BUILDER_STORAGE
-            value: "{{ .Values.global.storage }}"
-          - name: "DRYCC_REGISTRY_LOCATION"
-            value: "{{ .Values.global.registryLocation }}"
-          - name: "TTL_SECONDS_AFTER_FINISHED"
-            value: "{{ .Values.global.ttlSecondsAfterFinished }}"
-          # Set GIT_LOCK_TIMEOUT to number of minutes you want to wait to git push again to the same repository
-          - name: "GIT_LOCK_TIMEOUT"
-            value: "30"
-          - name: IMAGEBUILDER_IMAGE_PULL_POLICY
-            valueFrom:
-              configMapKeyRef:
-                name: imagebuilder-config
-                key: imagePullPolicy
-          # This var needs to be passed so that the minio client (https://github.com/minio/mc) will work in Alpine linux
-          - name: "DOCKERIMAGE"
-            value: "1"
-          - name: "DRYCC_DEBUG"
-            value: "false"
-          - name: "POD_NAMESPACE"
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
-          - name: DRYCC_BUILDER_KEY
-            valueFrom:
-              secretKeyRef:
-                name: builder-key-auth
-                key: builder-key
-{{- if (.Values.builder_pod_node_selector) }}
-          - name: BUILDER_POD_NODE_SELECTOR
-            value: {{.Values.builder_pod_node_selector}}
-{{- end}}
+        {{- include "builder.limits" . | indent 8 }}
+        {{- include "builder.envs" . | indent 8 }}
         livenessProbe:
           httpGet:
             path: /healthz

pkg/conf/config.go

@@ -10,8 +10,7 @@ import (
 
 const (
 	storageCredLocation = "/var/run/secrets/drycc/objectstore/creds/"
-	minioHostEnvVar     = "DRYCC_MINIO_SERVICE_HOST"
-	minioPortEnvVar     = "DRYCC_MINIO_SERVICE_PORT"
+	minioHostEnvVar     = "DRYCC_MINIO_ENDPOINT"
 	gcsKey              = "key.json"
 )
 

pkg/conf/config_test.go

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

rootfs/bin/normalize_storage

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