Merge remote-tracking branch 'origin/canary' into beta

feat: add cloud logger sa integrate (#6089 )
ci: only enable jwst codec in canary
2026-02-04 16:44:56 +00:00 · 2024-03-14 15:31:51 +08:00 · 2024-03-12 23:25:00 +08:00 · 2024-03-12 17:47:33 +08:00 · 2024-03-06 18:18:27 +08:00 · 2024-03-06 18:14:22 +08:00
2 changed files with 4 additions and 0 deletions
--- a/.github/actions/deploy/deploy.mjs
+++ b/.github/actions/deploy/deploy.mjs
@@ -21,6 +21,7 @@ const {
  AFFINE_GOOGLE_CLIENT_ID,
  AFFINE_GOOGLE_CLIENT_SECRET,
  CLOUD_SQL_IAM_ACCOUNT,
+  CLOUD_LOGGER_IAM_ACCOUNT,
  GCLOUD_CONNECTION_NAME,
  GCLOUD_CLOUD_SQL_INTERNAL_ENDPOINT,
  REDIS_HOST,
@@ -59,7 +60,9 @@ const createHelmCommand = ({ isDryRun }) => {
      ? [
          `--set-json   web.service.annotations=\"{ \\"cloud.google.com/neg\\": \\"{\\\\\\"ingress\\\\\\": true}\\" }\"`,
          `--set-json   graphql.service.annotations=\"{ \\"cloud.google.com/neg\\": \\"{\\\\\\"ingress\\\\\\": true}\\" }\"`,
+          `--set-json   graphql.serviceAccount.annotations=\"{ \\"iam.gke.io/gcp-service-account\\": \\"${CLOUD_LOGGER_IAM_ACCOUNT}\\"}\"`,
          `--set-json   sync.service.annotations=\"{ \\"cloud.google.com/neg\\": \\"{\\\\\\"ingress\\\\\\": true}\\" }\"`,
+          `--set-json   sync.serviceAccount.annotations=\"{ \\"iam.gke.io/gcp-service-account\\": \\"${CLOUD_LOGGER_IAM_ACCOUNT}\\"}\"`,
          `--set-json   cloud-sql-proxy.serviceAccount.annotations=\"{ \\"iam.gke.io/gcp-service-account\\": \\"${CLOUD_SQL_IAM_ACCOUNT}\\" }\"`,
          `--set-json   cloud-sql-proxy.nodeSelector=\"{ \\"iam.gke.io/gke-metadata-server-enabled\\": \\"true\\" }\"`,
        ]
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -295,6 +295,7 @@ jobs:
          REDIS_HOST: ${{ secrets.REDIS_HOST }}
          REDIS_PASSWORD: ${{ secrets.REDIS_PASSWORD }}
          CLOUD_SQL_IAM_ACCOUNT: ${{ secrets.CLOUD_SQL_IAM_ACCOUNT }}
+          CLOUD_LOGGER_IAM_ACCOUNT: ${{ secrets.CLOUD_LOGGER_IAM_ACCOUNT }}
          STRIPE_API_KEY: ${{ secrets.STRIPE_API_KEY }}
          STRIPE_WEBHOOK_KEY: ${{ secrets.STRIPE_WEBHOOK_KEY }}
          STATIC_IP_NAME: ${{ secrets.STATIC_IP_NAME }}
Author	SHA1	Message	Date
LongYinan	1b1e40133a	Merge remote-tracking branch 'origin/canary' into beta	2024-03-14 15:31:51 +08:00
DarkSky	003986d657	feat: add cloud logger sa integrate (#6089 )	2024-03-12 23:25:00 +08:00
forehalo	0d66519523	ci: only enable jwst codec in canary	2024-03-12 17:47:33 +08:00
LongYinan	aaffc80f82	ci: add write packages permission to release workflow	2024-03-06 18:18:27 +08:00
LongYinan	2c8861ae49	ci: add write permission to release workflow	2024-03-06 18:14:22 +08:00
LongYinan	ec1edfd70b	ci: add write permission to release workflow	2024-03-06 18:12:20 +08:00