Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 馃悰 chartmuseum and registry aliyun oss endpoint format #556

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion templates/chartmuseum/chartmuseum-cm.yaml
Expand Up @@ -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 "." }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the endpoint is specified, shouldn't we just use it as the STORAGE_ALIBABA_ENDPOINT directly?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the endpoint is specified, shouldn't we just use it as the STORAGE_ALIBABA_ENDPOINT directly?

yes,but charmuseum endpoint format not include bucket name

{{- 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 }}
Expand Down
1 change: 1 addition & 0 deletions values.yaml
Expand Up @@ -232,6 +232,7 @@ persistence:
accesskeysecret: accesskeysecret
region: regionname
bucket: bucketname
### endpoint format: [bucket].[region].aliyuncs.com or [bucket].[region]-internal.aliyuncs.com
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An endpoint which defaults to [bucket].[region].aliyuncs.com or [bucket].[region]-internal.aliyuncs.com (when internal=true). You can change the default endpoint by changing this value.

Per the doc , the format [bucket].[region].aliyuncs.com or [bucket].[region]-internal.aliyuncs.com is the default value of endpoint. So this isn't the required format for the customized endpoint?

#endpoint: endpoint
#internal: false
#encrypt: false
Expand Down