Fix gateway controller deploy target

`make deploy-gateway-controller` deploys both the gateway and policy
controller but was only updating the image for the gateway controller to
the locally built version. This chnage updates the make targets to
ensure that both the gateway and policy controller images are updated
when testing the combined gateway/policy controller installation (e2e
tests).

.gitignore

@@ -15,6 +15,8 @@ vendor/
 
 #Ignore local directory (for stuff to keep locally)
 local/
+!config/deploy/local
+!config/policy-controller/deploy/local
 
 #Ignore .kcp directory
 .kcp/

config/deploy/local/kustomization.yaml

@@ -1,25 +1,11 @@
 # Local deployment overlay.
 #
-# This requires the following .env files to exist in the project directory before
-# it can be used:
-# controller-config.env
-# aws-credentials.env
+# Set the deployment imagePullPolicy to Never. This is required if you are using a local image loaded into kind i.e. make kind-load-gateway-controller
+#
 
 resources:
   - ../../default
 
-generatorOptions:
-  disableNameSuffixHash: true
-
-configMapGenerator:
-  - name: controller-config
-    envs:
-      - ../../../controller-config.env
-
-secretGenerator:
-  - name: aws-credentials
-    envs:
-      - ../../../aws-credentials.env
-
 patchesStrategicMerge:
-- manager_config_patch.yaml
+- manager_config_patch.yaml
+- ../../policy-controller/deploy/local/manager_config_patch.yaml

config/deploy/local/manager_config_patch.yaml

@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
       - name: manager
-        imagePullPolicy: Never
+        imagePullPolicy: Never

config/manager/kustomization.yaml

@@ -4,4 +4,4 @@ resources:
 images:
 - name: controller
   newName: quay.io/kuadrant/multicluster-gateway-controller
-  newTag: main
+  newTag: main

config/policy-controller/deploy/local/kustomization.yaml

@@ -0,0 +1,10 @@
+# Local deployment overlay.
+#
+# Set the deployment imagePullPolicy to Never. This is required if you are using a local image loaded into kind i.e. make kind-load-policy-controller
+#
+
+resources:
+  - ../../default
+
+patchesStrategicMerge:
+- manager_config_patch.yaml

config/policy-controller/deploy/local/manager_config_patch.yaml

@@ -0,0 +1,11 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: policy-controller
+  namespace: system
+spec:
+  template:
+    spec:
+      containers:
+      - name: policy-controller
+        imagePullPolicy: Never

config/policy-controller/manager/kustomization.yaml

@@ -1,9 +1,7 @@
-
-
 resources:
 - manager.yaml
 
 images:
 - name: policy-controller
   newName: quay.io/kuadrant/policy-controller
-  newTag: main
+  newTag: main

hack/make/gateway_controller.make

@@ -27,9 +27,12 @@ kind-load-gateway-controller: docker-build-gateway-controller
 docker-push-gateway-controller: ## Push docker image with the controller.
 	docker push ${CONTROLLER_IMG}
 
-.PHONY: deploy-gateway-controller
-deploy-gateway-controller: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
+.PHONY: update-gateway-controller-image
+update-gateway-controller-image: kustomize ## Update gateway controller image to CONTROLLER_IMG.
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${CONTROLLER_IMG}
+
+.PHONY: deploy-gateway-controller
+deploy-gateway-controller: manifests kustomize update-gateway-controller-image update-policy-controller-image ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	$(KUSTOMIZE) --load-restrictor LoadRestrictionsNone build config/deploy/local | kubectl apply -f -
 	@if [ "$(METRICS)" = "true" ]; then\
 		$(KUSTOMIZE) build config/prometheus | kubectl apply -f -;\

hack/make/policy_controller.make

@@ -39,10 +39,13 @@ kind-load-policy-controller: docker-build-policy-controller
 docker-push-policy-controller: ## Push docker image with the controller.
 	docker push ${POLICY_CONTROLLER_IMG}
 
+.PHONY: update-policy-controller-image
+update-policy-controller-image: kustomize ## Update policy controller image to POLICY_CONTROLLER_IMG.
+	cd config/policy-controller/manager && $(KUSTOMIZE) edit set image policy-controller=${POLICY_CONTROLLER_IMG}
+
 .PHONY: deploy-policy-controller
-deploy-policy-controller: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
-	cd config/policy-controller/default && $(KUSTOMIZE) edit set image policy-controller=${POLICY_CONTROLLER_IMG}
-	$(KUSTOMIZE) --load-restrictor LoadRestrictionsNone build config/policy-controller/default | kubectl apply -f -
+deploy-policy-controller: kustomize manifests update-policy-controller-image ## Deploy policy controller to the K8s cluster specified in ~/.kube/config.
+	$(KUSTOMIZE) --load-restrictor LoadRestrictionsNone build config/policy-controller/deploy/local | kubectl apply -f -
 	@if [ "$(METRICS)" = "true" ]; then\
 		$(KUSTOMIZE) build config/prometheus | kubectl apply -f -;\
 	fi