From 6627570fb94a86ff981af9945f7f31f04460975e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 15 May 2025 23:49:13 +0800 Subject: [PATCH] feat: configure imagor, upgrade ocelot social --- .env | 2 +- helmfile/helmfile.yaml.gotmpl | 2 +- helmfile/secrets/ocelot.yaml | 14 ++++++++++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 7dfe7f4..d469ab7 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -OCELOT_VERSION=sha-ffb5068 +OCELOT_VERSION=sha-3f27c7e diff --git a/helmfile/helmfile.yaml.gotmpl b/helmfile/helmfile.yaml.gotmpl index 1665c63..0b5efe7 100644 --- 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=migrate-to-s3 + url: git+https://github.com/Ocelot-Social-Community/Ocelot-Social@deployment/helm/charts?ref=image-transformations releases: - name: ocelot-social diff --git a/helmfile/secrets/ocelot.yaml b/helmfile/secrets/ocelot.yaml index 8c88622..6565d79 100644 --- a/helmfile/secrets/ocelot.yaml +++ b/helmfile/secrets/ocelot.yaml @@ -23,6 +23,7 @@ secrets: NEO4J_USERNAME: null NEO4J_PASSWORD: null REDIS_PASSWORD: null + IMAGOR_SECRET: ENC[AES256_GCM,data:nPGDGgjnszFpvNk/ucl63/4o1Yd+rA7ty9PtHcIuOQ0=,iv:kN7ys7qyizLYINHUUTAb6UJh2TF6nnWcUmKKgB5sIdA=,tag:eZNlpZO4K2cNUnlvS1orag==,type:str] 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] @@ -32,6 +33,15 @@ secrets: env: NEO4J_USERNAME: "" NEO4J_PASSWORD: "" + imagor: + env: + HTTP_LOADER_BASE_URL: ENC[AES256_GCM,data:By8W4EhROKwKBi1Zv/R3Rbq91kvl22OOZWhRdz3n0fRzZUE=,iv:L17wYXJimfSB8jKlQvAa9hkZM6BHsrLwVoUm4F+ddsc=,tag:7ufs8lVNfNozjdbXOd372A==,type:str] + IMAGOR_SECRET: ENC[AES256_GCM,data:EoUtgQJ9GHuhrt209iQMSs2SayaUJi1zIZC+TuEr4KQ=,iv:SU7KtV0izan3OUXN0A1vpmEPXdTogfBeEPzfcqdGIKQ=,tag:/IzzvWuFE/gHiZalXWshfw==,type:str] + AWS_ACCESS_KEY_ID: ENC[AES256_GCM,data:B25aseDb9E3LXiSuZD+jUrfZ0Sc=,iv:h3TMMh2ULYC4cGSF8WpX8y6w/x/A/bFlk47rIFoFEek=,tag:0FRXAEXucH9JvxPUEsPUMg==,type:str] + AWS_SECRET_ACCESS_KEY: ENC[AES256_GCM,data:KRBRWyYzisHeGWiUJo3bf39ZGFTa+bJTfBTyDxHBtyrj1jmU5P/9qQ==,iv:PfwjEPH247KtZlUGHcEG/Hp2ismgBpCDYXWRM7IMTbQ=,tag:1jhI1bUIOqU9f5YHVnuocA==,type:str] + AWS_ENDPOINT: ENC[AES256_GCM,data:CVLJNnBjb45rMM/ixlUv+vPftUkKbQYuhhui0JRSgqeZp0A=,iv:IsWO4eVN6mBBs4mO1wryDwt9vdyGzQAAsDJVvL1oLNs=,tag:cP0CZQBtMS2OsE+/KN4AlA==,type:str] + AWS_REGION: ENC[AES256_GCM,data:cWKZd9XGdRcgjQ==,iv:cB2hTBDQ9d3uf/Mgthd/tsa529S+2KlkXCTZ6HXAVZ0=,tag:OF/87D0TDu/yEh6Bf163PA==,type:str] + AWS_BUCKET: ENC[AES256_GCM,data:mlljAczY/xwp/+C2pkgALCDUZkiC,iv:PPQol5Yq6vWHYYRy1gg+UfuSHFHxXQlNpjqbBOOoQ2M=,tag:0RVAIoAmdmIgp2/udLjfiw==,type:str] sops: age: - recipient: age1al36hkk8can83zpxq8qyy07gpv83hdw9vchfly5f264kanz405as283a00 @@ -88,7 +98,7 @@ sops: Tkx0VFJpN1pZam4yeTNYU1Jnb1JyR1EKJSQYyAi9ZZr+njaXV/62nshPVLtWIcLY pwP8ikur4tKrbyg7H+/f3+9jPsr2Jw3xxgkeS4GL+DsTwrGDEwoaiw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-05-30T09:14:17Z" - mac: ENC[AES256_GCM,data:wgd2hbFXmnhwMejjgl20VS2p0oSU+8w2Hkr8ueqrbf7IOEp15Zu7Hay7mbB9B4Wxl5ELnWQlrWgOAHbS/WfuBffQSqNMC5Sg1QDIXusYdu1w33IbQpT0pcsfp1e8qIlrdYaTi0rEg75cjEJhwu9HkPzbqQq/W+qK68jM/DJmMog=,iv:V/++6cdqUU9tEeiiVjJGPsRtck2Eu9OTgoX29tTkQdw=,tag:fMdKAkPiuON2k7Cxhgp4gw==,type:str] + lastmodified: "2025-05-30T12:51:00Z" + mac: ENC[AES256_GCM,data:zgyr3gyuAw85enQo1lbGVCIBnl46m6TeKvnOgPAyMWbgEZ/EHoeAB8+dYSiFILHpDwjje9xTZZ4hUHA5i1Pvk9mIWh4foXuBKSx5S0UEGMfdaAQWN1mq5rUuemb/D/gjCSHLMTP7wZPTc5bSEb9/AA12VN1voMO6suEWTVpNOjw=,iv:mV/NJm4d23NUexZ3lTJhxqVIE7pp/Sp1gxfqNNwjf3I=,tag:utZDVvu8mwUn9QdcJ0TMgg==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2