feat: add s3 credentials, upgrade ocelot

add empty but required folders
upgrade to latest ocelot master version
2025-12-12 23:35:59 +00:00 · 2025-05-30 18:19:47 +08:00 · 2025-05-30 16:57:38 +08:00 · 2025-05-30 16:54:31 +08:00 · 2025-05-29 18:43:12 +02:00 · 2025-05-30 00:33:22 +08:00
6 changed files with 10 additions and 10 deletions
--- a/.env
+++ b/.env
@ -1 +1 @@
-OCELOT_VERSION=sha-9e68997
+OCELOT_VERSION=sha-ffb5068
--- a/branding/data/.gitkeep
+++ b/branding/data/.gitkeep
--- a/branding/middlewares/.gitkeep
+++ b/branding/middlewares/.gitkeep
--- a/branding/public/.gitkeep
+++ b/branding/public/.gitkeep
--- a/helmfile/helmfile.yaml.gotmpl
+++ b/helmfile/helmfile.yaml.gotmpl
@ -6,7 +6,7 @@ environments:
 ---
 repositories:
  - name: ocelot-social
-    url: git+https://github.com/Ocelot-Social-Community/Ocelot-Social@deployment/helm/charts?ref=hetzner
+    url: git+https://github.com/Ocelot-Social-Community/Ocelot-Social@deployment/helm/charts?ref=migrate-to-s3

 releases:
  - name: ocelot-social
--- a/helmfile/secrets/ocelot.yaml
+++ b/helmfile/secrets/ocelot.yaml
@ -23,15 +23,16 @@ secrets:
            NEO4J_USERNAME: null
            NEO4J_PASSWORD: null
            REDIS_PASSWORD: null
+            AWS_ACCESS_KEY_ID: ENC[AES256_GCM,data:dA6Ok1g5jqlyP6jKaRP7WpH4poQ=,iv:yGIWmSoDd+1fm+NKuzipm+Z1C2XVJdOTY9vWIKLy75c=,tag:H18HVmRjP3iyJiixCtpNoQ==,type:str]
+            AWS_SECRET_ACCESS_KEY: ENC[AES256_GCM,data:BTvIEYBQhtOvQbzUBotrslFHhHY9AQobMj7tq3lapS4/gJZBUJ/i3g==,iv:H4MZoTVRngfFwSBgqp4qCawGbDxNNKtQC6PJXWEQdcI=,tag:0sP0Ym/fPs4wJdZvRAG3Jg==,type:str]
+            AWS_ENDPOINT: ENC[AES256_GCM,data:LefUZKGs2pK/RyD83qCLy0c1mkC6E7CUvmWgMztoWaNgBAc=,iv:5nmUUVqx3iFJ/2/f2KOgVVhJlqcVS1IT1lCeRPX9Xr8=,tag:LzA866gXskHUEp0+oGnn4g==,type:str]
+            AWS_REGION: ENC[AES256_GCM,data:V/qfzTm0lP8PTA==,iv:7oPrKB+6ceAf+C51Nh1H3To+/LYG6+tm9vJi7x+HNmc=,tag:vdZJG8V6/TLpDxHboXWS2w==,type:str]
+            AWS_BUCKET: ENC[AES256_GCM,data:Togaqd7ixlF7GVT1jHn43pMLoJvU,iv:eHpwSSschVe2GVQDTFIWTwCi2uOE4z9XOF1VTRk8FLY=,tag:XOx1jPG37NuP2KU0QSjTLw==,type:str]
    neo4j:
        env:
            NEO4J_USERNAME: ""
            NEO4J_PASSWORD: ""
 sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
    age:
        - recipient: age1al36hkk8can83zpxq8qyy07gpv83hdw9vchfly5f264kanz405as283a00
          enc: |
@ -87,8 +88,7 @@ sops:
            Tkx0VFJpN1pZam4yeTNYU1Jnb1JyR1EKJSQYyAi9ZZr+njaXV/62nshPVLtWIcLY
            pwP8ikur4tKrbyg7H+/f3+9jPsr2Jw3xxgkeS4GL+DsTwrGDEwoaiw==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-10-29T14:27:59Z"
-    mac: ENC[AES256_GCM,data:FlVMBkKZGPkY90XhLifKdQoPPBNr/Qk1UTUjgGM8BzRQ8bFqikxTtXWukAE7JW4bhB+FK7AEwenrGzurMaLoNPQZBCELQQApxwHrTCNlIGPbEHL3jZFFV2hh1cP05r1caGncw2wqYi0G0ozR0PUaDHiw3tqbTV5D8yfa6tumB1I=,iv:zbdnPH/1eLRq7br+DIqHtsSp+eI+TGoR7XZSdD7Cxtc=,tag:JqPaVZSQvBnV/B9BV7pIiQ==,type:str]
-    pgp: []
+    lastmodified: "2025-05-30T09:14:17Z"
+    mac: ENC[AES256_GCM,data:wgd2hbFXmnhwMejjgl20VS2p0oSU+8w2Hkr8ueqrbf7IOEp15Zu7Hay7mbB9B4Wxl5ELnWQlrWgOAHbS/WfuBffQSqNMC5Sg1QDIXusYdu1w33IbQpT0pcsfp1e8qIlrdYaTi0rEg75cjEJhwu9HkPzbqQq/W+qK68jM/DJmMog=,iv:V/++6cdqUU9tEeiiVjJGPsRtck2Eu9OTgoX29tTkQdw=,tag:fMdKAkPiuON2k7Cxhgp4gw==,type:str]
    unencrypted_suffix: _unencrypted
-    version: 3.9.0
+    version: 3.10.2
Author	SHA1	Message	Date
Robert Schäfer	a32d26c778	feat: add s3 credentials, upgrade ocelot	2025-05-30 18:19:47 +08:00
Robert Schäfer	401b4af2dd	add empty but required folders	2025-05-30 16:57:38 +08:00
Robert Schäfer	3d969c1a20	upgrade to latest ocelot `master` version	2025-05-30 16:54:31 +08:00
Ulf Gebhardt	c742577720	Merge pull request #22 from Ocelot-Social-Community/hetzner Merge `hetzner` branch eventually	2025-05-29 18:43:12 +02:00
Robert Schäfer	ce2f82c298	remove reference to `hetzner` branch in helm repo	2025-05-30 00:33:22 +08:00