From 652874f43f160325796b33f6a5686639a8827666 Mon Sep 17 00:00:00 2001 From: rzlim08 <37033997+rzlim08@users.noreply.github.com> Date: Wed, 15 Jan 2025 15:47:24 -0800 Subject: [PATCH 1/2] fix: bump timeout seconds (#351) --- .happy/terraform/envs/staging/main.tf | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.happy/terraform/envs/staging/main.tf b/.happy/terraform/envs/staging/main.tf index 8832ba90..d66f1084 100644 --- a/.happy/terraform/envs/staging/main.tf +++ b/.happy/terraform/envs/staging/main.tf @@ -2,7 +2,7 @@ locals { magic_stack_name = module.secrets.values.magic_stack_name alb_name = module.secrets.values.alb_name service_type = var.stack_name == local.magic_stack_name ? "TARGET_GROUP_ONLY" : "INTERNAL" - routing_config = { + routing_config = { "INTERNAL" = {}, "TARGET_GROUP_ONLY" = { path = "/graphqlfed*", @@ -35,18 +35,20 @@ module "stack" { k8s_namespace = var.k8s_namespace services = { gql = merge(local.routing_config[local.service_type], { - name = "graphql-federation" - port = "4444" - memory = "8000Mi" - memory_requests = "8000Mi" - cpu = "3000m" - cpu_requests = "3000m" - health_check_path = "/health" + name = "graphql-federation" + port = "4444" + memory = "8000Mi" + memory_requests = "8000Mi" + cpu = "3000m" + cpu_requests = "3000m" + liveness_timeout_seconds = "60" + readiness_timeout_seconds = "60" + health_check_path = "/health" // INTERNAL - OIDC protected ALB // EXTERNAL - external ALB // PRIVATE - cluster IP only, no ALB at all // TARGET_GROUP_ONLY - Only create a target group for use with an existing ALB - service_type = local.service_type + service_type = local.service_type platform_architecture = "arm64" }) } From 97b36518923430fde96d5f6d7b6874fe115ea13f Mon Sep 17 00:00:00 2001 From: "czi-github-helper[bot]" <95879977+czi-github-helper[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 15:49:57 -0800 Subject: [PATCH 2/2] chore(main): release 2.34.2 (#352) Co-authored-by: czi-github-helper[bot] <95879977+czi-github-helper[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7505e567..28b8cae0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Changelog +## [2.34.2](https://github.com/chanzuckerberg/czid-graphql-federation-server/compare/v2.34.1...v2.34.2) (2025-01-15) + + +### Bug Fixes + +* bump timeout seconds ([#351](https://github.com/chanzuckerberg/czid-graphql-federation-server/issues/351)) ([652874f](https://github.com/chanzuckerberg/czid-graphql-federation-server/commit/652874f43f160325796b33f6a5686639a8827666)) + ## [2.34.1](https://github.com/chanzuckerberg/czid-graphql-federation-server/compare/v2.34.0...v2.34.1) (2024-12-10) diff --git a/package-lock.json b/package-lock.json index 8ed0c8fe..dcd8c0ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "czi-graphql-federation", - "version": "2.34.1", + "version": "2.34.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "czi-graphql-federation", - "version": "2.34.1", + "version": "2.34.2", "license": "ISC", "dependencies": { "@graphql-mesh/cli": "^0.89.9", diff --git a/package.json b/package.json index 0ad2c1b1..82df47d6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "czi-graphql-federation", - "version": "2.34.1", + "version": "2.34.2", "description": "", "scripts": { "start": "mesh start",