update based on review

nginxinc · Mar 8, 2024 · 1df31d0 · 1df31d0
1 parent 879976f
commit 1df31d0
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 29 deletions.
diff --git a/.github/workflows/functional.yml b/.github/workflows/functional.yml
@@ -141,20 +141,17 @@ jobs:
           make create-kind-cluster KIND_KUBE_CONFIG=${kube_config}
           echo "KUBECONFIG=${kube_config}" >> "$GITHUB_ENV"
 
-
       - name: Setup functional tests
         id: setup
         run: |
           ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric
           ngf_tag=${{ steps.ngf-meta.outputs.version }}
-          if [ ${{ startsWith(matrix.k8s-version, '1.23') ||  startsWith(matrix.k8s-version, '1.24') }} == "true" ]; then export INSTALL_WEBHOOK=true; fi
           make load-images${{ matrix.nginx-image == 'nginx-plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag}
         working-directory: ./tests
 
       - name: Run functional tests
         run: |
           ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric
           ngf_tag=${{ steps.ngf-meta.outputs.version }}
-          if [ ${{ startsWith(matrix.k8s-version, '1.23') ||  startsWith(matrix.k8s-version, '1.24') }} == "true" ]; then export INSTALL_WEBHOOK=true; fi
           make functional-test${{ matrix.nginx-image == 'nginx-plus' && '-nginx-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag}
         working-directory: ./tests
diff --git a/conformance/README.md b/conformance/README.md
@@ -16,30 +16,27 @@ make
 ```
 
 ```text
-build-images-with-plus               Build NGF and NGINX Plus images
-build-images                         Build NGF and NGINX images
-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
-deploy-updated-provisioner           Update provisioner manifest and deploy to the configured kind cluster
-help                                 Display this help
-install-ngf-edge                     Install NGF with provisioner from edge on configured kind cluster
-install-ngf-local-build-with-plus    Install NGF with Plus from local build with provisioner on configured kind cluster
-install-ngf-local-build              Install NGF from local build with provisioner on configured kind cluster
-install-ngf-local-no-build-with-plus Install NGF with Plus from local build with provisioner on configured kind cluster but do not build the NGF image
-install-ngf-local-no-build           Install NGF from local build with provisioner on configured kind cluster but do not build the NGF image
-load-images-with-plus                Load NGF and NGINX Plus images on configured kind cluster
-load-images                          Load NGF and NGINX images on configured kind cluster
-prepare-ngf-dependencies-with-plus   Install NGF dependencies with Plus on configured kind cluster
-prepare-ngf-dependencies             Install NGF dependencies on configured kind cluster
-reset-go-modules                     Reset the go modules changes
-run-conformance-tests                Run conformance tests
-undo-manifests-update                Undo the changes in the manifest files
-uninstall-ngf                        Uninstall NGF on configured kind cluster and undo manifest changes
-update-go-modules                    Update the gateway-api go modules to latest main version
-update-ngf-manifest-with-plus        Update the NGF deployment manifest image names and imagePullPolicies including nginx-plus
-update-ngf-manifest                  Update the NGF deployment manifest image names and imagePullPolicies
+    add-local-ip-to-cluster        Add local IP to the GKE cluster master-authorized-networks
+    cleanup-gcp                    Cleanup all GCP resources
+    cleanup-router                 Delete the GKE router
+    cleanup-vm                     Delete the test GCP VM and delete the firewall rule
+    create-and-setup-vm            Create and setup a GCP VM for tests
+    create-gke-cluster             Create a GKE cluster
+    create-gke-router              Create a GKE router to allow egress traffic from private nodes (allows for external image pulls)
+    create-kind-cluster            Create a kind cluster
+    delete-gke-cluster             Delete the GKE cluster
+    delete-kind-cluster            Delete kind cluster
+    functional-test-nginx-plus     Run the functional tests with NGINX Plus against your default k8s cluster
+    functional-test                Run the functional tests with NGINX against your default k8s cluster
+    help                           Display this help
+    load-images-with-plus          Load NGF and NGINX Plus images on configured kind cluster
+    load-images                    Load NGF and NGINX images on configured kind cluster
+    run-tests-on-vm                Run the tests on a GCP VM
+    setup-gcp-and-run-tests        Create and setup a GKE router and GCP VM for tests and run the tests
+    test                           Run the system tests against your default k8s cluster
+    update-go-modules              Update the gateway-api go modules to latest main version
+    update-ngf-manifest-with-plus  Update the NGF deployment manifest image names and imagePullPolicies including nginx-plus
+    update-ngf-manifest            Update the NGF deployment manifest image names and imagePullPolicies
 ```
 
 **Note:** The following variables are configurable when running the below `make` commands:

diff --git a/tests/Makefile b/tests/Makefile
@@ -42,11 +42,11 @@ load-images-with-plus: ## Load NGF and NGINX Plus images on configured kind clus
 
 .PHONY: update-ngf-manifest
 update-ngf-manifest: ## Update the NGF deployment manifest image names and imagePullPolicies
-	cd .. && make generate-manifests HELM_TEMPLATE_EXTRA_ARGS_FOR_ALL_MANIFESTS_FILE="--set nginxGateway.kind=skip" HELM_TEMPLATE_COMMON_ARGS="--set nginxGateway.image.repository=$(PREFIX) --set nginxGateway.image.tag=$(TAG) --set nginxGateway.image.pullPolicy=Never --set nginx.image.repository=$(NGINX_PREFIX) --set nginx.image.tag=$(TAG) --set nginx.image.pullPolicy=Never --set nginxGateway.gwAPIExperimentalFeatures.enable=$(ENABLE_EXPERIMENTAL)" && cd -
+	cd .. && make generate-manifests HELM_TEMPLATE_COMMON_ARGS="--set nginxGateway.image.repository=$(PREFIX) --set nginxGateway.image.tag=$(TAG) --set nginxGateway.image.pullPolicy=Never --set nginx.image.repository=$(NGINX_PREFIX) --set nginx.image.tag=$(TAG) --set nginx.image.pullPolicy=Never --set nginxGateway.gwAPIExperimentalFeatures.enable=$(ENABLE_EXPERIMENTAL)" && cd -
 
 .PHONY: update-ngf-manifest-with-plus
 update-ngf-manifest-with-plus: ## Update the NGF deployment manifest image names and imagePullPolicies including nginx-plus
-	cd .. && make generate-manifests HELM_TEMPLATE_EXTRA_ARGS_FOR_ALL_MANIFESTS_FILE="--set nginxGateway.kind=skip" HELM_TEMPLATE_COMMON_ARGS="--set nginxGateway.image.repository=$(PREFIX) --set nginxGateway.image.tag=$(TAG) --set nginxGateway.image.pullPolicy=Never --set nginx.image.repository=$(NGINX_PLUS_PREFIX) --set nginx.image.tag=$(TAG) --set nginx.image.pullPolicy=Never --set nginx.plus=true" && cd -
+	cd .. && make generate-manifests HELM_TEMPLATE_COMMON_ARGS="--set nginxGateway.image.repository=$(PREFIX) --set nginxGateway.image.tag=$(TAG) --set nginxGateway.image.pullPolicy=Never --set nginx.image.repository=$(NGINX_PLUS_PREFIX) --set nginx.image.tag=$(TAG) --set nginx.image.pullPolicy=Never --set nginx.plus=true" && cd -
 
 test: ## Run the system tests against your default k8s cluster
 	go test -v ./suite $(GINKGO_FLAGS) -args --gateway-api-version=$(GW_API_VERSION) \