From a9a46d426ea04de781ca713b3928d58a60819ac2 Mon Sep 17 00:00:00 2001 From: Saylor Berman Date: Fri, 16 May 2025 12:07:26 -0600 Subject: [PATCH] Update service labels in NFR tests Problem: The GKE service label for nginx LB is not provided in the helm chart anymore. Solution: Add the label in each Gateway infrastructure field. --- tests/Makefile | 8 +++----- tests/framework/ngf.go | 6 ------ tests/scripts/remote-scripts/run-nfr-tests.sh | 2 +- tests/suite/manifests/dp-perf/gateway.yaml | 3 +++ tests/suite/manifests/longevity/gateway.yaml | 3 +++ tests/suite/manifests/ngf-upgrade/gateway-updated.yaml | 3 +++ tests/suite/manifests/ngf-upgrade/gateway.yaml | 3 +++ tests/suite/manifests/reconfig/gateway.yaml | 3 +++ tests/suite/manifests/scale/matches.yaml | 3 +++ tests/suite/manifests/scale/upstreams.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-1.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-10.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-11.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-12.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-13.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-14.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-15.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-16.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-17.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-18.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-19.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-2.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-20.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-21.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-22.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-23.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-24.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-25.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-3.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-4.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-5.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-6.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-7.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-8.yaml | 3 +++ tests/suite/manifests/scale/zero-downtime/gateway-9.yaml | 3 +++ tests/suite/system_suite_test.go | 2 -- tests/suite/upgrade_test.go | 1 - 37 files changed, 100 insertions(+), 15 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index eec81e0ad7..391ddf9771 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -9,7 +9,6 @@ GITHUB_OUTPUT = GW_API_VERSION ?= $(shell sed -n 's/.*ref=v\(.*\)/\1/p' ../config/crd/gateway-api/standard/kustomization.yaml)## Supported Gateway API version from current NGF GW_API_PREV_VERSION ?= 1.2.1## Supported Gateway API version from previous NGF release GW_SERVICE_TYPE = NodePort## Service type to use for the gateway -GW_SVC_GKE_INTERNAL = false NGF_VERSION ?= edge## NGF version to be tested PULL_POLICY = Never## Pull policy for the images NGINX_CONF_DIR = internal/mode/static/nginx/conf @@ -127,9 +126,8 @@ stop-longevity-test: nfr-test ## Stop the longevity test and collects results --gateway-api-prev-version=$(GW_API_PREV_VERSION) --image-tag=$(TAG) --version-under-test=$(NGF_VERSION) \ --ngf-image-repo=$(PREFIX) --nginx-image-repo=$(NGINX_PREFIX) --nginx-plus-image-repo=$(NGINX_PLUS_PREFIX) \ --pull-policy=$(PULL_POLICY) --service-type=$(GW_SERVICE_TYPE) \ - --is-gke-internal-lb=$(GW_SVC_GKE_INTERNAL) --plus-enabled=$(PLUS_ENABLED) \ - --plus-license-file-name=$(PLUS_LICENSE_FILE) --plus-usage-endpoint=$(PLUS_USAGE_ENDPOINT) \ - --gke-project=$(GKE_PROJECT) + --plus-enabled=$(PLUS_ENABLED) --plus-license-file-name=$(PLUS_LICENSE_FILE) \ + --plus-usage-endpoint=$(PLUS_USAGE_ENDPOINT) --gke-project=$(GKE_PROJECT) .PHONY: test test: build-crossplane-image ## Runs the functional tests on your kind k8s cluster @@ -141,7 +139,7 @@ test: build-crossplane-image ## Runs the functional tests on your kind k8s clust --image-tag=$(TAG) --version-under-test=$(NGF_VERSION) \ --ngf-image-repo=$(PREFIX) --nginx-image-repo=$(NGINX_PREFIX) --nginx-plus-image-repo=$(NGINX_PLUS_PREFIX) \ --pull-policy=$(PULL_POLICY) --service-type=$(GW_SERVICE_TYPE) \ - --is-gke-internal-lb=$(GW_SVC_GKE_INTERNAL) --cluster-name=$(CLUSTER_NAME) --plus-enabled=$(PLUS_ENABLED) \ + --cluster-name=$(CLUSTER_NAME) --plus-enabled=$(PLUS_ENABLED) \ --plus-license-file-name=$(PLUS_LICENSE_FILE) --plus-usage-endpoint=$(PLUS_USAGE_ENDPOINT) .PHONY: test-with-plus diff --git a/tests/framework/ngf.go b/tests/framework/ngf.go index 48cd1b9ed7..0cca34fc3a 100644 --- a/tests/framework/ngf.go +++ b/tests/framework/ngf.go @@ -35,7 +35,6 @@ type InstallationConfig struct { ServiceType string PlusUsageEndpoint string Plus bool - IsGKEInternalLB bool Telemetry bool } @@ -231,11 +230,6 @@ func setImageArgs(cfg InstallationConfig) []string { if cfg.ServiceType != "" { args = append(args, formatValueSet("nginx.service.type", cfg.ServiceType)...) - if cfg.ServiceType == "LoadBalancer" && cfg.IsGKEInternalLB { - args = append( - args, - formatValueSet(`service.annotations.networking\.gke\.io\/load-balancer-type`, "Internal")...) - } } return args diff --git a/tests/scripts/remote-scripts/run-nfr-tests.sh b/tests/scripts/remote-scripts/run-nfr-tests.sh index 5fbe5450d0..baea40ab52 100755 --- a/tests/scripts/remote-scripts/run-nfr-tests.sh +++ b/tests/scripts/remote-scripts/run-nfr-tests.sh @@ -10,7 +10,7 @@ elif [ "${STOP_LONGEVITY}" == "true" ]; then GINKGO_LABEL="longevity-teardown" fi -cd nginx-gateway-fabric/tests && make .vm-nfr-test CI=${CI} TAG="${TAG}" PREFIX="${PREFIX}" NGINX_PREFIX="${NGINX_PREFIX}" NGINX_PLUS_PREFIX="${NGINX_PLUS_PREFIX}" PLUS_ENABLED="${PLUS_ENABLED}" GINKGO_LABEL=${GINKGO_LABEL} GINKGO_FLAGS="${GINKGO_FLAGS}" PULL_POLICY=Always GW_SERVICE_TYPE=LoadBalancer GW_SVC_GKE_INTERNAL=true NGF_VERSION="${NGF_VERSION}" PLUS_USAGE_ENDPOINT="${PLUS_USAGE_ENDPOINT}" GKE_PROJECT="${GKE_PROJECT}" +cd nginx-gateway-fabric/tests && make .vm-nfr-test CI=${CI} TAG="${TAG}" PREFIX="${PREFIX}" NGINX_PREFIX="${NGINX_PREFIX}" NGINX_PLUS_PREFIX="${NGINX_PLUS_PREFIX}" PLUS_ENABLED="${PLUS_ENABLED}" GINKGO_LABEL=${GINKGO_LABEL} GINKGO_FLAGS="${GINKGO_FLAGS}" PULL_POLICY=Always GW_SERVICE_TYPE=LoadBalancer NGF_VERSION="${NGF_VERSION}" PLUS_USAGE_ENDPOINT="${PLUS_USAGE_ENDPOINT}" GKE_PROJECT="${GKE_PROJECT}" if [ "${START_LONGEVITY}" == "true" ]; then suite/scripts/longevity-wrk.sh diff --git a/tests/suite/manifests/dp-perf/gateway.yaml b/tests/suite/manifests/dp-perf/gateway.yaml index 794b1825f5..db5b1e94ae 100644 --- a/tests/suite/manifests/dp-perf/gateway.yaml +++ b/tests/suite/manifests/dp-perf/gateway.yaml @@ -4,6 +4,9 @@ metadata: name: cafe spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/longevity/gateway.yaml b/tests/suite/manifests/longevity/gateway.yaml index 6789002abb..81655749a9 100644 --- a/tests/suite/manifests/longevity/gateway.yaml +++ b/tests/suite/manifests/longevity/gateway.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/ngf-upgrade/gateway-updated.yaml b/tests/suite/manifests/ngf-upgrade/gateway-updated.yaml index a54e48eed7..d20b8e1fe1 100644 --- a/tests/suite/manifests/ngf-upgrade/gateway-updated.yaml +++ b/tests/suite/manifests/ngf-upgrade/gateway-updated.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/ngf-upgrade/gateway.yaml b/tests/suite/manifests/ngf-upgrade/gateway.yaml index 6789002abb..81655749a9 100644 --- a/tests/suite/manifests/ngf-upgrade/gateway.yaml +++ b/tests/suite/manifests/ngf-upgrade/gateway.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/reconfig/gateway.yaml b/tests/suite/manifests/reconfig/gateway.yaml index ed6c91eb6a..dd48c191bb 100644 --- a/tests/suite/manifests/reconfig/gateway.yaml +++ b/tests/suite/manifests/reconfig/gateway.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/matches.yaml b/tests/suite/manifests/scale/matches.yaml index 939e62df84..857bbc2ee5 100644 --- a/tests/suite/manifests/scale/matches.yaml +++ b/tests/suite/manifests/scale/matches.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: listener port: 80 diff --git a/tests/suite/manifests/scale/upstreams.yaml b/tests/suite/manifests/scale/upstreams.yaml index 96ffe87bb6..151f688aa1 100644 --- a/tests/suite/manifests/scale/upstreams.yaml +++ b/tests/suite/manifests/scale/upstreams.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: listener hostname: "*.example.com" diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-1.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-1.yaml index 04f3e86f80..fa13fd3a32 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-1.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-1.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-10.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-10.yaml index a3f8452bdc..921ef4633f 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-10.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-10.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-11.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-11.yaml index 7ea0ddaf90..27068ac4ce 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-11.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-11.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-12.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-12.yaml index 9897e99e39..3763b77a17 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-12.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-12.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-13.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-13.yaml index 35fce379b8..32f5ff016a 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-13.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-13.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-14.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-14.yaml index c9e1b038cb..5f72da6eeb 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-14.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-14.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-15.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-15.yaml index 67c32776dc..320e1a0070 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-15.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-15.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-16.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-16.yaml index 941dbd4278..7ae360af1f 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-16.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-16.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-17.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-17.yaml index a36c71359d..a768b5a1ad 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-17.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-17.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-18.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-18.yaml index bc4c1e431e..de14be222e 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-18.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-18.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-19.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-19.yaml index cf503bc938..30351edcae 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-19.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-19.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-2.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-2.yaml index 3e1a2458ba..e2eba90169 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-2.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-2.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-20.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-20.yaml index 3a72b45c06..6d21e56c1e 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-20.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-20.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-21.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-21.yaml index 11bf1c872e..ee80d60722 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-21.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-21.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-22.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-22.yaml index 7562118d21..73bb3747b4 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-22.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-22.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-23.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-23.yaml index 8785675d39..43143cec8f 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-23.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-23.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-24.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-24.yaml index 86f02b1dd5..e3889f1e96 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-24.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-24.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-25.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-25.yaml index 02034a59b6..6b3c3882b8 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-25.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-25.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-3.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-3.yaml index d0b3a2c63c..dad204cf2c 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-3.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-3.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-4.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-4.yaml index 9be9b7acaf..c07995f856 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-4.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-4.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-5.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-5.yaml index 902a315e09..a33fbb6df4 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-5.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-5.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-6.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-6.yaml index 8043ec9fa0..78528bbe2c 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-6.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-6.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-7.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-7.yaml index 90dd490f06..c44a1df62a 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-7.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-7.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-8.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-8.yaml index 6e15236dfc..f250841402 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-8.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-8.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/manifests/scale/zero-downtime/gateway-9.yaml b/tests/suite/manifests/scale/zero-downtime/gateway-9.yaml index aab0679dc9..031d0ef05a 100644 --- a/tests/suite/manifests/scale/zero-downtime/gateway-9.yaml +++ b/tests/suite/manifests/scale/zero-downtime/gateway-9.yaml @@ -4,6 +4,9 @@ metadata: name: gateway spec: gatewayClassName: nginx + infrastructure: + annotations: + service.annotations.networking.gke.io/load-balancer-type: Internal listeners: - name: http port: 80 diff --git a/tests/suite/system_suite_test.go b/tests/suite/system_suite_test.go index 6a8174bdb9..e57c9fc75a 100644 --- a/tests/suite/system_suite_test.go +++ b/tests/suite/system_suite_test.go @@ -60,7 +60,6 @@ var ( versionUnderTest = flag.String("version-under-test", "", "Version of NGF that is being tested") imagePullPolicy = flag.String("pull-policy", "", "Image pull policy for NGF images") serviceType = flag.String("service-type", "NodePort", "Type of service fronting NGF to be deployed") - isGKEInternalLB = flag.Bool("is-gke-internal-lb", false, "Is the LB service GKE internal only") plusEnabled = flag.Bool("plus-enabled", false, "Is NGINX Plus enabled") plusLicenseFileName = flag.String("plus-license-file-name", "", "File name containing the NGINX Plus JWT") plusUsageEndpoint = flag.String("plus-usage-endpoint", "", "Endpoint for reporting NGINX Plus usage") @@ -222,7 +221,6 @@ func createNGFInstallConfig(cfg setupConfig, extraInstallArgs ...string) framewo Namespace: ngfNamespace, ChartPath: cfg.chartPath, ServiceType: *serviceType, - IsGKEInternalLB: *isGKEInternalLB, Plus: *plusEnabled, PlusUsageEndpoint: *plusUsageEndpoint, Telemetry: cfg.telemetry, diff --git a/tests/suite/upgrade_test.go b/tests/suite/upgrade_test.go index a62de97356..f327817129 100644 --- a/tests/suite/upgrade_test.go +++ b/tests/suite/upgrade_test.go @@ -108,7 +108,6 @@ var _ = Describe("Upgrade testing", Label("nfr", "upgrade"), func() { ImageTag: *imageTag, ImagePullPolicy: *imagePullPolicy, ServiceType: *serviceType, - IsGKEInternalLB: *isGKEInternalLB, Plus: *plusEnabled, PlusUsageEndpoint: *plusUsageEndpoint, }