From 9d9a2693cfe53d47d9832ac0a65a0714cd18369e Mon Sep 17 00:00:00 2001
From: Ciara Stacke <c.stacke@f5.com>
Date: Mon, 26 Jun 2023 14:10:36 +0100
Subject: [PATCH 1/4] Run conformance tests in pod on cluster

---
 conformance/Makefile                    | 36 ++++++-----
 conformance/README.md                   | 38 +++++-------
 conformance/tests/Dockerfile            |  2 +
 conformance/tests/conformance_spec.yaml | 82 +++++++++++++++++++++++++
 4 files changed, 119 insertions(+), 39 deletions(-)
 create mode 100644 conformance/tests/conformance_spec.yaml

diff --git a/conformance/Makefile b/conformance/Makefile
index 8e2ee41504..12adef855e 100644
--- a/conformance/Makefile
+++ b/conformance/Makefile
@@ -1,11 +1,9 @@
 NKG_TAG = edge
 NKG_PREFIX = nginx-kubernetes-gateway
-GATEWAY_CLASS = nginx
-SUPPORTED_FEATURES = HTTPRoute,HTTPRouteQueryParamMatching,HTTPRouteMethodMatching,HTTPRoutePortRedirect,HTTPRouteSchemeRedirect
-EXEMPT_FEATURES = ReferenceGrant
 KIND_KUBE_CONFIG_FOLDER = $${HOME}/.kube/kind
 TAG = latest
 PREFIX = conformance-test-runner
+NGINX_IMAGE=$(shell yq '.spec.template.spec.containers[1].image as $$nginx_ver | $$nginx_ver' ../deploy/manifests/deployment.yaml)
 .DEFAULT_GOAL := help
 
 .PHONY: help
@@ -14,17 +12,20 @@ help: Makefile ## Display this help
 
 .PHONY: build-test-runner-image
 build-test-runner-image: ## Build conformance test runner image
-	docker build -t $(PREFIX):$(TAG) -f tests/Dockerfile ..
+	docker build -t $(PREFIX):$(TAG) -f tests/Dockerfile .. 
 
 .PHONY: create-kind-cluster
 create-kind-cluster: ## Create a kind cluster
-	kind create cluster --image kindest/node:v1.27.1
+	kind create cluster --image kindest/node:v1.27.1 
 	kind export kubeconfig --kubeconfig $(KIND_KUBE_CONFIG_FOLDER)/config
 
 .PHONY: prepare-nkg
-prepare-nkg: ## Build and load NKG container on configured kind cluster
+prepare-nkg: ## Build and load NKG and NGINX containers on configured kind cluster
 	cd .. && make PREFIX=$(NKG_PREFIX) TAG=$(NKG_TAG) container
 	kind load docker-image $(NKG_PREFIX):$(NKG_TAG)
+	docker pull $(NGINX_IMAGE)
+	kind load docker-image $(NGINX_IMAGE)
+	yq -i 'with(.spec.template.spec.containers[0]; .image = "$(NKG_PREFIX):$(NKG_TAG)" | .imagePullPolicy = "Never")' ../deploy/manifests/deployment.yaml
 
 .PHONY: install-nkg
 install-nkg: ## Install NKG with provisioner on configured kind cluster
@@ -36,16 +37,17 @@ install-nkg: ## Install NKG with provisioner on configured kind cluster
 	kubectl apply -f ../deploy/manifests/rbac.yaml
 	kubectl apply -f ../deploy/manifests/gatewayclass.yaml
 	kubectl apply -f ../deploy/manifests/service/nodeport.yaml
-	kubectl apply -f provisioner/provisioner.yaml
-
-.PHONY: update-test-kind-config 
-update-test-kind-config: ## Update kind config
-	sed -ir "s|server:.*|server: https://kind-control-plane:6443|" $(KIND_KUBE_CONFIG_FOLDER)/config
+	yq '(select(di != 3))' provisioner/provisioner.yaml | kubectl apply -f -
+	yq '(select(.spec.template.spec.containers[].image) | .spec.template.spec.containers[].image="$(NKG_PREFIX):$(NKG_TAG)" | .spec.template.spec.containers[].imagePullPolicy = "Never")' provisioner/provisioner.yaml | kubectl apply -f -
 
 .PHONY: run-conformance-tests
