From 9d9a2a2350c402a106c28b2e6080d75d2d91b815 Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Sun, 1 Dec 2024 17:51:24 -0500 Subject: [PATCH 1/5] feat((squadquest-supabase): add helm chart --- .../squadquest-supabase/helm-chart.toml | 11 ++++ .holo/lenses/squadquest-supabase.toml | 19 +++++++ .holo/sources/supabase.toml | 3 + squadquest-supabase/release-values.yaml | 57 +++++++++++++++++++ 4 files changed, 90 insertions(+) create mode 100644 .holo/branches/k8s-manifests/squadquest-supabase/helm-chart.toml create mode 100644 .holo/lenses/squadquest-supabase.toml create mode 100644 .holo/sources/supabase.toml create mode 100644 squadquest-supabase/release-values.yaml diff --git a/.holo/branches/k8s-manifests/squadquest-supabase/helm-chart.toml b/.holo/branches/k8s-manifests/squadquest-supabase/helm-chart.toml new file mode 100644 index 0000000..8afa560 --- /dev/null +++ b/.holo/branches/k8s-manifests/squadquest-supabase/helm-chart.toml @@ -0,0 +1,11 @@ +[holomapping] +holosource = "supabase" +root = "charts/supabase" +files = [ + "**", + "!ci/**", + "!docker/**", + "!**/.DS_Store", + "README.md", + "values.example.yaml" +] diff --git a/.holo/lenses/squadquest-supabase.toml b/.holo/lenses/squadquest-supabase.toml new file mode 100644 index 0000000..2910097 --- /dev/null +++ b/.holo/lenses/squadquest-supabase.toml @@ -0,0 +1,19 @@ +[hololens] +package = "holo/lens-helm3/1.22" + +[hololens.input] +root = "squadquest-supabase" +files = "**" + +[hololens.output] +merge = "replace" + +[hololens.helm] +namespace = "squadquest-supabase" +release_name = "squadquest-supabase" +namespace_fill = true + +chart_path = "helm-chart" +value_files = [ + "release-values.yaml" +] diff --git a/.holo/sources/supabase.toml b/.holo/sources/supabase.toml new file mode 100644 index 0000000..24c485f --- /dev/null +++ b/.holo/sources/supabase.toml @@ -0,0 +1,3 @@ +[holosource] +url = "https://github.com/supabase-community/supabase-kubernetes" +ref = "refs/heads/main" diff --git a/squadquest-supabase/release-values.yaml b/squadquest-supabase/release-values.yaml new file mode 100644 index 0000000..b245eef --- /dev/null +++ b/squadquest-supabase/release-values.yaml @@ -0,0 +1,57 @@ +# See: https://github.com/supabase-community/supabase-kubernetes/blob/main/charts/supabase/values.yaml + +db: + enabled: true + image: + tag: 15.6.1.143 + livenessProbe: + exec: + command: + - pg_isready + - -U + - postgres + initialDelaySeconds: 3 + +studio: + image: + tag: 20241111-d7c6eb1 + +auth: + image: + tag: v2.164.0 + +rest: + image: + tag: v12.2.3 + +realtime: + image: + tag: v2.33.61 + +meta: + image: + tag: v0.84.3 + +storage: + image: + tag: v1.13.3 + +imgproxy: + image: + tag: v3 + +kong: + image: + tag: 2.8.5 + +analytics: + image: + tag: 1.10.0 + +vector: + image: + tag: 0.42.X-alpine + +functions: + image: + tag: v1.65.3 From 685b52fa71278a68ab5159d7feecaeea51830d57 Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Sun, 1 Dec 2024 18:16:26 -0500 Subject: [PATCH 2/5] feat(squadquest-supabase): configure Linode storage backend --- squadquest-supabase.secrets/linode-storage.yaml | 17 +++++++++++++++++ squadquest-supabase/release-values.yaml | 9 +++++++++ 2 files changed, 26 insertions(+) create mode 100644 squadquest-supabase.secrets/linode-storage.yaml diff --git a/squadquest-supabase.secrets/linode-storage.yaml b/squadquest-supabase.secrets/linode-storage.yaml new file mode 100644 index 0000000..6252254 --- /dev/null +++ b/squadquest-supabase.secrets/linode-storage.yaml @@ -0,0 +1,17 @@ +--- +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + creationTimestamp: null + name: linode-storage + namespace: code-for-philly +spec: + encryptedData: + accessKey: AgAGvQizwgUfVI1SaWRtFqV2MTMttDWBDyAtFUoNmQiYuBKnqCatGXYQb73E//ACYKIuD6We4a9eP9d7yJOx3Xw5i95KRy4b2hOzFdKFTG2BD6RCW3VnwVmIMqQSUx6AxjMDLEWPXDE08aTFXnOnN093UE6bYZOa7ijHQMVoXXo3ba7BauQ7+27yiDTW0rgczP1ggfxRQW1VVdXjNw0KLPcYGATyX25vT5pUkrzXc7xJ1GJQlVyz5aI47AN5CtMa9Yrbexg1O2C9dyzcCVM+ifAlOZCvv085vjS3JkrcocKzaatpdSIrtDuGTvxDR4AbqVHfhV4J2vBm5TPDHTTAVPSrDKbSTxtnSYwXvLB56jjRPncpUV78NPwc51pHdzxFzAWpi3tFtvNNEXj/2mLIADwLrB2jpE//RZVRmWYsvJbJ2WnSqyNGmipYOordH6TeT4Ev/Q+QoxwD7UpmxEwE5uUkHGf974v6S5UqgnhqjQYVsAylxBy+lipK/qocvjH17NXao3Coci4AYwMutRwEU52DOB8bRuKXPsNEy+aeiYNahR+StforPSvl3WRML5sk3OCtq5ZMiy/Qxs8DsQzE4QrMmyi1pSaghuHyaL3I0CqBoo5pcd/1kbOtwXDFv0CPD0GTu9zEwLUdbvaQldAAgJRNU00oqRroSYhulIiKFk5YDk3ew9d65UlWfdcpbwWVDGuvJifhnbo5OOHkSNE96oHiAyU7sdK8uA5K7N1XxpOWKBOKrNKRrTI9 + keyId: AgCcAWi3TRu6oK+fB4nKJ6lHWFopOIfqbcCvXBfdpQPTn9wrN7rDMq46p1tIycT0dSMuYw+LvuPvspL6Qi4ivUBfGYOKNSDT+AdGypgfEtt3EcjQ5GfXr3NrnZnCMC7Lg+jgoYSwD3oPQR3N5jGUnnWJUcbKiQfAmsmWRUrhZWKo93cf6GmumTokA5zDEZeglCX0iOH5iOQJPxqdWsbq+tSvEEnfG4DThC49dcpeNZ7r8+d50drjmQxC3f3dn3vWIvmOosx8l4E6UV8cM5hmpX/WpGrek54v7KS7gQsxB3ELkEILy3vVwHF/9rwB6f64LwRAtiqcpW2UkIvdlpAZIROGljQL4iVaFp9YKmOa9q0thqy0oohFn5/eCpqEef5jsBBXViVJp5b6PL94Kud6uyRzrGuiOnByfvG+eIhoUh5Jz1PTtmKHZ9EzZljpZkQG7xHchJhpsEfoTnVZ1KlgpgcVOxUyw5X86JRmkarclOQTNO/FHbBRDrgGZyvFja6uWoLug+ouMtgUlLLbUdShfUQrVOmA79JTY7NcYwheev2ix0BLP+EwMC4ZfC0QIqCF0wftU1p1DOYiXZ8e6B4sEXxJQOiAWtwLlCmewsyBnsMjkJU7qKHHwSXekBKZ5lyJ9fJE5hCHABE8QLYuKc6Tlta4b1HkfOFAENeccHrM+flrfQvLMrK5Sw2ok/qUqygVekgWsELDiV++We99MtIVkJ3pN5hTxQ== + template: + metadata: + creationTimestamp: null + name: linode-storage + namespace: code-for-philly + type: Opaque diff --git a/squadquest-supabase/release-values.yaml b/squadquest-supabase/release-values.yaml index b245eef..e14a4e0 100644 --- a/squadquest-supabase/release-values.yaml +++ b/squadquest-supabase/release-values.yaml @@ -1,5 +1,9 @@ # See: https://github.com/supabase-community/supabase-kubernetes/blob/main/charts/supabase/values.yaml +secret: + s3: + secretRef: linode-storage + db: enabled: true image: @@ -35,6 +39,11 @@ meta: storage: image: tag: v1.13.3 + environment: + STORAGE_BACKEND: s3 + GLOBAL_S3_BUCKET: squadquest-supabase-storage + GLOBAL_S3_ENDPOINT: us-east-1.linodeobjects.com + GLOBAL_S3_PROTOCOL: https imgproxy: image: From 4e7b9ca7c3d006357c9c6e3a4ccc72d180117c7c Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Sun, 1 Dec 2024 18:24:03 -0500 Subject: [PATCH 3/5] chore(deps): bump civic-cloud to v1.7.6 --- .holo/sources/civic-cloud.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.holo/sources/civic-cloud.toml b/.holo/sources/civic-cloud.toml index 8de7afc..5e326c9 100644 --- a/.holo/sources/civic-cloud.toml +++ b/.holo/sources/civic-cloud.toml @@ -1,3 +1,3 @@ [holosource] url = "https://github.com/CodeForPhilly/civic-cloud" -ref = "refs/tags/v1.7.5" +ref = "refs/tags/v1.7.6" From a52b216611d056ca70b80024fa68bad1b484ff7e Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Sun, 1 Dec 2024 18:25:36 -0500 Subject: [PATCH 4/5] fix(squadquest-supabase): correct namespace on secret --- squadquest-supabase.secrets/linode-storage.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/squadquest-supabase.secrets/linode-storage.yaml b/squadquest-supabase.secrets/linode-storage.yaml index 6252254..bd08328 100644 --- a/squadquest-supabase.secrets/linode-storage.yaml +++ b/squadquest-supabase.secrets/linode-storage.yaml @@ -4,14 +4,14 @@ kind: SealedSecret metadata: creationTimestamp: null name: linode-storage - namespace: code-for-philly + namespace: squadquest-supabase spec: encryptedData: - accessKey: AgAGvQizwgUfVI1SaWRtFqV2MTMttDWBDyAtFUoNmQiYuBKnqCatGXYQb73E//ACYKIuD6We4a9eP9d7yJOx3Xw5i95KRy4b2hOzFdKFTG2BD6RCW3VnwVmIMqQSUx6AxjMDLEWPXDE08aTFXnOnN093UE6bYZOa7ijHQMVoXXo3ba7BauQ7+27yiDTW0rgczP1ggfxRQW1VVdXjNw0KLPcYGATyX25vT5pUkrzXc7xJ1GJQlVyz5aI47AN5CtMa9Yrbexg1O2C9dyzcCVM+ifAlOZCvv085vjS3JkrcocKzaatpdSIrtDuGTvxDR4AbqVHfhV4J2vBm5TPDHTTAVPSrDKbSTxtnSYwXvLB56jjRPncpUV78NPwc51pHdzxFzAWpi3tFtvNNEXj/2mLIADwLrB2jpE//RZVRmWYsvJbJ2WnSqyNGmipYOordH6TeT4Ev/Q+QoxwD7UpmxEwE5uUkHGf974v6S5UqgnhqjQYVsAylxBy+lipK/qocvjH17NXao3Coci4AYwMutRwEU52DOB8bRuKXPsNEy+aeiYNahR+StforPSvl3WRML5sk3OCtq5ZMiy/Qxs8DsQzE4QrMmyi1pSaghuHyaL3I0CqBoo5pcd/1kbOtwXDFv0CPD0GTu9zEwLUdbvaQldAAgJRNU00oqRroSYhulIiKFk5YDk3ew9d65UlWfdcpbwWVDGuvJifhnbo5OOHkSNE96oHiAyU7sdK8uA5K7N1XxpOWKBOKrNKRrTI9 - keyId: AgCcAWi3TRu6oK+fB4nKJ6lHWFopOIfqbcCvXBfdpQPTn9wrN7rDMq46p1tIycT0dSMuYw+LvuPvspL6Qi4ivUBfGYOKNSDT+AdGypgfEtt3EcjQ5GfXr3NrnZnCMC7Lg+jgoYSwD3oPQR3N5jGUnnWJUcbKiQfAmsmWRUrhZWKo93cf6GmumTokA5zDEZeglCX0iOH5iOQJPxqdWsbq+tSvEEnfG4DThC49dcpeNZ7r8+d50drjmQxC3f3dn3vWIvmOosx8l4E6UV8cM5hmpX/WpGrek54v7KS7gQsxB3ELkEILy3vVwHF/9rwB6f64LwRAtiqcpW2UkIvdlpAZIROGljQL4iVaFp9YKmOa9q0thqy0oohFn5/eCpqEef5jsBBXViVJp5b6PL94Kud6uyRzrGuiOnByfvG+eIhoUh5Jz1PTtmKHZ9EzZljpZkQG7xHchJhpsEfoTnVZ1KlgpgcVOxUyw5X86JRmkarclOQTNO/FHbBRDrgGZyvFja6uWoLug+ouMtgUlLLbUdShfUQrVOmA79JTY7NcYwheev2ix0BLP+EwMC4ZfC0QIqCF0wftU1p1DOYiXZ8e6B4sEXxJQOiAWtwLlCmewsyBnsMjkJU7qKHHwSXekBKZ5lyJ9fJE5hCHABE8QLYuKc6Tlta4b1HkfOFAENeccHrM+flrfQvLMrK5Sw2ok/qUqygVekgWsELDiV++We99MtIVkJ3pN5hTxQ== + accessKey: AgA4195agsusz8QcOFtq6HV9336SRkhLAlTfjtj2okIqLEkywCEObpBCqjXWtSZFtQAlxtrUaHtBVXvMj4ELb8dFMzYY/PqqRHIwOxWxmI/b7ycx9Q5avYWpOdPmL5jhYv/H1LZAYPQlFIgX350F8OSeAuCDTbvVip2ejfBbCGwTQW2Dd/dhK5xJf2Jmp9fiF7TScUtC8m7OIV0Ua1cY/v481Bz+X/IcC3fBqTZGiTOlRR3hUZysVc+746cpeTv2M6p6TvrjjKJ+3QuvFEJkXbQNO6p5BR564WU6rFLXtgu4mc6wsRekmNE9ThZ7w0ISLEYoxUnSh5oAD8C+Lu6kmtFZgCJ4fF9ERcQt33TSuSCtVd95b/sl+otP8xuUlVS0nvNtdefQgx05FxFW47HBXCc5ZioC3yGB3Evj/Y52oO2+vz6/PXKb023D7o4kptozLX5FyNdCeqM6UTQJqilMB7el3Xxr95KrNwL086Hyz574CY89d0mvotyuk9iLzBs4w2fsjQpXxBcmbE4kpjXWwQl5KunCChOSUJbZAipCL5wrRa3REH3vO91VX2PHefsKv5odkFhb1oTeQ1mo8R3zHhzYW9mHfnOJxhcndY68YkRqnezplTzmPieCZp24DhBt6ucIupytHtKAJ1FdhdlkHcMicUWnc+UNDX5aEzU9xJisscF+Ep23x2dmRDpFXrFm2cdYCtSnwEzBydr6W+LAthvlIFPKThOOosqomZhc4qZLNoFt7bOe468Z + keyId: AgC4KdEaX7bjblIqygOwBGA5xijraaYERYWWxb6txC5zw096l5f1OnBja0lQbPXO+LtGEq17ox0dOxxy7zqiMw8QmRheJITpIKVWX5NFPCaQmFPrkxletv0c4RSz/k/vpz/yjoqnGGPp7tAH+nivAV0ufpBPZyaLsfyAKcPYsyGIFA2AGjQBkjtALUUEkrWa1OVTJoJfH4+9lFzpgoU81on1nfnMHw/vYGcdHhiaGAP0rAJLJCpolETFOMS0BTOmuptFcYTUdPLNqlISr8EKa79xJUpSGa9s7UrObfKP0V2wW/c5aEN0cuBjSfnnUO42vxd7yQE+iCyLi2m0BRwpWZeuurI0Tkxu+1JpCEJANcewDtO7slOyEGQZqGVL1ANofidQz759PU/yBmtD0z7HCj3rsF3yFpqOHDVSlLaNUYLdvT3dkXMM2YIIP7Lyh7ZJnLDeYpH5iG/xVXzLjuTg8aK/DO02j+UPuUfnB/DDF1BsiKIZvt/2WNawyO1ApObjVi5yDQa5CZCgFkpN/sVA6p7T8JfPNAufXzwEA6+m+SPb/AOnZr8Gk7LRrGPufEnd7cz/aT/lb1IwMCrI+jrXmIj3aK7Yr0vnoBB+AB9WdQDpNuknw5V1NJGV6x8ZirfGBFHBPHXnCD4IoIFzGCUKk6T/nYo9gNbmozaWI0T7AqTCo/XAywJz/hMpW0GsYJCJm+PSKhJCP+LXE5BwCybDKH+PkoCGGA== template: metadata: creationTimestamp: null name: linode-storage - namespace: code-for-philly + namespace: squadquest-supabase type: Opaque From d748fc6e8a4ec97cc627f5dd771c9f23e1afbc51 Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Sun, 1 Dec 2024 18:39:41 -0500 Subject: [PATCH 5/5] chore(choose-native-plants): pin helm chart source to last deployment before syntax error introduced --- .holo/sources/choose-native-plants.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.holo/sources/choose-native-plants.toml b/.holo/sources/choose-native-plants.toml index dbd489f..8187d0d 100644 --- a/.holo/sources/choose-native-plants.toml +++ b/.holo/sources/choose-native-plants.toml @@ -1,3 +1,3 @@ [holosource] url = "https://github.com/CodeForPhilly/pa-wildflower-selector" -ref = "refs/heads/main" +ref = "1df726b8e13f120fd3c215cf8a785a975a2516a2"