chore(builder): change storage to minio

duanhongyi · duanhongyi · commit b8ddcd98bdbb · 2022-07-18T10:34:54.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,4 @@ rootfs/usr/bin/
 coverage.txt
 testdata/hooks/pre-receive
 .idea/
-
+.vscode/
diff --git a/README.md b/README.md
@@ -19,10 +19,7 @@ We welcome your input! If you have feedback, please [submit an issue][issues]. I
 The builder is primarily a git server that responds to `git push`es by executing either the `git-receive-pack` or `git-upload-pack` hook. After it executes one of those hooks, it takes the following high level steps in order:
 
 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 `$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:
+2. 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
   - You can use `DRYCC_STACK` specifies the build type. Currently, it supports two types: `buildpack` and `container`
diff --git a/charts/builder/templates/_helpers.tpl b/charts/builder/templates/_helpers.tpl
@@ -25,30 +25,30 @@ env:
     secretKeyRef:
       name: builder-key-auth
       key: builder-key
-- 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: builder-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
 - name: "DRYCC_REGISTRY_LOCATION"
   value: "{{ .Values.global.registryLocation }}"
diff --git a/charts/builder/templates/builder-deployment.yaml b/charts/builder/templates/builder-deployment.yaml
@@ -34,7 +34,7 @@ spec:
           - netcat
           - -v
           - -u
-          - $(DRYCC_MINIO_ENDPOINT)
+          - $(DRYCC_STORAGE_ENDPOINT)
         {{- include "builder.envs" . | indent 8 }}
       containers:
       - name: drycc-builder
diff --git a/pkg/cleaner/cleaner.go b/pkg/cleaner/cleaner.go
@@ -88,7 +88,7 @@ func dirHasGitSuffix(dir string) bool {
 	return strings.HasSuffix(dir, dotGitSuffix)
 }
 
-func deleteFromMinio(app string, storageDriver storagedriver.StorageDriver) error {
+func deleteFromStorage(app string, storageDriver storagedriver.StorageDriver) error {
 
 	// delete all files matching app
 	objs, err := storageDriver.List(context.Background(), "home")
@@ -138,7 +138,7 @@ func Run(gitHome string, nsLister k8s.NamespaceLister, fs sys.FS, pollSleepDurat
 			if err := fs.RemoveAll(dirToDelete); err != nil {
 				log.Err("Cleaner error removing local files for deleted app %s (%s)", dirToDelete, err)
 			}
-			if err := deleteFromMinio(appToDelete, storageDriver); err != nil {
+			if err := deleteFromStorage(appToDelete, storageDriver); err != nil {
 				log.Err("Cleaner error removing object store files for deleted app %s (%s)", appToDelete, err)
 			}
 		}
diff --git a/pkg/conf/config.go b/pkg/conf/config.go
@@ -11,11 +11,11 @@ import (
 )
 
 const (
-	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"
 )
 
 // BuilderKeyLocation holds the path of the builder key secret.
@@ -38,7 +38,7 @@ func GetBuilderKey() (string, error) {
 func GetStorageParams(env sys.Env) (Parameters, error) {
 	params := make(map[string]interface{})
 
-	mEndpoint := env.Get(minioEndpointEnvVar)
+	mEndpoint := env.Get(storageEndpointEnvVar)
 	params["regionendpoint"] = mEndpoint
 	region := "us-east-1" //region is required in distribution
 	if endpointURL, err := url.Parse(mEndpoint); err == nil {
@@ -48,10 +48,10 @@ func GetStorageParams(env sys.Env) (Parameters, error) {
 	}
 	params["region"] = region
 
-	params["accesskey"] = env.Get(minioAccesskeyEnvVar)
-	params["secretkey"] = env.Get(minioSecretkeyEnvVar)
-	params["bucket"] = env.Get(minioBucketEnvVar)
-	if env.Get(minioLookupEnvVar) == "path" {
+	params["accesskey"] = env.Get(storageAccesskeyEnvVar)
+	params["secretkey"] = env.Get(storageSecretkeyEnvVar)
+	params["bucket"] = env.Get(storageBucketEnvVar)
+	if env.Get(storageLookupEnvVar) == "path" {
 		params["forcepathstyle"] = "true"
 	}
 
diff --git a/pkg/conf/config_test.go b/pkg/conf/config_test.go
@@ -14,12 +14,11 @@ func TestGetStorageParams(t *testing.T) {
 
 	env := sys.NewFakeEnv()
 	env.Envs = map[string]string{
-		"BUILDER_STORAGE":       "minio",
-		"DRYCC_MINIO_LOOKUP":    "path",
-		"DRYCC_MINIO_BUCKET":    "builder",
-		"DRYCC_MINIO_ENDPOINT":  "http://localhost:8088",
-		"DRYCC_MINIO_ACCESSKEY": "admin",
-		"DRYCC_MINIO_SECRETKEY": "adminpass",
+		"DRYCC_STORAGE_LOOKUP":    "path",
+		"DRYCC_STORAGE_BUCKET":    "builder",
+		"DRYCC_STORAGE_ENDPOINT":  "http://localhost:8088",
+		"DRYCC_STORAGE_ACCESSKEY": "admin",
+		"DRYCC_STORAGE_SECRETKEY": "adminpass",
 	}
 	params, err := GetStorageParams(env)
 	if err != nil {
diff --git a/pkg/gitreceive/imagebuilder.go b/pkg/gitreceive/imagebuilder.go
@@ -9,9 +9,9 @@ import (
 
 var (
 	requiredEnvNames = []string{
-		"DRYCC_MINIO_LOOKUP",
-		"DRYCC_MINIO_BUCKET",
-		"DRYCC_MINIO_ENDPOINT",
+		"DRYCC_STORAGE_LOOKUP",
+		"DRYCC_STORAGE_BUCKET",
+		"DRYCC_STORAGE_ENDPOINT",
 		"DRYCC_REGISTRY_HOST",
 	}
 )
@@ -37,7 +37,7 @@ func checkImagebuilderRequiredEnv(imagebuilderEnv map[string]string) error {
 }
 
 func getImagebuilderEnv(image *string, config *Config, env sys.Env) (map[string]string, error) {
-	imagebuilderEnv := env.Environ([]string{"DRYCC_REGISTRY_", "DRYCC_MINIO_"})
+	imagebuilderEnv := env.Environ([]string{"DRYCC_REGISTRY_", "DRYCC_STORAGE_"})
 	if err := checkImagebuilderRequiredEnv(imagebuilderEnv); err != nil {
 		return nil, err
 	}
diff --git a/pkg/gitreceive/imagebuilder_test.go b/pkg/gitreceive/imagebuilder_test.go
@@ -15,9 +15,9 @@ func TestGetImagebuilderEnvOffclusterErr(t *testing.T) {
 	}
 	env := sys.NewFakeEnv()
 	env.Envs = map[string]string{
-		"DRYCC_MINIO_LOOKUP":      "path",
-		"DRYCC_MINIO_BUCKET":      "builder",
-		"DRYCC_MINIO_ENDPOINT":    "drycc-minio.drycc.svc.cluster.local",
+		"DRYCC_STORAGE_LOOKUP":    "path",
+		"DRYCC_STORAGE_BUCKET":    "builder",
+		"DRYCC_STORAGE_ENDPOINT":  "drycc-storage.drycc.svc.cluster.local",
 		"DRYCC_REGISTRY_LOCATION": "off-cluster",
 	}
 	_, err := getImagebuilderEnv(&image, config, env)
@@ -30,17 +30,17 @@ func TestGetImagebuilderEnvOffclusterErr(t *testing.T) {
 func TestGetImagebuilderEnvOffclusterSuccess(t *testing.T) {
 	env := sys.NewFakeEnv()
 	env.Envs = map[string]string{
-		"DRYCC_MINIO_LOOKUP":          "path",
-		"DRYCC_MINIO_BUCKET":          "builder",
-		"DRYCC_MINIO_ENDPOINT":        "drycc-minio.drycc.svc.cluster.local",
+		"DRYCC_STORAGE_LOOKUP":        "path",
+		"DRYCC_STORAGE_BUCKET":        "builder",
+		"DRYCC_STORAGE_ENDPOINT":      "drycc-storage.drycc.svc.cluster.local",
 		"DRYCC_REGISTRY_HOST":         "quay.io",
 		"DRYCC_REGISTRY_ORGANIZATION": "kmala",
 		"DRYCC_REGISTRY_LOCATION":     "off-cluster",
 	}
 	expectedData := map[string]string{
-		"DRYCC_MINIO_LOOKUP":          "path",
-		"DRYCC_MINIO_BUCKET":          "builder",
-		"DRYCC_MINIO_ENDPOINT":        "drycc-minio.drycc.svc.cluster.local",
+		"DRYCC_STORAGE_LOOKUP":        "path",
+		"DRYCC_STORAGE_BUCKET":        "builder",
+		"DRYCC_STORAGE_ENDPOINT":      "drycc-storage.drycc.svc.cluster.local",
 		"DRYCC_REGISTRY_LOCATION":     "off-cluster",
 		"DRYCC_REGISTRY_HOST":         "quay.io",
 		"DRYCC_REGISTRY_ORGANIZATION": "kmala",
@@ -61,17 +61,17 @@ func TestGetImagebuilderEnvOffclusterSuccess(t *testing.T) {
 func TestGetImagebuilderEnvOnclusterSuccess(t *testing.T) {
 	env := sys.NewFakeEnv()
 	env.Envs = map[string]string{
-		"DRYCC_MINIO_LOOKUP":        "path",
-		"DRYCC_MINIO_BUCKET":        "builder",
-		"DRYCC_MINIO_ENDPOINT":      "drycc-minio.drycc.svc.cluster.local",
+		"DRYCC_STORAGE_LOOKUP":      "path",
+		"DRYCC_STORAGE_BUCKET":      "builder",
+		"DRYCC_STORAGE_ENDPOINT":    "drycc-storage.drycc.svc.cluster.local",
 		"DRYCC_REGISTRY_HOST":       "drycc-registry.drycc.svc.cluster.local",
 		"DRYCC_REGISTRY_PROXY_HOST": "127.0.0.1:8000",
 		"DRYCC_REGISTRY_LOCATION":   "on-cluster",
 	}
 	expectedData := map[string]string{
-		"DRYCC_MINIO_LOOKUP":          "path",
-		"DRYCC_MINIO_BUCKET":          "builder",
-		"DRYCC_MINIO_ENDPOINT":        "drycc-minio.drycc.svc.cluster.local",
+		"DRYCC_STORAGE_LOOKUP":        "path",
+		"DRYCC_STORAGE_BUCKET":        "builder",
+		"DRYCC_STORAGE_ENDPOINT":      "drycc-storage.drycc.svc.cluster.local",
 		"DRYCC_REGISTRY_HOST":         "drycc-registry.drycc.svc.cluster.local",
 		"DRYCC_REGISTRY_LOCATION":     "on-cluster",
 		"DRYCC_REGISTRY_PROXY_HOST":   "127.0.0.1:8000",
diff --git a/rootfs/bin/create_bucket b/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"

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func dirHasGitSuffix(dir string) bool {`
`88`	`88`	`return strings.HasSuffix(dir, dotGitSuffix)`
`89`	`89`	`}`
`90`	`90`
`91`		`-func deleteFromMinio(app string, storageDriver storagedriver.StorageDriver) error {`
	`91`	`+func deleteFromStorage(app string, storageDriver storagedriver.StorageDriver) error {`
