From bc7023325636959ce52025ef13c90fcfba356bac Mon Sep 17 00:00:00 2001 From: irbekrm Date: Tue, 22 Nov 2022 13:51:46 +0000 Subject: [PATCH] Tests download Gateway installation bundle Rather than whole gateway git repo Signed-off-by: irbekrm --- make/e2e-setup.mk | 4 ++-- make/tools.mk | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/make/e2e-setup.mk b/make/e2e-setup.mk index 3f1eeea16..df0c9feda 100644 --- a/make/e2e-setup.mk +++ b/make/e2e-setup.mk @@ -207,8 +207,8 @@ e2e-setup-bind: $(call image-tar,bind) load-$(call image-tar,bind) $(wildcard ma sed -e "s|{SERVICE_IP_PREFIX}|$(SERVICE_IP_PREFIX)|g" -e "s|{IMAGE}|$(IMAGE)|g" make/config/bind/*.yaml | $(KUBECTL) apply -n bind -f - >/dev/null .PHONY: e2e-setup-gatewayapi -e2e-setup-gatewayapi: $(BINDIR)/downloaded/gateway-api@$(GATEWAY_API_VERSION) $(BINDIR)/scratch/kind-exists $(NEEDS_KUBECTL) - $(KUBECTL) kustomize $/dev/null +e2e-setup-gatewayapi: $(BINDIR)/downloaded/gateway-api-$(GATEWAY_API_VERSION).yaml $(BINDIR)/scratch/kind-exists $(NEEDS_KUBECTL) + $(KUBECTL) apply -f $(BINDIR)/downloaded/gateway-api-$(GATEWAY_API_VERSION).yaml > /dev/null # v1 NGINX-Ingress by default only watches Ingresses with Ingress class diff --git a/make/tools.mk b/make/tools.mk index ba9cb0a81..d52033a5d 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -376,13 +376,9 @@ $(BINDIR)/downloaded/tools/kubebuilder_tools_$(KUBEBUILDER_ASSETS_VERSION)_$(HOS GATEWAY_API_SHA256SUM=c45f8806883014f7f75a2084c612fc62eb00d5c1915a906f8ca5ecda5450b163 -$(BINDIR)/downloaded/gateway-api@$(GATEWAY_API_VERSION): $(BINDIR)/downloaded/gateway-api@$(GATEWAY_API_VERSION).tar.gz | $(BINDIR)/downloaded - ./hack/util/checkhash.sh $< $(GATEWAY_API_SHA256SUM) - @mkdir -p $@ - tar xz -C $@ -f $< - -$(BINDIR)/downloaded/gateway-api@$(GATEWAY_API_VERSION).tar.gz: | $(BINDIR)/downloaded - $(CURL) https://github.com/kubernetes-sigs/gateway-api/archive/refs/tags/$(GATEWAY_API_VERSION).tar.gz -o $@ +$(BINDIR)/downloaded/gateway-api-$(GATEWAY_API_VERSION).yaml: | $(BINDIR)/downloaded + $(CURL) https://github.com/kubernetes-sigs/gateway-api/releases/download/$(GATEWAY_API_VERSION)/experimental-install.yaml -o $@ + ./hack/util/checkhash.sh $(BINDIR)/downloaded/gateway-api-$(GATEWAY_API_VERSION).yaml $(GATEWAY_API_SHA256SUM) ################# # Other Targets #