chore(storage): use path style replace lookup

duanhongyi · duanhongyi · commit 405090db635c · 2025-07-22T10:38:43.000+08:00
diff --git a/charts/builder/templates/_helpers.tpl b/charts/builder/templates/_helpers.tpl
@@ -23,11 +23,6 @@ env:
 - name: "DRYCC_CONTROLLER_URL"
   value: http://drycc-controller-api
 {{- if (.Values.storageEndpoint) }}
-- name: "DRYCC_STORAGE_LOOKUP"
-  valueFrom:
-    secretKeyRef:
-      name: builder-secret
-      key: storage-lookup
 - name: "DRYCC_STORAGE_BUCKET"
   valueFrom:
     secretKeyRef:
@@ -48,9 +43,12 @@ env:
     secretKeyRef:
       name: builder-secret
       key: storage-secretkey
+- name: "DRYCC_STORAGE_PATH_STYLE"
+  valueFrom:
+    secretKeyRef:
+      name: builder-secret
+      key: storage-path-style
 {{- else if .Values.storage.enabled  }}
-- name: "DRYCC_STORAGE_LOOKUP"
-  value: "path"
 - name: "DRYCC_STORAGE_BUCKET"
   value: "builder"
 - name: "DRYCC_STORAGE_ENDPOINT"
@@ -65,6 +63,8 @@ env:
     secretKeyRef:
       name: storage-creds
       key: secretkey
+- name: "DRYCC_STORAGE_PATH_STYLE"
+  value: "on"
 {{- end }}
 - name: "DRYCC_REGISTRY_LOCATION"
   value: {{ ternary "on-cluster" "off-cluster" .Values.registry.enabled }}
diff --git a/charts/builder/templates/builder-secret.yaml b/charts/builder/templates/builder-secret.yaml
@@ -13,9 +13,9 @@ data:
   registry-organization: {{ .Values.registryOrganization | b64enc }}
   {{- end }}
   {{- if (.Values.storageEndpoint) }}
-  storage-lookup: {{ .Values.storageLookup | b64enc }}
   storage-bucket: {{ .Values.storageBucket | b64enc }}
   storage-endpoint: {{ .Values.storageEndpoint | b64enc }}
   storage-accesskey: {{ .Values.storageAccesskey | b64enc }}
   storage-secretkey: {{ .Values.storageSecretkey | b64enc }}
+  storage-path-style: {{ .Values.storagePathStyle | b64enc }}
   {{- end }}
diff --git a/charts/builder/values.yaml b/charts/builder/values.yaml
@@ -57,11 +57,11 @@ podAntiAffinityPreset:
 ttlSecondsAfterFinished: 21600
 
 # The following parameters will no longer use the built-in storage component.
-storageLookup: "auto"
 storageBucket: "registry"
 storageEndpoint: ""
 storageAccesskey: ""
 storageSecretkey: ""
+storagePathStyle: "auto"
 
 # The following parameters will no longer use the built-in registry component.
 registryHost: ""
diff --git a/pkg/conf/config.go b/pkg/conf/config.go
@@ -11,11 +11,11 @@ import (
 )
 
 const (
-	storageLookupEnvVar    = "DRYCC_STORAGE_LOOKUP"
 	storageBucketEnvVar    = "DRYCC_STORAGE_BUCKET"
 	storageEndpointEnvVar  = "DRYCC_STORAGE_ENDPOINT"
 	storageAccesskeyEnvVar = "DRYCC_STORAGE_ACCESSKEY"
 	storageSecretkeyEnvVar = "DRYCC_STORAGE_SECRETKEY"
+	storagePathStyleEnvVar = "DRYCC_STORAGE_PATH_STYLE"
 )
 
 // ServiceKeyLocation holds the path of the service key secret.
