diff --git a/templates/csi-s3.yaml b/templates/csi-s3.yaml index 52b3ff66f255dd80214a1207a6bfd1e50fc3aa28..9732b6ca643db7a93e4d0c54dce43128b7c3b693 100644 --- a/templates/csi-s3.yaml +++ b/templates/csi-s3.yaml @@ -90,10 +90,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - {{- if .Values.storageClass.path }} - - name: PREFIX_PATH - value: {{ .Values.storageClass.path }} - {{- end }} volumeMounts: - name: plugin-dir mountPath: /csi diff --git a/templates/secret.yaml b/templates/secret.yaml index 6150370f869128787a381538b17aca0e5d66e8f0..514df106e0f1a022f207b2b2f9debf5f5d072975 100644 --- a/templates/secret.yaml +++ b/templates/secret.yaml @@ -16,6 +16,12 @@ stringData: region: {{ .Values.secret.region }} {{- end }} {{- if .Values.secret.insecure }} - insecure: "true" + insecure: "{{ .Values.secret.insecure }}" {{- end }} -{{- end -}} +{{- if .Values.secret.usePathRequestStyle }} + usePathRequestStyle: "{{ .Values.secret.usePathRequestStyle }}" +{{- end }} +{{- if .Values.storageClass.path }} + path: {{ .Values.storageClass.path }} +{{- end }} +{{- end -}} \ No newline at end of file diff --git a/values-overrides.yaml b/values-overrides.yaml index 9ff78455ea1435b2b8e1d02011d8ce793a3e6c1b..4addabbf995e14c1ce7d0471eaa2f49d3578d3e5 100644 --- a/values-overrides.yaml +++ b/values-overrides.yaml @@ -16,8 +16,6 @@ storageClass: singleBucket: "bd-wind" # mounter to use - either geesefs, s3fs or rclone (default geesefs) mounter: geesefs - # 前置路径 - path: "pvc" # GeeseFS mount options mountOptions: "--memory-limit 1000 --dir-mode 0777 --file-mode 0666" # Volume reclaim policy @@ -42,7 +40,9 @@ secret: # Region region: "" # Insecure - insecure: "false" + insecure: false + # usePathRequestStyle + usePathRequestStyle: false tolerations: all: false diff --git a/values.yaml b/values.yaml index 4a1644ae6ac587e303942e99ff43ba57607462d5..6c6eede64810d342c94a6a782e650bad1108cdad 100644 --- a/values.yaml +++ b/values.yaml @@ -14,8 +14,6 @@ storageClass: name: csi-s3 # Use a single bucket for all dynamically provisioned persistent volumes singleBucket: "" - # 前置路径 - path: "" # mounter to use - either geesefs, s3fs or rclone (default geesefs) mounter: geesefs # GeeseFS mount options @@ -42,7 +40,9 @@ secret: # Region region: "" # Insecure - insecure: "false" + insecure: false + # usePathRequestStyle + usePathRequestStyle: false tolerations: all: false