Update reconfig nfr test

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 --build-arg NGINX_CONF_DIR=$(NGINX_CONF_DIR) -t nginx-crossplane:latest -f framework/crossplane/Dockerfile ..
+	docker build --platform linux/$(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,8 +104,16 @@ 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
 
+
+include scripts/vars.env
+export
+
 .PHONY: nfr-test
 nfr-test: check-for-plus-usage-endpoint ## Run the NFR tests on a GCP VM
+nfr-test: GOARCH=amd64
+nfr-test: build-crossplane-image
+	docker tag nginx-crossplane:latest $(PREFIX)/nginx-crossplane:latest
+	docker push $(PREFIX)/nginx-crossplane:latest
 	CI=$(CI) ./scripts/run-tests-gcp-vm.sh
 
 .PHONY: start-longevity-test

tests/framework/crossplane.go

@@ -144,11 +144,17 @@ func injectCrossplaneContainer(
 	k8sClient kubernetes.Interface,
 	timeout time.Duration,
 	ngfPodName,
-	namespace string,
+	namespace,
+	crossplaneImageRepo string,
 ) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
+	image := "nginx-crossplane:latest"
+	if crossplaneImageRepo != "" {
+		image = crossplaneImageRepo + "/" + image
+	}
+
 	pod := &core.Pod{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      ngfPodName,
@@ -160,8 +166,8 @@ func injectCrossplaneContainer(
 					TargetContainerName: "nginx",
 					EphemeralContainerCommon: core.EphemeralContainerCommon{
 						Name:            "crossplane",
-						Image:           "nginx-crossplane:latest",
-						ImagePullPolicy: "Never",
+						Image:           image,
+						ImagePullPolicy: "IfNotPresent",
 						Stdin:           true,
 						VolumeMounts: []core.VolumeMount{
 							{

tests/framework/resourcemanager.go

@@ -825,12 +825,14 @@ func (rm *ResourceManager) WaitForGatewayObservedGeneration(
 }
 
 // GetNginxConfig uses crossplane to get the nginx configuration and convert it to JSON.
-func (rm *ResourceManager) GetNginxConfig(nginxPodName, namespace string) (*Payload, error) {
+// If the crossplane image is loaded locally on the node, crossplaneImageRepo can be empty.
+func (rm *ResourceManager) GetNginxConfig(nginxPodName, namespace, crossplaneImageRepo string) (*Payload, error) {
 	if err := injectCrossplaneContainer(
 		rm.ClientGoClient,
 		rm.TimeoutConfig.UpdateTimeout,
 		nginxPodName,
 		namespace,
+		crossplaneImageRepo,
 	); err != nil {
 		return nil, err
 	}

tests/suite/client_settings_test.go

@@ -109,7 +109,7 @@ var _ = Describe("ClientSettingsPolicy", Ordered, Label("functional", "cspolicy"
 
 			BeforeAll(func() {
 				var err error
-				conf, err = resourceManager.GetNginxConfig(nginxPodName, namespace)
+				conf, err = resourceManager.GetNginxConfig(nginxPodName, namespace, "")
 				Expect(err).ToNot(HaveOccurred())
 			})
 

tests/suite/manifests/reconfig/cafe-routes.yaml

@@ -5,7 +5,7 @@ metadata:
 spec:
   parentRefs:
   - name: gateway
-    namespace: default
+    namespace: reconfig
     sectionName: http
   hostnames:
   - "cafe.example.com"
@@ -23,7 +23,7 @@ metadata:
 spec:
   parentRefs:
   - name: gateway
-    namespace: default
+    namespace: reconfig
     sectionName: https
   hostnames:
   - "cafe.example.com"
@@ -43,8 +43,8 @@ metadata:
 spec:
   parentRefs:
   - name: gateway
+    namespace: reconfig
     sectionName: https
-    namespace: default
   hostnames:
   - "cafe.example.com"
   rules: