From 9be2ade9f66f11a54aef8013c6f831951ef30e27 Mon Sep 17 00:00:00 2001 From: alexlebens Date: Thu, 13 Jun 2024 10:46:56 -0500 Subject: [PATCH] add cloudflare to minio --- .../cl01tl/applications/outline/Chart.yaml | 6 ++++- .../outline/templates/external-secret.yaml | 25 +++++++++++++++++++ .../cl01tl/applications/outline/values.yaml | 8 +++--- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/clusters/cl01tl/applications/outline/Chart.yaml b/clusters/cl01tl/applications/outline/Chart.yaml index d13672ee8..fa5ac7fa2 100644 --- a/clusters/cl01tl/applications/outline/Chart.yaml +++ b/clusters/cl01tl/applications/outline/Chart.yaml @@ -28,9 +28,13 @@ dependencies: repository: https://charts.bitnami.com/bitnami version: 19.5.2 - name: cloudflared - alias: cloudflared + alias: cloudflared-outline repository: http://alexlebens.github.io/helm-charts version: 1.2.0 + - name: cloudflared + alias: cloudflared-minio + repository: http://alexlebens.github.io/helm-charts + version: 1.2.0 - name: postgres-cluster alias: postgres-16-cluster version: 3.1.0 diff --git a/clusters/cl01tl/applications/outline/templates/external-secret.yaml b/clusters/cl01tl/applications/outline/templates/external-secret.yaml index 4411a9b2b..a6fbf3ed3 100644 --- a/clusters/cl01tl/applications/outline/templates/external-secret.yaml +++ b/clusters/cl01tl/applications/outline/templates/external-secret.yaml @@ -143,6 +143,31 @@ spec: metadataPolicy: None property: token +--- +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: outline-minio-cloudflared-secret + namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: outline-cloudflared-secret + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} + app.kubernetes.io/component: web + app.kubernetes.io/part-of: {{ .Release.Name }} +spec: + secretStoreRef: + kind: ClusterSecretStore + name: vault + data: + - secretKey: cf-tunnel-token + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /cloudflare/tunnels/outline-minio + metadataPolicy: None + property: token + --- apiVersion: external-secrets.io/v1beta1 kind: ExternalSecret diff --git a/clusters/cl01tl/applications/outline/values.yaml b/clusters/cl01tl/applications/outline/values.yaml index ab1720bb5..7262d5865 100644 --- a/clusters/cl01tl/applications/outline/values.yaml +++ b/clusters/cl01tl/applications/outline/values.yaml @@ -82,9 +82,9 @@ outline: - name: AWS_S3_UPLOAD_BUCKET_NAME value: outline - name: AWS_S3_UPLOAD_BUCKET_URL - value: http://minio.outline:80/outline + value: https://outline-storage.alexlebens.dev/outline - name: AWS_S3_ACCELERATE_URL - value: http://minio.outline:80/outline + value: https://outline-storage.alexlebens.dev/outline - name: AWS_S3_FORCE_PATH_STYLE value: false - name: AWS_S3_ACL @@ -183,8 +183,10 @@ redis: architecture: standalone auth: enabled: false -cloudflared: +cloudflared-outline: existingSecretName: outline-cloudflared-secret +cloudflared-minio: + existingSecretName: outline-minio-cloudflared-secret postgres-16-cluster: mode: standalone cluster: