From d2fe19ec53dbd49609f3c921ba8545924fe87a02 Mon Sep 17 00:00:00 2001 From: Benjamin Jee Date: Mon, 19 May 2025 14:27:32 -0700 Subject: [PATCH 1/4] Add create router into nfr workflow --- .github/workflows/nfr.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/nfr.yml b/.github/workflows/nfr.yml index c8968cb056..4bf6a614c3 100644 --- a/.github/workflows/nfr.yml +++ b/.github/workflows/nfr.yml @@ -144,6 +144,10 @@ jobs: working-directory: ./tests run: make create-and-setup-vm + - name: Create and setup Router + working-directory: ./tests + run: make create-gke-router + - name: Run Tests working-directory: ./tests run: | From f78663cb77795ac33604788ad6e6668145d53db9 Mon Sep 17 00:00:00 2001 From: Benjamin Jee Date: Mon, 19 May 2025 15:34:10 -0700 Subject: [PATCH 2/4] Fix nats error --- tests/scripts/create-gke-router.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/scripts/create-gke-router.sh b/tests/scripts/create-gke-router.sh index 599986638b..343ce7b64e 100755 --- a/tests/scripts/create-gke-router.sh +++ b/tests/scripts/create-gke-router.sh @@ -11,5 +11,5 @@ gcloud compute routers create "${RESOURCE_NAME}" \ gcloud compute routers nats create "${RESOURCE_NAME}" \ --router-region "${GKE_CLUSTER_REGION}" \ --router "${RESOURCE_NAME}" \ - --nat-all-subnet-ip-ranges \ - --auto-allocate-nat-external-ips + --auto-allocate-nat-external-ips \ + --nat-custom-subnet-ip-ranges="default" From 65f165849c0c2ceccfc7e64700b23d95b3e47249 Mon Sep 17 00:00:00 2001 From: Benjamin Jee Date: Mon, 19 May 2025 15:49:41 -0700 Subject: [PATCH 3/4] Add cleanup router --- .github/workflows/nfr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nfr.yml b/.github/workflows/nfr.yml index 4bf6a614c3..c8e0be06d1 100644 --- a/.github/workflows/nfr.yml +++ b/.github/workflows/nfr.yml @@ -168,6 +168,7 @@ jobs: if: always() run: | bash scripts/cleanup-vm.sh true + bash scripts/cleanup-router.sh true make delete-gke-cluster rm -rf scripts/vars.env From f3c93e88d662972ba22d79ec4e27a44ee76d7a03 Mon Sep 17 00:00:00 2001 From: Benjamin Jee Date: Tue, 20 May 2025 10:14:57 -0700 Subject: [PATCH 4/4] Revert router changes but add continue on error to workflow --- .github/workflows/nfr.yml | 2 +- tests/scripts/create-gke-router.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nfr.yml b/.github/workflows/nfr.yml index c8e0be06d1..938240ab1e 100644 --- a/.github/workflows/nfr.yml +++ b/.github/workflows/nfr.yml @@ -146,7 +146,7 @@ jobs: - name: Create and setup Router working-directory: ./tests - run: make create-gke-router + run: make create-gke-router || true - name: Run Tests working-directory: ./tests diff --git a/tests/scripts/create-gke-router.sh b/tests/scripts/create-gke-router.sh index 343ce7b64e..599986638b 100755 --- a/tests/scripts/create-gke-router.sh +++ b/tests/scripts/create-gke-router.sh @@ -11,5 +11,5 @@ gcloud compute routers create "${RESOURCE_NAME}" \ gcloud compute routers nats create "${RESOURCE_NAME}" \ --router-region "${GKE_CLUSTER_REGION}" \ --router "${RESOURCE_NAME}" \ - --auto-allocate-nat-external-ips \ - --nat-custom-subnet-ip-ranges="default" + --nat-all-subnet-ip-ranges \ + --auto-allocate-nat-external-ips