chore(storage): use path style replace lookup

Author: duanhongyi

charts/quickwit/templates/_helpers.tpl

@@ -34,11 +34,6 @@ env:
   value: "postgres://$(DRYCC_PG_USER):$(DRYCC_PG_PASSWORD)@drycc-database:5432/quickwit"
 {{- end }}
 {{- if (.Values.storageEndpoint) }}
-- name: "DRYCC_STORAGE_LOOKUP"
-  valueFrom:
-    secretKeyRef:
-      name: quickwit-creds
-      key: storage-lookup
 - name: "DRYCC_STORAGE_BUCKET"
   valueFrom:
     secretKeyRef:
@@ -59,9 +54,12 @@ env:
     secretKeyRef:
       name: quickwit-creds
       key: storage-secretkey
+- name: "DRYCC_STORAGE_PATH_STYLE"
+  valueFrom:
+    secretKeyRef:
+      name: quickwit-creds
+      key: storage-path-style
 {{- else if .Values.storage.enabled  }}
-- name: "DRYCC_STORAGE_LOOKUP"
-  value: "path"
 - name: "DRYCC_STORAGE_BUCKET"
   value: "quickwit"
 - name: "DRYCC_STORAGE_ENDPOINT"
@@ -76,6 +74,8 @@ env:
     secretKeyRef:
       name: storage-creds
       key: secretkey
+- name: "DRYCC_STORAGE_PATH_STYLE"
+  value: "on"
 {{- end }}
 - name: QW_CLUSTER_ID
   value: drycc-quickwit

charts/quickwit/templates/quickwit-secret-creds.yaml

@@ -10,9 +10,9 @@ data:
   database-url: {{ .Values.databaseUrl | 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 }}

charts/quickwit/values.yaml

@@ -26,11 +26,11 @@ logIndexTemplateName: "logs"
 # databaseUrl are will no longer use the built-in database component
 databaseUrl: ""
 # The following parameters will no longer use the built-in storage component.
-storageLookup: ""
 storageBucket: ""
 storageEndpoint: ""
 storageAccesskey: ""
 storageSecretkey: ""
+storagePathStyle: "auto"
 
 control_plane:
   nodeAffinityPreset:

rootfs/usr/local/bin/init-quickwit

@@ -7,17 +7,17 @@ alias mc="init-stack mc"
 alias jq="init-stack jq"
 alias quickwit="init-stack quickwit"
 
-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}"
 
 AWS_REGION=${DRYCC_STORAGE_ENDPOINT%%.*}
-if [ "$DRYCC_STORAGE_LOOKUP" = "path" ]; then
+if [ "$DRYCC_STORAGE_PATH_STYLE" = "on" ]; then
     QW_S3_FORCE_PATH_STYLE_ACCESS="true"
 fi
 export AWS_REGION QW_S3_FORCE_PATH_STYLE_ACCESS