`92`	`92`
`93`	`93`	`// delete all files matching app`
`94`	`94`	`objs, err := storageDriver.List(context.Background(), "home")`
`@@ -138,7 +138,7 @@ func Run(gitHome string, nsLister k8s.NamespaceLister, fs sys.FS, pollSleepDurat`
`138`	`138`	`if err := fs.RemoveAll(dirToDelete); err != nil {`
`139`	`139`	`log.Err("Cleaner error removing local files for deleted app %s (%s)", dirToDelete, err)`
`140`	`140`	`}`
`141`		`- if err := deleteFromMinio(appToDelete, storageDriver); err != nil {`
	`141`	`+ if err := deleteFromStorage(appToDelete, storageDriver); err != nil {`
`142`	`142`	`log.Err("Cleaner error removing object store files for deleted app %s (%s)", appToDelete, err)`
`143`	`143`	`}`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ import (`
`9`	`9`
`10`	`10`	`var (`
`11`	`11`	`requiredEnvNames = []string{`
`12`		`- "DRYCC_MINIO_LOOKUP",`
`13`		`- "DRYCC_MINIO_BUCKET",`
`14`		`- "DRYCC_MINIO_ENDPOINT",`
	`12`	`+ "DRYCC_STORAGE_LOOKUP",`
	`13`	`+ "DRYCC_STORAGE_BUCKET",`
	`14`	`+ "DRYCC_STORAGE_ENDPOINT",`
`15`	`15`	`"DRYCC_REGISTRY_HOST",`
`16`	`16`	`}`
`17`	`17`	`)`
`@@ -37,7 +37,7 @@ func checkImagebuilderRequiredEnv(imagebuilderEnv map[string]string) error {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`func getImagebuilderEnv(image string, config Config, env sys.Env) (map[string]string, error) {`
`40`		`- imagebuilderEnv := env.Environ([]string{"DRYCC_REGISTRY_", "DRYCC_MINIO_"})`
	`40`	`+ imagebuilderEnv := env.Environ([]string{"DRYCC_REGISTRY_", "DRYCC_STORAGE_"})`
`41`	`41`	`if err := checkImagebuilderRequiredEnv(imagebuilderEnv); err != nil {`
`42`	`42`	`return nil, err`
`43`	`43`	`}`