@@ -51,7 +51,7 @@ func GetStorageParams(env sys.Env) (Parameters, error) {
 	params["accesskey"] = env.Get(storageAccesskeyEnvVar)
 	params["secretkey"] = env.Get(storageSecretkeyEnvVar)
 	params["bucket"] = env.Get(storageBucketEnvVar)
-	if env.Get(storageLookupEnvVar) == "path" {
+	if env.Get(storagePathStyleEnvVar) == "on" {
 		params["forcepathstyle"] = "true"
 	}
 
diff --git a/pkg/conf/config_test.go b/pkg/conf/config_test.go
@@ -13,11 +13,11 @@ func TestGetStorageParams(t *testing.T) {
 
 	env := sys.NewFakeEnv()
 	env.Envs = map[string]string{
-		"DRYCC_STORAGE_LOOKUP":    "path",
-		"DRYCC_STORAGE_BUCKET":    "builder",
-		"DRYCC_STORAGE_ENDPOINT":  "http://localhost:8088",
-		"DRYCC_STORAGE_ACCESSKEY": "admin",
-		"DRYCC_STORAGE_SECRETKEY": "adminpass",
+		"DRYCC_STORAGE_BUCKET":     "builder",
+		"DRYCC_STORAGE_ENDPOINT":   "http://localhost:8088",
+		"DRYCC_STORAGE_ACCESSKEY":  "admin",
+		"DRYCC_STORAGE_SECRETKEY":  "adminpass",
+		"DRYCC_STORAGE_PATH_STYLE": "on",
 	}
 	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_STORAGE_LOOKUP",
 		"DRYCC_STORAGE_BUCKET",
 		"DRYCC_STORAGE_ENDPOINT",
+		"DRYCC_STORAGE_PATH_STYLE",
 		"DRYCC_REGISTRY_HOST",
 	}
 )
diff --git a/pkg/gitreceive/imagebuilder_test.go b/pkg/gitreceive/imagebuilder_test.go
@@ -15,10 +15,10 @@ func TestGetImagebuilderEnvOffclusterErr(t *testing.T) {
 	}
 	env := sys.NewFakeEnv()
 	env.Envs = map[string]string{
-		"DRYCC_STORAGE_LOOKUP":    "path",
-		"DRYCC_STORAGE_BUCKET":    "builder",
-		"DRYCC_STORAGE_ENDPOINT":  "drycc-storage",
-		"DRYCC_REGISTRY_LOCATION": "off-cluster",
+		"DRYCC_STORAGE_BUCKET":     "builder",
+		"DRYCC_STORAGE_ENDPOINT":   "drycc-storage",
+		"DRYCC_STORAGE_PATH_STYLE": "auto",
+		"DRYCC_REGISTRY_LOCATION":  "off-cluster",
 	}
 	_, err := getImagebuilderEnv(&image, config, env)
 	assert.Error(t, err, errors.New("the environment variable DRYCC_REGISTRY_HOST is required"))
@@ -30,17 +30,17 @@ func TestGetImagebuilderEnvOffclusterErr(t *testing.T) {
 func TestGetImagebuilderEnvOffclusterSuccess(t *testing.T) {
 	env := sys.NewFakeEnv()
 	env.Envs = map[string]string{
-		"DRYCC_STORAGE_LOOKUP":        "path",
 		"DRYCC_STORAGE_BUCKET":        "builder",
 		"DRYCC_STORAGE_ENDPOINT":      "drycc-storage",
+		"DRYCC_STORAGE_PATH_STYLE":    "auto",
 		"DRYCC_REGISTRY_HOST":         "quay.io",
 		"DRYCC_REGISTRY_ORGANIZATION": "kmala",
 		"DRYCC_REGISTRY_LOCATION":     "off-cluster",
 	}
 	expectedData := map[string]string{
-		"DRYCC_STORAGE_LOOKUP":        "path",
 		"DRYCC_STORAGE_BUCKET":        "builder",
 		"DRYCC_STORAGE_ENDPOINT":      "drycc-storage",
+		"DRYCC_STORAGE_PATH_STYLE":    "auto",
 		"DRYCC_REGISTRY_LOCATION":     "off-cluster",
 		"DRYCC_REGISTRY_HOST":         "quay.io",
 		"DRYCC_REGISTRY_ORGANIZATION": "kmala",
@@ -61,17 +61,18 @@ func TestGetImagebuilderEnvOffclusterSuccess(t *testing.T) {
 func TestGetImagebuilderEnvOnclusterSuccess(t *testing.T) {
 	env := sys.NewFakeEnv()
 	env.Envs = map[string]string{
-		"DRYCC_STORAGE_LOOKUP":      "path",
 		"DRYCC_STORAGE_BUCKET":      "builder",
 		"DRYCC_STORAGE_ENDPOINT":    "drycc-storage",
+		"DRYCC_STORAGE_PATH_STYLE":  "auto",
 		"DRYCC_REGISTRY_HOST":       "drycc-registry",
 		"DRYCC_REGISTRY_PROXY_HOST": "127.0.0.1:8000",
 		"DRYCC_REGISTRY_LOCATION":   "on-cluster",
 	}
 	expectedData := map[string]string{
-		"DRYCC_STORAGE_LOOKUP":        "path",
+
 		"DRYCC_STORAGE_BUCKET":        "builder",
 		"DRYCC_STORAGE_ENDPOINT":      "drycc-storage",
+		"DRYCC_STORAGE_PATH_STYLE":    "auto",
 		"DRYCC_REGISTRY_HOST":         "drycc-registry",
 		"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,11 +2,11 @@
 
 set -e
 
-mc config host add storage \
+mc alias set storage \
   "${DRYCC_STORAGE_ENDPOINT}" \
   "${DRYCC_STORAGE_ACCESSKEY}" \
   "${DRYCC_STORAGE_SECRETKEY}" \
-  --lookup "${DRYCC_STORAGE_LOOKUP}" \
-  --api s3v4
+  --path "${DRYCC_STORAGE_PATH_STYLE}"
+
 mc ping storage -x
 mc mb --ignore-existing storage/"${DRYCC_STORAGE_BUCKET}"

Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,11 @@ import (`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`const (`
`14`		`- storageLookupEnvVar = "DRYCC_STORAGE_LOOKUP"`
`15`	`14`	`storageBucketEnvVar = "DRYCC_STORAGE_BUCKET"`
`16`	`15`	`storageEndpointEnvVar = "DRYCC_STORAGE_ENDPOINT"`
`17`	`16`	`storageAccesskeyEnvVar = "DRYCC_STORAGE_ACCESSKEY"`
`18`	`17`	`storageSecretkeyEnvVar = "DRYCC_STORAGE_SECRETKEY"`
	`18`	`+ storagePathStyleEnvVar = "DRYCC_STORAGE_PATH_STYLE"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`// ServiceKeyLocation holds the path of the service key secret.`
`@@ -51,7 +51,7 @@ func GetStorageParams(env sys.Env) (Parameters, error) {`
`51`	`51`	`params["accesskey"] = env.Get(storageAccesskeyEnvVar)`
`52`	`52`	`params["secretkey"] = env.Get(storageSecretkeyEnvVar)`
`53`	`53`	`params["bucket"] = env.Get(storageBucketEnvVar)`
`54`		`- if env.Get(storageLookupEnvVar) == "path" {`
	`54`	`+ if env.Get(storagePathStyleEnvVar) == "on" {`
`55`	`55`	`params["forcepathstyle"] = "true"`
`56`	`56`	`}`
`57`	`57`
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_STORAGE_LOOKUP",`
`13`	`12`	`"DRYCC_STORAGE_BUCKET",`
`14`	`13`	`"DRYCC_STORAGE_ENDPOINT",`
	`14`	`+ "DRYCC_STORAGE_PATH_STYLE",`
`15`	`15`	`"DRYCC_REGISTRY_HOST",`
`16`	`16`	`}`
`17`	`17`	`)`