From bdcd63284a5451a9c1bc5d7a1f63d7308c6bc2ef Mon Sep 17 00:00:00 2001
From: alexlebens <alexanderlebens@gmail.com>
Date: Tue, 9 Apr 2024 20:16:43 -0600
Subject: [PATCH] add url protocol to s3 endpoint

---
 charts/outline/Chart.yaml                | 2 +-
 charts/outline/templates/deployment.yaml | 4 ++--
 charts/outline/values.yaml               | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/charts/outline/Chart.yaml b/charts/outline/Chart.yaml
index db4ed58..c885b70 100644
--- a/charts/outline/Chart.yaml
+++ b/charts/outline/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: outline
-version: 0.1.0
+version: 0.1.1
 description: Chart for Outline wiki
 keywords:
   - wiki
diff --git a/charts/outline/templates/deployment.yaml b/charts/outline/templates/deployment.yaml
index 379c9cd..070f45d 100644
--- a/charts/outline/templates/deployment.yaml
+++ b/charts/outline/templates/deployment.yaml
@@ -124,14 +124,14 @@ spec:
                   name: "{{ .Values.persistence.s3.endpointConfigMap.name }}"
                   key: BUCKET_PORT
             - 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 }}
             - name: AWS_REGION
               value: "{{ .Values.persistence.s3.region }}"
             - name: AWS_S3_UPLOAD_BUCKET_NAME
               value: "{{ .Values.persistence.s3.bucketName }}"
             - name: AWS_S3_UPLOAD_BUCKET_URL
-              value: "{{ .Values.persistence.s3.endpoint }}"
+              value: "{{ .Values.persistence.s3.urlProtocol }}://{{ .Values.persistence.s3.host }}"
           {{- end }}
             - name: AWS_S3_FORCE_PATH_STYLE
               value: "{{ .Values.persistence.s3.forcePathStyle }}"
diff --git a/charts/outline/values.yaml b/charts/outline/values.yaml
index 0a115e4..20b93cb 100644
--- a/charts/outline/values.yaml
+++ b/charts/outline/values.yaml
@@ -29,7 +29,8 @@ persistence:
       name:
     region:
     bucketName:
-    endpoint:
+    host:
+    urlProtocol: http
     uploadMaxSize: "26214400"
     forcePathStyle: false
     acl: private