Fix run-policy-controller make target

Updates to e2e GH action
Kuadrant · Nov 1, 2023 · 9922fde · 9922fde
1 parent 4dcf027
commit 9922fde
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/ci-e2e.yaml b/.github/workflows/ci-e2e.yaml
@@ -66,20 +66,20 @@ jobs:
         run: |
           export OCM_SINGLE=1
           make local-setup
-      - name: Deploy MGC
+      - name: Deploy Gateway Controller
         run: |
           make docker-build-gateway-controller kind-load-gateway-controller deploy-gateway-controller
           kubectl --context kind-mgc-control-plane -n multicluster-gateway-controller-system wait --timeout=300s --for=condition=Available deployment/mgc-controller-manager
           kubectl --context kind-mgc-control-plane logs --all-containers --ignore-errors deployment/mgc-controller-manager -n multicluster-gateway-controller-system
-          kubectl get managedzones -n multi-cluster-gateways mgc-dev-mz-aws -o yaml
-          kubectl --context kind-mgc-control-plane -n multi-cluster-gateways wait --timeout=60s --for=condition=Ready managedzone/mgc-dev-mz-aws
-          kubectl get managedzones -n multi-cluster-gateways mgc-dev-mz-gcp -o yaml
-          kubectl --context kind-mgc-control-plane -n multi-cluster-gateways wait --timeout=60s --for=condition=Ready managedzone/mgc-dev-mz-gcp
       - name: Deploy Policy Controller
         run: |
           make docker-build-policy-controller kind-load-policy-controller deploy-policy-controller
           kubectl --context kind-mgc-control-plane -n multicluster-gateway-controller-system wait --timeout=300s --for=condition=Available deployment/mgc-policy-controller-manager
           kubectl --context kind-mgc-control-plane logs --all-containers --ignore-errors deployment/mgc-policy-controller-manager -n multicluster-gateway-controller-system
+          kubectl get managedzones -n multi-cluster-gateways mgc-dev-mz-aws -o yaml
+          kubectl --context kind-mgc-control-plane -n multi-cluster-gateways wait --timeout=60s --for=condition=Ready managedzone/mgc-dev-mz-aws
+          kubectl get managedzones -n multi-cluster-gateways mgc-dev-mz-gcp -o yaml
+          kubectl --context kind-mgc-control-plane -n multi-cluster-gateways wait --timeout=60s --for=condition=Ready managedzone/mgc-dev-mz-gcp
       - name: Run suite AWS
         run: |
           export OCM_SINGLE=1
@@ -98,3 +98,4 @@ jobs:
         if: ${{ failure() }}
         run: |
           kubectl --context kind-mgc-control-plane logs --all-containers --ignore-errors deployment/mgc-controller-manager -n multicluster-gateway-controller-system
+          kubectl --context kind-mgc-control-plane logs --all-containers --ignore-errors deployment/mgc-policy-controller-manager -n multicluster-gateway-controller-system
diff --git a/hack/make/gateway_controller.make b/hack/make/gateway_controller.make
@@ -8,7 +8,7 @@ build-gateway-controller: manifests generate fmt vet ## Build controller binary.
 	go build -o bin/controller ./cmd/gateway_controller/main.go
 
 .PHONY: run-gateway-controller
-run-gateway-controller: manifests generate fmt vet  install
+run-gateway-controller: manifests generate fmt vet install
 	go run ./cmd/gateway_controller/main.go \
 	    --metrics-bind-address=:8080 \
 	    --health-probe-bind-address=:8081 \

diff --git a/hack/make/policy_controller.make b/hack/make/policy_controller.make
@@ -9,7 +9,7 @@ build-policy-controller: manifests generate fmt vet ## Build controller binary.
 
 .PHONY: run-policy-controller
 run-policy-controller: manifests generate fmt vet  install
-	go run ./cmd/gateway_controller/main.go \
+	go run ./cmd/policy_controller/main.go \
 	    --metrics-bind-address=:8090 \
 	    --health-probe-bind-address=:8091 \
 	    --zap-log-level=$(LOG_LEVEL)