add url protocol to s3 endpoint

This commit is contained in:
2024-04-09 20:16:43 -06:00
parent e8a951405d
commit bdcd63284a
3 changed files with 5 additions and 4 deletions

View File

@@ -1,6 +1,6 @@
apiVersion: v2 apiVersion: v2
name: outline name: outline
version: 0.1.0 version: 0.1.1
description: Chart for Outline wiki description: Chart for Outline wiki
keywords: keywords:
- wiki - wiki

View File

@@ -124,14 +124,14 @@ spec:
name: "{{ .Values.persistence.s3.endpointConfigMap.name }}" name: "{{ .Values.persistence.s3.endpointConfigMap.name }}"
key: BUCKET_PORT key: BUCKET_PORT
- name: AWS_S3_UPLOAD_BUCKET_URL - name: AWS_S3_UPLOAD_BUCKET_URL
value: "$(AWS_S3_UPLOAD_BUCKET_HOST):$(AWS_S3_UPLOAD_BUCKET_PORT)|" value: "{{ .Values.persistence.s3.urlProtocol }}://$(AWS_S3_UPLOAD_BUCKET_HOST):$(AWS_S3_UPLOAD_BUCKET_PORT)"
{{- else }} {{- else }}
- name: AWS_REGION - name: AWS_REGION
value: "{{ .Values.persistence.s3.region }}" value: "{{ .Values.persistence.s3.region }}"
- name: AWS_S3_UPLOAD_BUCKET_NAME - name: AWS_S3_UPLOAD_BUCKET_NAME
value: "{{ .Values.persistence.s3.bucketName }}" value: "{{ .Values.persistence.s3.bucketName }}"
- name: AWS_S3_UPLOAD_BUCKET_URL - name: AWS_S3_UPLOAD_BUCKET_URL
value: "{{ .Values.persistence.s3.endpoint }}" value: "{{ .Values.persistence.s3.urlProtocol }}://{{ .Values.persistence.s3.host }}"
{{- end }} {{- end }}
- name: AWS_S3_FORCE_PATH_STYLE - name: AWS_S3_FORCE_PATH_STYLE
value: "{{ .Values.persistence.s3.forcePathStyle }}" value: "{{ .Values.persistence.s3.forcePathStyle }}"

View File

@@ -29,7 +29,8 @@ persistence:
name: name:
region: region:
bucketName: bucketName:
endpoint: host:
urlProtocol: http
uploadMaxSize: "26214400" uploadMaxSize: "26214400"
forcePathStyle: false forcePathStyle: false
acl: private acl: private