From 16b9ae46634433357678576c805f82a6bbc047a5 Mon Sep 17 00:00:00 2001
From: SeanOMik <seanomik@gmail.com>
Date: Tue, 25 Apr 2023 20:07:10 -0400
Subject: [PATCH] Get transfersh working with s3 backend

---
 cluster/apps/database/minio/helm-release.yaml |  7 +++++++
 .../apps/tools/transfersh/helm-release.yaml   | 19 ++++---------------
 .../transfersh/transfersh-s3-bucket.sops.yaml | 11 ++++++-----
 cluster/core/cert-manager/wildcard-cert.yaml  |  3 ++-
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/cluster/apps/database/minio/helm-release.yaml b/cluster/apps/database/minio/helm-release.yaml
index d645b8b..da34655 100644
--- a/cluster/apps/database/minio/helm-release.yaml
+++ b/cluster/apps/database/minio/helm-release.yaml
@@ -85,9 +85,16 @@ spec:
                 pathType: Prefix
                 service:
                   port: *api-port
+          - host: &api-host-wildcard "*.s3.${SECRET_NEW_DOMAIN}"
+            paths:
+              - path: /
+                pathType: Prefix
+                service:
+                  port: *api-port
         tls:
           - hosts:
               - *api-host
+              - *api-host-wildcard
             secretName: wildcard-main-tls
 
     podSecurityContext:
diff --git a/cluster/apps/tools/transfersh/helm-release.yaml b/cluster/apps/tools/transfersh/helm-release.yaml
index 0ee8799..3784bd7 100644
--- a/cluster/apps/tools/transfersh/helm-release.yaml
+++ b/cluster/apps/tools/transfersh/helm-release.yaml
@@ -21,10 +21,7 @@ spec:
 
     args:
       - --provider
-      - local
-
-      - --basedir
-      - /storage/
+      - s3
 
       - --temp-path
       - /tmp/
@@ -32,9 +29,9 @@ spec:
       - --max-upload-size
       - "10000000"
 
-#    envFrom:
-#      - secretRef:
-#          name: transfersh-s3-bucket-secrets
+    envFrom:
+      - secretRef:
+          name: transfersh-s3-bucket-secrets
 
     service:
       main:
@@ -62,14 +59,6 @@ spec:
               - *host
             secretName: wildcard-main-tls
 
-    persistence:
-      storage:
-        enabled: true
-        type: pvc
-        accessMode: ReadWriteOnce
-        size: 40Gi
-        mountPath: /storage
-
     resources:
       requests:
         cpu: 1m
diff --git a/cluster/apps/tools/transfersh/transfersh-s3-bucket.sops.yaml b/cluster/apps/tools/transfersh/transfersh-s3-bucket.sops.yaml
index 50adcb8..bb2dd4b 100644
--- a/cluster/apps/tools/transfersh/transfersh-s3-bucket.sops.yaml
+++ b/cluster/apps/tools/transfersh/transfersh-s3-bucket.sops.yaml
@@ -4,18 +4,19 @@ metadata:
     name: transfersh-s3-bucket-secrets
     namespace: tools
 stringData:
