Merge branch 'main' into add-cors-policy

Signed-off-by: Yossi Mesika <[email protected]>

Author: ymesika

.github/pull_request_template.md

@@ -29,7 +29,9 @@ linters:
     forbidigo:
       forbid:
         - pattern: anypb.New
-          msg: Do not use anypb.New; Use utils.MessageToAny instead.
+          msg: use utils.MessageToAny instead
+        - pattern: kclient.New$
+          msg: use kclient.NewFiltered with discovery namespace ObjectFilter instead
     importas:
       alias:
         - pkg: k8s.io/api/apps/v1

.golangci.yaml

@@ -526,7 +526,7 @@ HELM_CHART_DIR=install/helm/kgateway
 HELM_CHART_DIR_CRD=install/helm/kgateway-crds
 
 .PHONY: package-kgateway-charts
-package-kgateway-charts: package-kgateway-chart package-kgateway-crd-chart
+package-kgateway-charts: package-kgateway-chart package-kgateway-crd-chart ## Package the kgateway charts
 
 .PHONY: package-kgateway-chart
 package-kgateway-chart: ## Package the kgateway charts
@@ -540,6 +540,14 @@ package-kgateway-crd-chart: ## Package the kgateway crd chart
 	$(HELM) package $(HELM_PACKAGE_ARGS) --destination $(TEST_ASSET_DIR) $(HELM_CHART_DIR_CRD); \
 	$(HELM) repo index $(TEST_ASSET_DIR);
 
+.PHONY: deploy-kgateway-crd-chart
+deploy-kgateway-crd-chart: ## Deploy the kgateway crd chart
+	$(HELM) upgrade --install kgateway-crds $(TEST_ASSET_DIR)/kgateway-crds-$(VERSION).tgz --namespace kgateway-system --create-namespace
+
+.PHONY: deploy-kgateway-chart
+deploy-kgateway-chart: ## Deploy the kgateway chart
+	$(HELM) upgrade --install kgateway $(TEST_ASSET_DIR)/kgateway-$(VERSION).tgz --namespace kgateway-system --create-namespace
+
 .PHONY: lint-kgateway-charts
 lint-kgateway-charts: ## Lint the kgateway charts
 	$(HELM) lint $(HELM_CHART_DIR)
@@ -647,15 +655,32 @@ docker-retag: docker-distroless-retag
 endif # distroless images
 
 #----------------------------------------------------------------------------------
-# Build assets for kubernetes e2e tests
+# Development
 #----------------------------------------------------------------------------------
 
+KIND ?= go tool kind
 CLUSTER_NAME ?= kind
 INSTALL_NAMESPACE ?= kgateway-system
 
-KIND ?= go tool kind
+.PHONY: kind-create
+kind-create: ## Create a KinD cluster
+	$(KIND) get clusters | grep $(CLUSTER_NAME) || $(KIND) create cluster --name $(CLUSTER_NAME)
+
+.PHONY: kind-metallb
+metallb: ## Install the MetalLB load balancer
+	./hack/kind/setup-metalllb-on-kind.sh
+
+.PHONY: deploy-kgateway
+deploy-kgateway: package-kgateway-charts deploy-kgateway-crd-chart deploy-kgateway-chart ## Deploy the kgateway chart and CRDs
+
+.PHONY: run
+run: kind-create kind-build-and-load-standard metallb deploy-kgateway  ## Set up complete development environment
+
+#----------------------------------------------------------------------------------
+# Build assets for kubernetes e2e tests
+#----------------------------------------------------------------------------------
 
-kind-setup:
+kind-setup: ## Set up the KinD cluster. Deprecated: use kind-create instead.
 	VERSION=${VERSION} CLUSTER_NAME=${CLUSTER_NAME} ./hack/kind/setup-kind.sh
 
 kind-load-%-distroless:

Makefile

@@ -82,7 +82,7 @@ type RateLimitProvider struct {
 	// Timeout for requests to the rate limit service.
 	// +optional
 	// +kubebuilder:default="20ms"
-	Timeout string `json:"timeout,omitempty"`
+	Timeout gwv1.Duration `json:"timeout,omitempty"`
 }
 
 // GatewayExtensionSpec defines the desired state of GatewayExtension.