Add updates to scripts and makefile

Author: bjee19

tests/Makefile

@@ -44,7 +44,7 @@ build-test-runner-image: ## Build conformance test runner image
 
 .PHONY: build-crossplane-image
 build-crossplane-image: ## Build the crossplane image
-	docker build --platform linux/$(GOARCH) --build-arg NGINX_CONF_DIR=$(NGINX_CONF_DIR) -t nginx-crossplane:latest -f framework/crossplane/Dockerfile ..
+	docker build --platform $(GOOS)/$(GOARCH) --build-arg NGINX_CONF_DIR=$(NGINX_CONF_DIR) -t nginx-crossplane:latest -f framework/crossplane/Dockerfile ..
 
 .PHONY: run-conformance-tests
 run-conformance-tests: ## Run conformance tests
@@ -104,16 +104,10 @@ create-gke-router: ## Create a GKE router to allow egress traffic from private n
 sync-files-to-vm: ## Syncs your local NGF files with the NGF repo on the VM
 	./scripts/sync-files-to-vm.sh
 
-
-# This is to access $(GKE_PROJECT)
-include scripts/vars.env
-export
-
 .PHONY: nfr-test
 nfr-test: GOARCH=amd64
 nfr-test: check-for-plus-usage-endpoint build-crossplane-image  ## Run the NFR tests on a GCP VM
-	docker tag nginx-crossplane:latest gcr.io/$(GKE_PROJECT)/nginx-crossplane:latest
-	docker push gcr.io/$(GKE_PROJECT)/nginx-crossplane:latest
+	./scripts/push-crossplane-image.sh
 	CI=$(CI) ./scripts/run-tests-gcp-vm.sh
 
 .PHONY: start-longevity-test

tests/framework/resourcemanager.go

@@ -671,7 +671,7 @@ func (rm *ResourceManager) ScaleNginxDeployment(namespace, releaseName string, r
 	ctx, cancel := context.WithTimeout(context.Background(), rm.TimeoutConfig.UpdateTimeout)
 	defer cancel()
 
-	// If there is another NginxProxy which "overrides" the gateway class level one, then this won't work and
+	// If there is another NginxProxy which "overrides" the gateway class  one, then this won't work and
 	// may need refactoring.
 	proxy, err := rm.getGatewayClassNginxProxy(namespace, releaseName)
 	if err != nil {

tests/scripts/push-crossplane-image.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+source scripts/vars.env
+
+docker tag nginx-crossplane:latest gcr.io/$GKE_PROJECT/nginx-crossplane:latest
+docker push gcr.io/$GKE_PROJECT/nginx-crossplane:latest