-    S3_ENDPOINT: ENC[AES256_GCM,data:6lDjOezV7V2J+bt68Rt8K08RLhHS2DIcMCc=,iv:FgZedw8vja/th4rwNm/dSIX/7o+1kUbOdAZzO56o3Gk=,tag:tW6gRLCmY53V4WYfh0KMMg==,type:str]
-    AWS_ACCESS_KEY: ENC[AES256_GCM,data:e3GhNv50ybh9Ls1FSjKQWA==,iv:idI8r4s10Ux9Vv3JWDX7QiNWQRgJl1PwevWhAKCwbII=,tag:Z417z7ZcQE7QKXTkStcwLA==,type:str]
-    AWS_SECRET_KEY: ENC[AES256_GCM,data:oyFs0Nf7paRsJwD0xDeveuw3ATBi6+tjhZwZLCwiRSA=,iv:LawbdorbaIkkH95CMr2iEPkuFuY4kkLYcWfuyQJwEDY=,tag:XQcOq32Dd1rjFT3zR9ftew==,type:str]
+    S3_ENDPOINT: ENC[AES256_GCM,data:CwabeOncztxmIVfGMxcJpALl9N0hDDhMqO8=,iv:loX8hNOOR/Tc2LIqzCo2VHSUQL/XR7kVkGmrV1Yl0MU=,tag:3/JVpQ4qJB8IbOqKdYpJSw==,type:str]
+    AWS_ACCESS_KEY: ENC[AES256_GCM,data:aNsgIdH0UXaCBbv27n5ggg==,iv:M4OgCXxAwlfxqgDsUVxSIxFIm7TDqzAquGJPKwMAECA=,tag:PLpc14MqoSKeWjQHyhdzKw==,type:str]
+    AWS_SECRET_KEY: ENC[AES256_GCM,data:Tj/Esk/IX/0zJGPFCLbIHTBsTnorttnhxEEZfNeW02g=,iv:IxVRKUHSAOxyAVqPYu1Tl9R3wpX0tWrO9q5yvmfFHe4=,tag:ysKmqnOvf2IYlgIrFqZ4XQ==,type:str]
     BUCKET: ENC[AES256_GCM,data:3QoiSskImQEilA==,iv:kmNrSWfCm+2rW0HOVM51xCIZk9nD4vIQMSZMiBp/WTQ=,tag:gjy63D+VHvILIaxyEarrUA==,type:str]
+    S3_PATH_STYLE: ENC[AES256_GCM,data:uAwTlw==,iv:YuJRcRipGnP34TUGdPvl1T9Uv+PCreaq5sOH1/JqOKU=,tag:PGhVTHdD9p7Yh5iRBYBt0Q==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2023-04-15T03:22:41Z"
-    mac: ENC[AES256_GCM,data:El/gwIiCSD1Nuw+VVO8fAIGdOIKczhubYZYMbMjHEKjAGSRSn5shk7PGk1caqaeL3tX66EK6SWNpw5rcY74Cuo7C7brDjYR7hRELjHAD+vRdSFIQEI9tWVed2QWyUi7XsEuCv+b980QeG3wSY8BS3VOjRM6NuSw+t6V9DBJ+QYs=,iv:kygRBGm3o/lKsrYPg5/CSOlEnxCQ39x4kL8PcNXxOnY=,tag:MjPQwVmn+FYWuBjifmcaFw==,type:str]
+    lastmodified: "2023-04-25T23:32:00Z"
+    mac: ENC[AES256_GCM,data:gYyPWXQyPUBmBR6za2M1W3M2B7U/6ZkfSqaOXWrxd9hEGFqYgCoFzuhpmY+OCq3XMgqk8rWjLEzR73NYYC/oNFysAWBG8g6yqDMOXhFcaZC5DVFAVpptMcE4XJsl8qbkAWQg4SXzvZoWj1ybiiBJHl7cUJUITfiGqQoT0R/6fzU=,iv:ycb7OwIIMQglDL/aZFQm9sLRd0TQgQPe4SvmyxTntPg=,tag:2Db2Nn/Na1aFzrRXHYbClw==,type:str]
     pgp:
         - created_at: "2023-04-07T01:57:22Z"
           enc: |
diff --git a/cluster/core/cert-manager/wildcard-cert.yaml b/cluster/core/cert-manager/wildcard-cert.yaml
index cff439c..68dcd83 100644
--- a/cluster/core/cert-manager/wildcard-cert.yaml
+++ b/cluster/core/cert-manager/wildcard-cert.yaml
@@ -20,4 +20,5 @@ spec:
   dnsNames:
     - "*.${SECRET_NEW_DOMAIN}"
     - "*.k3s.${SECRET_NEW_DOMAIN}"
-    - "*.database.${SECRET_NEW_DOMAIN}"
\ No newline at end of file
+    - "*.database.${SECRET_NEW_DOMAIN}"
+    - "*.s3.${SECRET_NEW_DOMAIN}"
\ No newline at end of file