-run-conformance-tests: update-test-kind-config ## Run conformance tests
-	docker run --network=kind --rm -v $(KIND_KUBE_CONFIG_FOLDER):/root/.kube $(PREFIX):$(TAG) \
-		go test -timeout 25m -v . -tags conformance -args --gateway-class=$(GATEWAY_CLASS) --debug --supported-features=$(SUPPORTED_FEATURES) --exempt-features=$(EXEMPT_FEATURES)
+run-conformance-tests: ## Run conformance tests
+	kind load docker-image $(PREFIX):$(TAG)
+	yq '(select(di != 3))' tests/conformance_spec.yaml | kubectl apply -f -
+	yq '(select(.spec.containers[].image) | .spec.containers[].image="$(PREFIX):$(TAG)")' tests/conformance_spec.yaml | kubectl apply -f -
+	sleep 5
+	kubectl logs conformance --follow
+	kubectl delete -f tests/conformance_spec.yaml
 
 .PHONY: uninstall-nkg
 uninstall-nkg: ## Uninstall NKG on configured kind cluster
@@ -54,7 +56,11 @@ uninstall-nkg: ## Uninstall NKG on configured kind cluster
 	kubectl delete -f ../deploy/manifests/namespace.yaml
 	kubectl delete clusterrole nginx-gateway-provisioner
 	kubectl delete clusterrolebinding nginx-gateway-provisioner
-	
+
+.PHONY: undo-image-update
+undo-image-update: ## Undo the NKG image name and tag in deployment manifest
+	git checkout -- ../deploy/manifests/deployment.yaml
+
 .PHONY: delete-kind-cluster
 delete-kind-cluster: ## Delete kind cluster
 	kind delete cluster
