From 54b05a5d84e9edf00352db1a1bf42176f52bdf26 Mon Sep 17 00:00:00 2001 From: Adam Cattermole Date: Mon, 11 Dec 2023 14:34:07 +0000 Subject: [PATCH] Install metallb for istioctl installs --- Makefile | 2 ++ make/istio.mk | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c97477d33..188e4a7e2 100644 --- a/Makefile +++ b/Makefile @@ -305,6 +305,7 @@ local-cluster-setup: ## Sets up Kind cluster with GatewayAPI manifests and istio $(MAKE) kind-create-cluster $(MAKE) namespace $(MAKE) gateway-api-install + $(MAKE) install-metallb $(MAKE) istio-install $(MAKE) install-cert-manager $(MAKE) deploy-gateway @@ -320,6 +321,7 @@ local-env-setup: ## Deploys all services and manifests required by kuadrant to r test-env-setup: ## Deploys all services and manifests required by kuadrant to run on CI. $(MAKE) namespace $(MAKE) gateway-api-install + $(MAKE) install-metallb $(MAKE) istio-install $(MAKE) install-cert-manager $(MAKE) deploy-gateway diff --git a/make/istio.mk b/make/istio.mk index 183276260..42c239f9c 100644 --- a/make/istio.mk +++ b/make/istio.mk @@ -41,7 +41,6 @@ istioctl-verify-install: istioctl ## Verify istio installation. .PHONY: sail-install sail-install: kustomize - $(MAKE) install-metallb $(KUSTOMIZE) build $(ISTIO_INSTALL_DIR)/sail | kubectl apply -f - kubectl -n istio-system wait --for=condition=Available deployment istio-operator --timeout=300s kubectl apply -f $(ISTIO_INSTALL_DIR)/sail/istio.yaml @@ -50,7 +49,6 @@ sail-install: kustomize sail-uninstall: kustomize kubectl delete -f $(ISTIO_INSTALL_DIR)/sail/istio.yaml $(KUSTOMIZE) build $(ISTIO_INSTALL_DIR)/sail | kubectl delete -f - - $(MAKE) uninstall-metallb .PHONY: istio-install istio-install: