clean up gotosocial a bit more

small-hack · Dec 28, 2024 · d00b679 · d00b679
1 parent 476fd43
commit d00b679
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 18 deletions.
diff --git a/...ocial/external_secrets_argocd_appset.yaml → ..._apps/external_secrets_argocd_appset.yaml b/...ocial/external_secrets_argocd_appset.yaml → ..._apps/external_secrets_argocd_appset.yaml
diff --git a/.../gotosocial/gotosocial_argocd_appset.yaml → ...app_of_apps/gotosocial_argocd_appset.yaml b/.../gotosocial/gotosocial_argocd_appset.yaml → ...app_of_apps/gotosocial_argocd_appset.yaml
@@ -21,7 +21,6 @@ spec:
               - gotosocial_hostname
               - gotosocial_libretranslate_hostname
               - gotosocial_s3_endpoint
-              - gotosocial_smtp_port
               - global_cluster_issuer
               - global_time_zone
   template:
@@ -43,7 +42,7 @@ spec:
           selfHeal: true
       source:
         # repoURL: 'charts.fsociety.social'
-        # targetRevision: 0.4.28
+        # targetRevision: 0.5.1
         # chart: gotosocial
         repoURL: https://github.com/jessebot/charts-1
         ref: patch-1
@@ -87,7 +86,7 @@ spec:
 
               persistence:
                 enabled: false
-                existingClaim: ""
+                existingClaim: "gotosocial"
 
               tmpfs:
                 enabled: false
@@ -116,39 +115,41 @@ spec:
 
                   s3:
                    enabled: true
-                   endpoint: ""
+                   endpoint: "{{ .gotosocial_s3_endpoint }}"
                    proxy: false
                    useSSL: true
-                   accessKey: ""
-                   secretKey: ""
+                   # accessKey: ""
+                   # secretKey: ""
                    # If this is set, accessKey, secretKey will not take place
                    # Needs the S3_ACCESS_KEY_ID and S3_SECRET_ACCESS_KEY keys.
-                   existingSecret: ""
-                   bucket: ""
+                   existingSecret: "gotosocial-s3-credentials"
+                   bucket: "gotosocial"
 
                 oidc:
-                  enabled: true
+                  enabled: false
                   idpName: ""
                   skipVerification: ""
-                  issuer: ""
-                  clientID: ""
-                  clientSecret: ""
                   oidcScopes:
                     - "openid"
                     - "email"
                     - "profile"
                     - "groups"
                   linkExisting: false
                   adminGroups: []
+                  existingSecretName: ""
+                  existingSecretKeys:
+                    issuer: "issuer"
+                    clientID: "clientid"
+                    clientSecret: "clientsecret"
 
                 smtp:
-                  host: ""
-                  port: "0"
-                  userName: ""
-                  password: ""
                   existingSecretName: ""
-                  existingSecretKey: ""
-                  from: ""
+                  existingSecretKeys:
+                    username: "username"
+                    password: "password"
+                    port: "port"
+                    host: "host"
+                  from: "no-reply@{{ .gotosocial_hostname }}"
                   discloseRecipients: false
 
               extraConfig:

diff --git a/demo/gotosocial/postgres_argocd_appset.yaml → ...l/app_of_apps/postgres_argocd_appset.yaml b/demo/gotosocial/postgres_argocd_appset.yaml → ...l/app_of_apps/postgres_argocd_appset.yaml
diff --git a/demo/gotosocial/pvc_argocd_appset.yaml → ...social/app_of_apps/pvc_argocd_appset.yaml b/demo/gotosocial/pvc_argocd_appset.yaml → ...social/app_of_apps/pvc_argocd_appset.yaml
diff --git a/...gotosocial/s3_provider_argocd_appset.yaml → ...pp_of_apps/s3_provider_argocd_appset.yaml b/...gotosocial/s3_provider_argocd_appset.yaml → ...pp_of_apps/s3_provider_argocd_appset.yaml
diff --git a/demo/gotosocial/s3_pvc_appset.yaml → ...gotosocial/app_of_apps/s3_pvc_appset.yaml b/demo/gotosocial/s3_pvc_appset.yaml → ...gotosocial/app_of_apps/s3_pvc_appset.yaml