Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ test: ## Run all tests with ginkgo, or only run the test package at {TEST_PKG} i
# will still have e2e tests run by Github Actions once they publish a pull
# request.
.PHONY: e2e-test
e2e-test: dummy-idp-docker dummy-auth0-docker kind-load-dummy-idp kind-load-dummy-auth0
e2e-test: go-test
e2e-test: TEST_TAG = e2e
e2e-test: GO_TEST_ARGS = $(E2E_GO_TEST_ARGS)
Expand Down Expand Up @@ -449,6 +448,7 @@ $(CONTROLLER_OUTPUT_DIR)/.docker-stamp-agentgateway-$(VERSION)-$(GOARCH): $(CONT

.PHONY: kgateway-docker
kgateway-docker: $(CONTROLLER_OUTPUT_DIR)/.docker-stamp-$(VERSION)-$(GOARCH)

.PHONY: kgateway-agentgateway-docker
kgateway-agentgateway-docker: $(CONTROLLER_OUTPUT_DIR)/.docker-stamp-agentgateway-$(VERSION)-$(GOARCH)

Expand Down Expand Up @@ -699,7 +699,7 @@ deploy-kgateway: package-kgateway-charts deploy-kgateway-crd-chart deploy-kgatew
setup-base: kind-create gw-api-crds gie-crds metallb ## Setup the base infrastructure (kind cluster, CRDs, and MetalLB)

.PHONY: setup
setup: setup-base kind-build-and-load package-kgateway-charts dummy-auth0-docker kind-load-dummy-auth0 ## Setup the complete infrastructure (base setup plus images and charts)
setup: setup-base kind-build-and-load package-kgateway-charts ## Setup the complete infrastructure (base setup plus images and charts)

.PHONY: run
run: setup deploy-kgateway ## Set up complete development environment
Expand Down Expand Up @@ -755,11 +755,15 @@ kind-reload-%: kind-build-and-load-% kind-set-image-% ; ## Use to build specifie
kind-build-and-load: kind-build-and-load-kgateway
kind-build-and-load: kind-build-and-load-envoy-wrapper
kind-build-and-load: kind-build-and-load-sds
kind-build-and-load: kind-build-and-load-dummy-idp
kind-build-and-load: kind-build-and-load-dummy-auth0

.PHONY: kind-load ## Use to load all images into kind
kind-load: kind-load-kgateway
kind-load: kind-load-envoy-wrapper
kind-load: kind-load-sds
kind-load: kind-load-dummy-idp
kind-load: kind-load-dummy-auth0

#----------------------------------------------------------------------------------
# Load Testing
Expand Down
7 changes: 3 additions & 4 deletions hack/kind/setup-kind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ CONFORMANCE="${CONFORMANCE:-false}"
CONFORMANCE_VERSION="${CONFORMANCE_VERSION:-$(go list -m sigs.k8s.io/gateway-api | awk '{print $2}')}"
# The channel of the k8s gateway api conformance tests to run. Requires CONFORMANCE=true
CONFORMANCE_CHANNEL="${CONFORMANCE_CHANNEL:-"experimental"}"
# The version of the k8s gateway api inference extension CRDs to install. Requires CONFORMANCE=true
# Managed by `make bump-gie`.
# The version of the k8s gateway api inference extension CRDs to install. Managed by `make bump-gie`.
GIE_CRD_VERSION="v1.1.0"
# The kind CLI to use. Defaults to the latest version from the kind repo.
KIND="${KIND:-go tool kind}"
Expand Down Expand Up @@ -63,7 +62,7 @@ function create_and_setup() {
kubectl apply --server-side -f "https://github.com/kubernetes-sigs/gateway-api/releases/download/$CONFORMANCE_VERSION/$CONFORMANCE_CHANNEL-install.yaml"

# 6. Apply the Kubernetes Gateway API Inference Extension CRDs
kubectl apply --kustomize "https://github.com/kubernetes-sigs/gateway-api-inference-extension/config/crd?ref=$GIE_CRD_VERSION"
make gie-crds

. $SCRIPT_DIR/setup-metalllb-on-kind.sh
}
Expand All @@ -81,7 +80,7 @@ else
# 2. Make all the docker images and load them to the kind cluster
if [[ $AGENTGATEWAY == 'true' ]]; then
# Skip expensive envoy build
VERSION=$VERSION CLUSTER_NAME=$CLUSTER_NAME make kind-build-and-load-kgateway-agentgateway
VERSION=$VERSION CLUSTER_NAME=$CLUSTER_NAME make kind-build-and-load-kgateway-agentgateway kind-build-and-load-dummy-idp kind-build-and-load-dummy-auth0
else
VERSION=$VERSION CLUSTER_NAME=$CLUSTER_NAME make kind-build-and-load
fi
Expand Down