From 6fa42614495b8e78395a6afb9eeec564e951a5ac Mon Sep 17 00:00:00 2001 From: wind2008hxy Date: Thu, 2 Apr 2020 16:13:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20chartmuseum=20and=20regis?= =?UTF-8?q?try=20aliyun=20oss=20endpoint=20format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wind2008hxy --- templates/chartmuseum/chartmuseum-cm.yaml | 6 +++++- values.yaml | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/templates/chartmuseum/chartmuseum-cm.yaml b/templates/chartmuseum/chartmuseum-cm.yaml index 628cb9f88..13559bef5 100644 --- a/templates/chartmuseum/chartmuseum-cm.yaml +++ b/templates/chartmuseum/chartmuseum-cm.yaml @@ -99,7 +99,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 index aead66fe2..35b235d86 100644 --- a/values.yaml +++ b/values.yaml @@ -232,6 +232,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