diff --git a/conformance/README.md b/conformance/README.md
index d5c8d3dfc6..d4ac08bd8d 100644
--- a/conformance/README.md
+++ b/conformance/README.md
@@ -5,6 +5,7 @@
 * [kind](https://kind.sigs.k8s.io/).
 * Docker.
 * Golang.
+* [yq](https://github.com/mikefarah/yq/#macos--linux-via-homebrew)
 
 **Note**: all commands in steps below are executed from the ```conformance``` directory
 
@@ -29,49 +30,38 @@ update-test-kind-config        Update kind config
 $ make create-kind-cluster
 ```
 
-### Step 2 - Update NKG deployment and provisioner manifests
-**Note**: this step is only required when user wants to run conformance tests using locally built image of Nginx Kubernetes Gateway
-* Set NKG_PREFIX=<repo_name> NKG_TAG=<image_tag> to preferred values.
-* Navigate to `deploy/manifests` and update values in `deployment.yaml` as specified in below code-block.
-* Navigate to `conformance/provisioner` and update values in `provisioner.yaml` as specified in below code-block.
-* Save the changes.
-```
-.
-..
-containers:
-- image: <repo_name>:<image_tag>
-  imagePullPolicy: Never
-..
-.
-```
-
-### Step 3 - Build and load Nginx Kubernetes Gateway container to configured kind cluster
-**Note**: this step is only required when user wants to run conformance tests using locally built image of Nginx Kubernetes Gateway
+### Step 2 - Build Nginx Kubernetes Gateway container and load it and the NGINX container to configured kind cluster
 
 ```bash
 $ make NKG_PREFIX=<repo_name> NKG_TAG=<image_tag> prepare-nkg
 
 ```
-### Step 4 - Build conformance test runner image
+### Step 3 - Build conformance test runner image
 ```bash
 $ make build-test-runner-image
 ```
 
-### Step 5 - Install Nginx Kubernetes Gateway
+### Step 4 - Install Nginx Kubernetes Gateway
 ```bash
-$ make install-nkg
+$ make NKG_PREFIX=<repo_name> NKG_TAG=<image_tag> install-nkg
 ```
 
-### Step 6 - Run Gateway conformance tests
+### Step 5 - Run Gateway conformance tests
 ```bash
-$ make run-conformance-tests
+$ make NKG_PREFIX=<repo_name> NKG_TAG=<image_tag> run-conformance-tests
 ```
 
-### Step 7 - Uninstall Nginx Kubernetes Gateway
+### Step 6 - Uninstall Nginx Kubernetes Gateway
 ```bash
 $ make uninstall-nkg
 ```
 
+### Step 7 - Revert changes to the NKG deployment manifest
+**Warning**: `make undo-image-update` will hard reset changes to the deploy/manifests/deployment.yaml file!
+```bash
+$ make undo-image-update
+```
+
 ### Step 8 - Delete kind cluster
 ```bash
 $ make delete-kind-cluster
diff --git a/conformance/tests/Dockerfile b/conformance/tests/Dockerfile
index 672872bbdc..f485af9d57 100644
--- a/conformance/tests/Dockerfile
+++ b/conformance/tests/Dockerfile
@@ -9,3 +9,5 @@ COPY --link go.sum /go/src/github.com/nginxinc/nginx-kubernetes-gateway/
 RUN go mod download
 
 COPY --link conformance/tests /go/src/github.com/nginxinc/nginx-kubernetes-gateway/conformance/tests/
+
+CMD go test -timeout 25m -v . -tags conformance -args --gateway-class=${GATEWAY_CLASS} --debug --supported-features=${SUPPORTED_FEATURES} --exempt-features=${EXEMPT_FEATURES}
diff --git a/conformance/tests/conformance_spec.yaml b/conformance/tests/conformance_spec.yaml
new file mode 100644
index 0000000000..cac9adcc4e
--- /dev/null
+++ b/conformance/tests/conformance_spec.yaml
@@ -0,0 +1,82 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: conformance
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: conformance
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - namespaces
+  - pods
+  - secrets
+  - services
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - update
+- apiGroups:
+  - apps
+  resources:
+  - deployments
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - gatewayclasses
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - gateways
+  - httproutes
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: nginx-conformance
+subjects:
+- kind: ServiceAccount
+  name: conformance
+  namespace: default
+roleRef:
+  kind: ClusterRole
+  name: conformance
+  apiGroup: rbac.authorization.k8s.io
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: conformance
+spec:
+  containers:
+  - name: conformance
+    image: conformance-test-runner:latest
+    imagePullPolicy: Never
+    env:
+      - name: GATEWAY_CLASS
+        value: nginx
+      - name: SUPPORTED_FEATURES
+        value: HTTPRoute,HTTPRouteQueryParamMatching,HTTPRouteMethodMatching,HTTPRoutePortRedirect,HTTPRouteSchemeRedirect
+      - name: EXEMPT_FEATURES
+        value: ReferenceGrant
+  serviceAccountName: conformance
+  restartPolicy: Never

From ee409cc31663c0780145021ad2315b3b0c0946a3 Mon Sep 17 00:00:00 2001
From: Ciara Stacke <c.stacke@f5.com>
Date: Mon, 26 Jun 2023 16:41:13 +0100
Subject: [PATCH 2/4] Review feedback & update make commands

---
 conformance/Makefile  | 16 +++++++++++++---
 conformance/README.md | 16 ++++++++++++----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/conformance/Makefile b/conformance/Makefile
index 12adef855e..e1f9769a08 100644
--- a/conformance/Makefile
+++ b/conformance/Makefile
@@ -12,11 +12,11 @@ help: Makefile ## Display this help
 
 .PHONY: build-test-runner-image
 build-test-runner-image: ## Build conformance test runner image
-	docker build -t $(PREFIX):$(TAG) -f tests/Dockerfile .. 
+	docker build -t $(PREFIX):$(TAG) -f tests/Dockerfile ..
 
 .PHONY: create-kind-cluster
 create-kind-cluster: ## Create a kind cluster
-	kind create cluster --image kindest/node:v1.27.1 
+	kind create cluster --image kindest/node:v1.27.1
 	kind export kubeconfig --kubeconfig $(KIND_KUBE_CONFIG_FOLDER)/config
 
 .PHONY: prepare-nkg
@@ -27,6 +27,13 @@ prepare-nkg: ## Build and load NKG and NGINX containers on configured kind clust
 	kind load docker-image $(NGINX_IMAGE)
 	yq -i 'with(.spec.template.spec.containers[0]; .image = "$(NKG_PREFIX):$(NKG_TAG)" | .imagePullPolicy = "Never")' ../deploy/manifests/deployment.yaml
 
+.PHONY: prepare-nkg-no-build
+prepare-nkg-no-build: ## Load NKG and NGINX containers on configured kind cluster
+	kind load docker-image $(NKG_PREFIX):$(NKG_TAG)
+	docker pull $(NGINX_IMAGE)
+	kind load docker-image $(NGINX_IMAGE)
+	yq -i 'with(.spec.template.spec.containers[0]; .image = "$(NKG_PREFIX):$(NKG_TAG)" | .imagePullPolicy = "Never")' ../deploy/manifests/deployment.yaml
+
 .PHONY: install-nkg
 install-nkg: ## Install NKG with provisioner on configured kind cluster
 	kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.7.1/standard-install.yaml
@@ -45,8 +52,11 @@ run-conformance-tests: ## Run conformance tests
 	kind load docker-image $(PREFIX):$(TAG)
 	yq '(select(di != 3))' tests/conformance_spec.yaml | kubectl apply -f -
 	yq '(select(.spec.containers[].image) | .spec.containers[].image="$(PREFIX):$(TAG)")' tests/conformance_spec.yaml | kubectl apply -f -
-	sleep 5
+	kubectl wait --for=condition=ready pod conformance
 	kubectl logs conformance --follow
+
+.PHONY: cleanup-conformance-tests
+cleanup-conformance-tests: ## Clean up conformance tests fixtures
 	kubectl delete -f tests/conformance_spec.yaml
 
 .PHONY: uninstall-nkg
diff --git a/conformance/README.md b/conformance/README.md
index d4ac08bd8d..7dc8533c51 100644
--- a/conformance/README.md
+++ b/conformance/README.md
@@ -15,14 +15,16 @@ List available commands:
 $ make
 
 build-test-runner-image        Build conformance test runner image
+cleanup-conformance-tests      Clean up conformance tests fixtures
 create-kind-cluster            Create a kind cluster
 delete-kind-cluster            Delete kind cluster
 help                           Display this help
 install-nkg                    Install NKG with provisioner on configured kind cluster
-prepare-nkg                    Build and load NKG container on configured kind cluster
+prepare-nkg-no-build           Load NKG and NGINX containers on configured kind cluster
+prepare-nkg                    Build and load NKG and NGINX containers on configured kind cluster
 run-conformance-tests          Run conformance tests
+undo-image-update              Undo the NKG image name and tag in deployment manifest
 uninstall-nkg                  Uninstall NKG on configured kind cluster
-update-test-kind-config        Update kind config
 ```
 ### Step 1 - Create a kind Cluster
 
@@ -31,10 +33,15 @@ $ make create-kind-cluster
 ```
 
 ### Step 2 - Build Nginx Kubernetes Gateway container and load it and the NGINX container to configured kind cluster
-
 ```bash
 $ make NKG_PREFIX=<repo_name> NKG_TAG=<image_tag> prepare-nkg
 
+```
+**Optional** Instead of the above command, you can skip the build NKG image step by running
+
+```bash
+$ make NKG_PREFIX=<repo_name> NKG_TAG=<image_tag> prepare-nkg-no-build
+
 ```
 ### Step 3 - Build conformance test runner image
 ```bash
@@ -51,8 +58,9 @@ $ make NKG_PREFIX=<repo_name> NKG_TAG=<image_tag> install-nkg
 $ make NKG_PREFIX=<repo_name> NKG_TAG=<image_tag> run-conformance-tests
 ```
 
-### Step 6 - Uninstall Nginx Kubernetes Gateway
+### Step 6 - Cleanup the conformance test fixtures and uninstall Nginx Kubernetes Gateway
 ```bash
+$ make cleanup-conformance-tests
 $ make uninstall-nkg
 ```
 

From ab25b5ef90a2f2d8b194a2bc37de6e5e3539b798 Mon Sep 17 00:00:00 2001
From: Ciara Stacke <c.stacke@f5.com>
Date: Mon, 26 Jun 2023 23:39:13 +0100
Subject: [PATCH 3/4] Reconfigure make commands based on feedback

---
 conformance/Makefile                          | 44 +++++++-------
 conformance/README.md                         | 57 ++++++++++++-------
 conformance/tests/Dockerfile                  |  2 -
 ...rmance_spec.yaml => conformance_rbac.yaml} | 19 -------
 docs/developer/quickstart.md                  |  5 ++
 docs/developer/testing.md                     |  6 +-
 6 files changed, 70 insertions(+), 63 deletions(-)
 rename conformance/tests/{conformance_spec.yaml => conformance_rbac.yaml} (64%)

diff --git a/conformance/Makefile b/conformance/Makefile
index e1f9769a08..d40ed7bfeb 100644
--- a/conformance/Makefile
+++ b/conformance/Makefile
@@ -1,9 +1,13 @@
 NKG_TAG = edge
 NKG_PREFIX = nginx-kubernetes-gateway
+GATEWAY_CLASS = nginx
+SUPPORTED_FEATURES = HTTPRoute,HTTPRouteQueryParamMatching,HTTPRouteMethodMatching,HTTPRoutePortRedirect,HTTPRouteSchemeRedirect
+EXEMPT_FEATURES = ReferenceGrant
 KIND_KUBE_CONFIG_FOLDER = $${HOME}/.kube/kind
 TAG = latest
 PREFIX = conformance-test-runner
-NGINX_IMAGE=$(shell yq '.spec.template.spec.containers[1].image as $$nginx_ver | $$nginx_ver' ../deploy/manifests/deployment.yaml)
+NKG_DEPLOYMENT_MANIFEST=../deploy/manifests/deployment.yaml
+NGINX_IMAGE=$(shell yq '.spec.template.spec.containers[1].image as $$nginx_ver | $$nginx_ver' $(NKG_DEPLOYMENT_MANIFEST))
 .DEFAULT_GOAL := help
 
 .PHONY: help
@@ -19,23 +23,19 @@ create-kind-cluster: ## Create a kind cluster
 	kind create cluster --image kindest/node:v1.27.1
 	kind export kubeconfig --kubeconfig $(KIND_KUBE_CONFIG_FOLDER)/config
 
-.PHONY: prepare-nkg
-prepare-nkg: ## Build and load NKG and NGINX containers on configured kind cluster
-	cd .. && make PREFIX=$(NKG_PREFIX) TAG=$(NKG_TAG) container
-	kind load docker-image $(NKG_PREFIX):$(NKG_TAG)
+.PHONY: preload-nginx-container
+preload-nginx-container: ## Preload NGINX container on configured kind cluster
 	docker pull $(NGINX_IMAGE)
 	kind load docker-image $(NGINX_IMAGE)
-	yq -i 'with(.spec.template.spec.containers[0]; .image = "$(NKG_PREFIX):$(NKG_TAG)" | .imagePullPolicy = "Never")' ../deploy/manifests/deployment.yaml
 
-.PHONY: prepare-nkg-no-build
-prepare-nkg-no-build: ## Load NKG and NGINX containers on configured kind cluster
+.PHONY: build-and-load-images
+build-and-load-images: preload-nginx-container ## Build NKG container and load it and NGINX container on configured kind cluster
+	yq -i 'with(.spec.template.spec.containers[0]; .image = "$(NKG_PREFIX):$(NKG_TAG)" | .imagePullPolicy = "Never")' $(NKG_DEPLOYMENT_MANIFEST)
+	cd .. && make PREFIX=$(NKG_PREFIX) TAG=$(NKG_TAG) container
 	kind load docker-image $(NKG_PREFIX):$(NKG_TAG)
-	docker pull $(NGINX_IMAGE)
-	kind load docker-image $(NGINX_IMAGE)
-	yq -i 'with(.spec.template.spec.containers[0]; .image = "$(NKG_PREFIX):$(NKG_TAG)" | .imagePullPolicy = "Never")' ../deploy/manifests/deployment.yaml
 
-.PHONY: install-nkg
-install-nkg: ## Install NKG with provisioner on configured kind cluster
+.PHONY: prepare-nkg-dependencies
+prepare-nkg-dependencies: ## Install NKG dependencies on configured kind cluster
 	kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.7.1/standard-install.yaml
 	kubectl wait --for=condition=available --timeout=60s deployment gateway-api-admission-server -n gateway-system 
 	kubectl apply -f ../deploy/manifests/namespace.yaml
@@ -44,20 +44,26 @@ install-nkg: ## Install NKG with provisioner on configured kind cluster
 	kubectl apply -f ../deploy/manifests/rbac.yaml
 	kubectl apply -f ../deploy/manifests/gatewayclass.yaml
 	kubectl apply -f ../deploy/manifests/service/nodeport.yaml
+
+.PHONY: install-nkg-local-build
+install-nkg-local-build: build-and-load-images prepare-nkg-dependencies ## Install NKG from local build with provisioner on configured kind cluster
 	yq '(select(di != 3))' provisioner/provisioner.yaml | kubectl apply -f -
 	yq '(select(.spec.template.spec.containers[].image) | .spec.template.spec.containers[].image="$(NKG_PREFIX):$(NKG_TAG)" | .spec.template.spec.containers[].imagePullPolicy = "Never")' provisioner/provisioner.yaml | kubectl apply -f -
 
+.PHONY: install-nkg-edge
+install-nkg-edge: preload-nginx-container prepare-nkg-dependencies ## Install NKG with provisioner from edge on configured kind cluster
+	kubectl apply -f provisioner/provisioner.yaml
+
 .PHONY: run-conformance-tests
 run-conformance-tests: ## Run conformance tests
 	kind load docker-image $(PREFIX):$(TAG)
-	yq '(select(di != 3))' tests/conformance_spec.yaml | kubectl apply -f -
-	yq '(select(.spec.containers[].image) | .spec.containers[].image="$(PREFIX):$(TAG)")' tests/conformance_spec.yaml | kubectl apply -f -
-	kubectl wait --for=condition=ready pod conformance
-	kubectl logs conformance --follow
+	kubectl apply -f tests/conformance_rbac.yaml
+	kubectl run -i conformance --image=$(PREFIX):$(TAG) --image-pull-policy=Never --restart=Never --overrides='{ "spec": { "serviceAccountName": "conformance" }  }' -- go test -v . -tags conformance -args --gateway-class=$(GATEWAY_CLASS) --debug --supported-features=$(SUPPORTED_FEATURES) --exempt-features=$(EXEMPT_FEATURES)
 
 .PHONY: cleanup-conformance-tests
 cleanup-conformance-tests: ## Clean up conformance tests fixtures
-	kubectl delete -f tests/conformance_spec.yaml
+	kubectl delete pod conformance
+	kubectl delete -f tests/conformance_rbac.yaml
 
 .PHONY: uninstall-nkg
 uninstall-nkg: ## Uninstall NKG on configured kind cluster
@@ -69,7 +75,7 @@ uninstall-nkg: ## Uninstall NKG on configured kind cluster
 
 .PHONY: undo-image-update
 undo-image-update: ## Undo the NKG image name and tag in deployment manifest
-	git checkout -- ../deploy/manifests/deployment.yaml
+	git checkout -- $(NKG_DEPLOYMENT_MANIFEST)
 
 .PHONY: delete-kind-cluster
 delete-kind-cluster: ## Delete kind cluster
diff --git a/conformance/README.md b/conformance/README.md
index 7dc8533c51..370f112e46 100644
--- a/conformance/README.md
+++ b/conformance/README.md
@@ -5,7 +5,7 @@
 * [kind](https://kind.sigs.k8s.io/).
 * Docker.
 * Golang.
-* [yq](https://github.com/mikefarah/yq/#macos--linux-via-homebrew)
+* [yq](https://github.com/mikefarah/yq/#install)
 
 **Note**: all commands in steps below are executed from the ```conformance``` directory
 
@@ -14,63 +14,80 @@ List available commands:
 ```bash
 $ make
 
+build-and-load-images          Build NKG container and load it and NGINX container on configured kind cluster
 build-test-runner-image        Build conformance test runner image
 cleanup-conformance-tests      Clean up conformance tests fixtures
 create-kind-cluster            Create a kind cluster
 delete-kind-cluster            Delete kind cluster
 help                           Display this help
-install-nkg                    Install NKG with provisioner on configured kind cluster
-prepare-nkg-no-build           Load NKG and NGINX containers on configured kind cluster
-prepare-nkg                    Build and load NKG and NGINX containers on configured kind cluster
+install-nkg-edge               Install NKG with provisioner from edge on configured kind cluster
+install-nkg-local-build        Install NKG from local build with provisioner on configured kind cluster
+preload-nginx-container        Preload NGINX container on configured kind cluster
+prepare-nkg-dependencies       Install NKG dependencies on configured kind cluster
 run-conformance-tests          Run conformance tests
 undo-image-update              Undo the NKG image name and tag in deployment manifest
 uninstall-nkg                  Uninstall NKG on configured kind cluster
 ```
+
+**Note:** The following variables are configurable when running the below `make` commands:
+
+| Variable  | Default | Description |
+| ------------- | ------------- | ------------- |
+| TAG | latest  | The tag for the conformance test image |
+| PREFIX | conformance-test-runner | The prefix for the conformance test image |
+| NKG_TAG  | edge  | The tag for the locally built NKG image |
+| NKG_PREFIX | nginx-kubernetes-gateway  | The prefix for the locally built NKG image |
+| KIND_KUBE_CONFIG_FOLDER | ~/.kube/kind  | The location of the kubeconfig folder |
+| GATEWAY_CLASS | nginx | The gateway class that should be used for the tests |
+| SUPPORTED_FEATURES | HTTPRoute,HTTPRouteQueryParamMatching,HTTPRouteMethodMatching,HTTPRoutePortRedirect,HTTPRouteSchemeRedirect | The supported features that should be tested by the conformance tests |
+| EXEMPT_FEATURES | ReferenceGrant | The features that should not be tested by the conformance tests |
+| NGINX_IMAGE | as defined in the ../deploy/manifests/deployment.yaml file  | The NGINX image for the NKG deployments |
+| NKG_DEPLOYMENT_MANIFEST | ../deploy/manifests/deployment.yaml | The location of the NKG deployment manifest |
+
 ### Step 1 - Create a kind Cluster
 
 ```bash
 $ make create-kind-cluster
 ```
+### Step 2 - Install Nginx Kubernetes Gateway to configured kind cluster
 
-### Step 2 - Build Nginx Kubernetes Gateway container and load it and the NGINX container to configured kind cluster
+#### *Option 1* Build and install Nginx Kubernetes Gateway from local to configured kind cluster
 ```bash
-$ make NKG_PREFIX=<repo_name> NKG_TAG=<image_tag> prepare-nkg
-
+$ make install-nkg-local-build
 ```
-**Optional** Instead of the above command, you can skip the build NKG image step by running
 
-```bash
-$ make NKG_PREFIX=<repo_name> NKG_TAG=<image_tag> prepare-nkg-no-build
+#### *Option 2* Install Nginx Kubernetes Gateway from edge to configured kind cluster
+Instead of the above command, you can skip the build NKG image step and prepare the environment to instead
+use the `edge` image
 
-```
-### Step 3 - Build conformance test runner image
 ```bash
-$ make build-test-runner-image
+$ make install-nkg-edge
 ```
 
-### Step 4 - Install Nginx Kubernetes Gateway
+### Step 3 - Build conformance test runner image
 ```bash
-$ make NKG_PREFIX=<repo_name> NKG_TAG=<image_tag> install-nkg
+$ make build-test-runner-image
 ```
 
-### Step 5 - Run Gateway conformance tests
+### Step 4 - Run Gateway conformance tests
 ```bash
-$ make NKG_PREFIX=<repo_name> NKG_TAG=<image_tag> run-conformance-tests
+$ make run-conformance-tests
 ```
 
-### Step 6 - Cleanup the conformance test fixtures and uninstall Nginx Kubernetes Gateway
+### Step 5 - Cleanup the conformance test fixtures and uninstall Nginx Kubernetes Gateway
 ```bash
 $ make cleanup-conformance-tests
 $ make uninstall-nkg
 ```
 
-### Step 7 - Revert changes to the NKG deployment manifest
+### Step 6 - Revert changes to the NKG deployment manifest
+**Optional** Not required if using `edge` image
 **Warning**: `make undo-image-update` will hard reset changes to the deploy/manifests/deployment.yaml file!
 ```bash
 $ make undo-image-update
 ```
 
-### Step 8 - Delete kind cluster
+### Step 7 - Delete kind cluster
 ```bash
 $ make delete-kind-cluster
 ```
diff --git a/conformance/tests/Dockerfile b/conformance/tests/Dockerfile
index f485af9d57..672872bbdc 100644
--- a/conformance/tests/Dockerfile
+++ b/conformance/tests/Dockerfile
@@ -9,5 +9,3 @@ COPY --link go.sum /go/src/github.com/nginxinc/nginx-kubernetes-gateway/
 RUN go mod download
 
 COPY --link conformance/tests /go/src/github.com/nginxinc/nginx-kubernetes-gateway/conformance/tests/
-
-CMD go test -timeout 25m -v . -tags conformance -args --gateway-class=${GATEWAY_CLASS} --debug --supported-features=${SUPPORTED_FEATURES} --exempt-features=${EXEMPT_FEATURES}
diff --git a/conformance/tests/conformance_spec.yaml b/conformance/tests/conformance_rbac.yaml
similarity index 64%
rename from conformance/tests/conformance_spec.yaml
rename to conformance/tests/conformance_rbac.yaml
index cac9adcc4e..b6037bb09a 100644
--- a/conformance/tests/conformance_spec.yaml
+++ b/conformance/tests/conformance_rbac.yaml
@@ -61,22 +61,3 @@ roleRef:
   kind: ClusterRole
   name: conformance
   apiGroup: rbac.authorization.k8s.io
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: conformance
-spec:
-  containers:
-  - name: conformance
-    image: conformance-test-runner:latest
-    imagePullPolicy: Never
-    env:
-      - name: GATEWAY_CLASS
-        value: nginx
-      - name: SUPPORTED_FEATURES
-        value: HTTPRoute,HTTPRouteQueryParamMatching,HTTPRouteMethodMatching,HTTPRoutePortRedirect,HTTPRouteSchemeRedirect
-      - name: EXEMPT_FEATURES
-        value: ReferenceGrant
-  serviceAccountName: conformance
-  restartPolicy: Never
diff --git a/docs/developer/quickstart.md b/docs/developer/quickstart.md
index 080a68a898..a5a272328a 100644
--- a/docs/developer/quickstart.md
+++ b/docs/developer/quickstart.md
@@ -14,6 +14,7 @@ Follow these steps to set up your development environment.
     - [Kind](https://kind.sigs.k8s.io/docs/user/quick-start/)
     - [git](https://git-scm.com/)
     - [GNU Make](https://www.gnu.org/software/software.html)
+    - [yq](https://github.com/mikefarah/yq/#install)
     - [fieldalignment](https://pkg.go.dev/golang.org/x/tools/go/analysis/passes/fieldalignment):
 
       ```shell
@@ -92,6 +93,10 @@ make unit-test
 
 For more details on testing, see the [testing](/docs/developer/testing.md) documentation.
 
+## Gateway API Conformance Testing
+
+To run Gateway API conformance tests, please follow the instructions on [this](/conformance/README.md) page.
+
 ## Run the Linter
 
 To lint the code, run the following make command from the project's root directory:
diff --git a/docs/developer/testing.md b/docs/developer/testing.md
index 8fdbecc2d4..6cd0c0b61c 100644
--- a/docs/developer/testing.md
+++ b/docs/developer/testing.md
@@ -1,9 +1,9 @@
 # Testing
 
 This document provides guidelines for testing, including instructions on running the unit tests, accessing the code
-coverage report, and performing manual testing. By following these guidelines, you will gain a thorough understanding of
-the project's approach to unit testing, enabling you to ensure code quality, validate functionality, and maintain robust
-test coverage.
+coverage report, performing manual testing, and running the conformance tests. By following these guidelines, you will 
+gain a thorough understanding of the project's approach to unit testing, enabling you to ensure code quality, validate
+functionality, and maintain robust test coverage.
 
 ## Unit Test Guidelines
 

From dcf3c1ed065efdd5c37337845ca44fa16164f53b Mon Sep 17 00:00:00 2001
From: Ciara Stacke <c.stacke@f5.com>
Date: Tue, 27 Jun 2023 16:02:07 +0100
Subject: [PATCH 4/4] Change formatting and file name

---
 conformance/Makefile                                   | 10 +++++++---
 conformance/README.md                                  |  2 +-
 .../{conformance_rbac.yaml => conformance-rbac.yaml}   |  0
 3 files changed, 8 insertions(+), 4 deletions(-)
 rename conformance/tests/{conformance_rbac.yaml => conformance-rbac.yaml} (100%)

diff --git a/conformance/Makefile b/conformance/Makefile
index d40ed7bfeb..8a2963b5a3 100644
--- a/conformance/Makefile
+++ b/conformance/Makefile
@@ -57,13 +57,17 @@ install-nkg-edge: preload-nginx-container prepare-nkg-dependencies ## Install NK
 .PHONY: run-conformance-tests
 run-conformance-tests: ## Run conformance tests
 	kind load docker-image $(PREFIX):$(TAG)
-	kubectl apply -f tests/conformance_rbac.yaml
-	kubectl run -i conformance --image=$(PREFIX):$(TAG) --image-pull-policy=Never --restart=Never --overrides='{ "spec": { "serviceAccountName": "conformance" }  }' -- go test -v . -tags conformance -args --gateway-class=$(GATEWAY_CLASS) --debug --supported-features=$(SUPPORTED_FEATURES) --exempt-features=$(EXEMPT_FEATURES)
+	kubectl apply -f tests/conformance-rbac.yaml
+	kubectl run -i conformance \
+		--image=$(PREFIX):$(TAG) --image-pull-policy=Never \
+		--overrides='{ "spec": { "serviceAccountName": "conformance" }  }' \
+		--restart=Never -- go test -v . -tags conformance -args --gateway-class=$(GATEWAY_CLASS) --debug \
+						        --supported-features=$(SUPPORTED_FEATURES) --exempt-features=$(EXEMPT_FEATURES)
 
 .PHONY: cleanup-conformance-tests
 cleanup-conformance-tests: ## Clean up conformance tests fixtures
 	kubectl delete pod conformance
-	kubectl delete -f tests/conformance_rbac.yaml
+	kubectl delete -f tests/conformance-rbac.yaml
 
 .PHONY: uninstall-nkg
 uninstall-nkg: ## Uninstall NKG on configured kind cluster
diff --git a/conformance/README.md b/conformance/README.md
index 370f112e46..eecc911dc6 100644
--- a/conformance/README.md
+++ b/conformance/README.md
@@ -39,7 +39,7 @@ uninstall-nkg                  Uninstall NKG on configured kind cluster
 | NKG_PREFIX | nginx-kubernetes-gateway  | The prefix for the locally built NKG image |
 | KIND_KUBE_CONFIG_FOLDER | ~/.kube/kind  | The location of the kubeconfig folder |
 | GATEWAY_CLASS | nginx | The gateway class that should be used for the tests |
-| SUPPORTED_FEATURES | HTTPRoute,HTTPRouteQueryParamMatching,HTTPRouteMethodMatching,HTTPRoutePortRedirect,HTTPRouteSchemeRedirect | The supported features that should be tested by the conformance tests |
+| SUPPORTED_FEATURES | HTTPRoute,HTTPRouteQueryParamMatching, HTTPRouteMethodMatching,HTTPRoutePortRedirect, HTTPRouteSchemeRedirect | The supported features that should be tested by the conformance tests. Ensure the list is comma separated with no spaces. |
 | EXEMPT_FEATURES | ReferenceGrant | The features that should not be tested by the conformance tests |
 | NGINX_IMAGE | as defined in the ../deploy/manifests/deployment.yaml file  | The NGINX image for the NKG deployments |
 | NKG_DEPLOYMENT_MANIFEST | ../deploy/manifests/deployment.yaml | The location of the NKG deployment manifest |
diff --git a/conformance/tests/conformance_rbac.yaml b/conformance/tests/conformance-rbac.yaml
similarity index 100%
rename from conformance/tests/conformance_rbac.yaml
rename to conformance/tests/conformance-rbac.yaml