Compare commits

...

1 Commits

Author SHA1 Message Date
f905b4ccfe change s3 env keys 2024-04-13 14:58:20 -06:00
3 changed files with 6 additions and 37 deletions

View File

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

View File

@@ -55,7 +55,7 @@ spec:
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: "{{ .Values.outline.database.usernameSecret.existingSecretName }}" name: "{{ .Values.outline.database.usernameSecret.existingSecretName }}"
key: "{{ .Values.outline.database.usernameSecret.existingSecretKey }}" key: "{{ .Values.outline.database.usernameSecret.existingSecretKey }}"
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
@@ -75,7 +75,7 @@ spec:
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: "{{ .Values.outline.database.databasePort.existingSecretName }}" name: "{{ .Values.outline.database.databasePort.existingSecretName }}"
key: "{{ .Values.outline.database.databasePort.existingSecretKey }}" key: "{{ .Values.outline.database.databasePort.existingSecretKey }}"
- name: DATABASE_URL - name: DATABASE_URL
value: "postgres://$(POSTGRES_USERNAME):$(POSTGRES_PASSWORD)@$(POSTGRES_DATABASE_HOST):$(POSTGRES_DATABASE_PORT)/$(POSTGRES_DATABASE_NAME)" value: "postgres://$(POSTGRES_USERNAME):$(POSTGRES_PASSWORD)@$(POSTGRES_DATABASE_HOST):$(POSTGRES_DATABASE_PORT)/$(POSTGRES_DATABASE_NAME)"
- name: DATABASE_URL_TEST - name: DATABASE_URL_TEST
@@ -102,41 +102,14 @@ spec:
secretKeyRef: secretKeyRef:
name: "{{ .Values.persistence.s3.credentialsSecret }}" name: "{{ .Values.persistence.s3.credentialsSecret }}"
key: AWS_SECRET_ACCESS_KEY key: AWS_SECRET_ACCESS_KEY
{{- if .Values.persistence.s3.endpointConfigMap.enabled }}
- name: AWS_REGION
valueFrom:
configMapKeyRef:
name: "{{ .Values.persistence.s3.endpointConfigMap.name }}"
key: BUCKET_REGION
- name: AWS_S3_UPLOAD_BUCKET_NAME
valueFrom:
configMapKeyRef:
name: "{{ .Values.persistence.s3.endpointConfigMap.name }}"
key: BUCKET_NAME
- name: AWS_S3_UPLOAD_BUCKET_HOST
valueFrom:
configMapKeyRef:
name: "{{ .Values.persistence.s3.endpointConfigMap.name }}"
key: BUCKET_HOST
- name: AWS_S3_UPLOAD_BUCKET_PORT
valueFrom:
configMapKeyRef:
name: "{{ .Values.persistence.s3.endpointConfigMap.name }}"
key: BUCKET_PORT
- name: AWS_S3_UPLOAD_BUCKET_URL
value: "{{ .Values.persistence.s3.urlProtocol }}://$(AWS_S3_UPLOAD_BUCKET_NAME).$(AWS_S3_UPLOAD_BUCKET_HOST):$(AWS_S3_UPLOAD_BUCKET_PORT)"
- name: AWS_S3_ACCELERATE_URL
value: "{{ .Values.persistence.s3.urlProtocol }}://$(AWS_S3_UPLOAD_BUCKET_NAME).$(AWS_S3_UPLOAD_BUCKET_HOST):$(AWS_S3_UPLOAD_BUCKET_PORT)"
{{- 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.urlProtocol }}://{{ .Values.persistence.s3.bucketName }}.{{ .Values.persistence.s3.host }}" value: "{{ .Values.persistence.s3.bucketUrl }}"
- name: AWS_S3_ACCELERATE_URL - name: AWS_S3_ACCELERATE_URL
value: "{{ .Values.persistence.s3.urlProtocol }}://{{ .Values.persistence.s3.bucketName }}.{{ .Values.persistence.s3.host }}" value: "{{ .Values.persistence.s3.bucketUrl }}"
{{- end }}
- name: AWS_S3_FORCE_PATH_STYLE - name: AWS_S3_FORCE_PATH_STYLE
value: "{{ .Values.persistence.s3.forcePathStyle }}" value: "{{ .Values.persistence.s3.forcePathStyle }}"
- name: AWS_S3_ACL - name: AWS_S3_ACL

View File

@@ -24,13 +24,9 @@ persistence:
type: s3 type: s3
s3: s3:
credentialsSecret: credentialsSecret:
endpointConfigMap:
enabled: false
name:
region: region:
bucketName: bucketName:
host: bucketUrl:
urlProtocol: http
uploadMaxSize: "26214400" uploadMaxSize: "26214400"
forcePathStyle: false forcePathStyle: false
acl: private acl: private