Fix chartmuseum and registry aliyun oss endpoint format: goharbor#556

daotl · Apr 21, 2021 · 5e2e7df · 5e2e7df
1 parent 2a17422
commit 5e2e7df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/templates/chartmuseum/chartmuseum-cm.yaml b/templates/chartmuseum/chartmuseum-cm.yaml
@@ -105,7 +105,11 @@ data:
   STORAGE_ALIBABA_PREFIX: {{ $storage.oss.rootdirectory }}
   {{- end }}
   {{- if $storage.oss.endpoint }}
-  STORAGE_ALIBABA_ENDPOINT: {{ $storage.oss.endpoint }}
+  STORAGE_ALIBABA_ENDPOINT: {{ $storage.oss.endpoint | trimPrefix $storage.oss.bucket | trimPrefix "." }}
+  {{- else if $storage.oss.internal}}
+  STORAGE_ALIBABA_ENDPOINT: {{ $storage.oss.region }}-internal.aliyuncs.com
+  {{- else }}
+  STORAGE_ALIBABA_ENDPOINT: {{ $storage.oss.region }}.aliyuncs.com
   {{- end }}
   ALIBABA_CLOUD_ACCESS_KEY_ID: {{ $storage.oss.accesskeyid }}
 {{- end }}

diff --git a/values.yaml b/values.yaml
@@ -312,6 +312,7 @@ persistence:
       accesskeysecret: accesskeysecret
       region: regionname
       bucket: bucketname
+      ### endpoint format: [bucket].[region].aliyuncs.com or [bucket].[region]-internal.aliyuncs.com
       #endpoint: endpoint
       #internal: false
       #encrypt: false