From 03541a39c4c2031262123e6417e38e520739d70d Mon Sep 17 00:00:00 2001 From: Lukasz Dziedziak Date: Wed, 21 Feb 2024 11:11:30 -0500 Subject: [PATCH 1/4] chore(kind): remove unused variable and rename file Signed-off-by: Lukasz Dziedziak --- mk/kind.mk | 6 ------ test/kind/{cluster-ipv6.yaml => cluster-ipv6-kuma.yaml} | 0 test/kind/{cluster.yaml => cluster-kuma.yaml} | 0 3 files changed, 6 deletions(-) rename test/kind/{cluster-ipv6.yaml => cluster-ipv6-kuma.yaml} (100%) rename test/kind/{cluster.yaml => cluster-kuma.yaml} (100%) diff --git a/mk/kind.mk b/mk/kind.mk index d8d1fd200121..ba785980ec10 100644 --- a/mk/kind.mk +++ b/mk/kind.mk @@ -10,12 +10,6 @@ KIND_KUBECONFIG := $(KIND_KUBECONFIG_DIR)/kind-$(KIND_CLUSTER_NAME)-config # Ensure Kubernetes tooling only gets the config we explicitly specify. unexport KUBECONFIG -ifdef IPV6 -KIND_CONFIG ?= $(KUMA_DIR)/test/kind/cluster-ipv6.yaml -else -KIND_CONFIG ?= $(KUMA_DIR)/test/kind/cluster.yaml -endif - ifeq ($(KUMACTL_INSTALL_USE_LOCAL_IMAGES),true) KUMACTL_INSTALL_CONTROL_PLANE_IMAGES := --control-plane-registry=$(DOCKER_REGISTRY) --dataplane-registry=$(DOCKER_REGISTRY) --dataplane-init-registry=$(DOCKER_REGISTRY) else diff --git a/test/kind/cluster-ipv6.yaml b/test/kind/cluster-ipv6-kuma.yaml similarity index 100% rename from test/kind/cluster-ipv6.yaml rename to test/kind/cluster-ipv6-kuma.yaml diff --git a/test/kind/cluster.yaml b/test/kind/cluster-kuma.yaml similarity index 100% rename from test/kind/cluster.yaml rename to test/kind/cluster-kuma.yaml From c4b64675602ef09bac68a2b0efa951cd7b72d351 Mon Sep 17 00:00:00 2001 From: Lukasz Dziedziak Date: Wed, 21 Feb 2024 11:18:27 -0500 Subject: [PATCH 2/4] fix name in mk Signed-off-by: Lukasz Dziedziak --- mk/kind.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mk/kind.mk b/mk/kind.mk index ba785980ec10..619d5d6e6a2c 100644 --- a/mk/kind.mk +++ b/mk/kind.mk @@ -10,6 +10,12 @@ KIND_KUBECONFIG := $(KIND_KUBECONFIG_DIR)/kind-$(KIND_CLUSTER_NAME)-config # Ensure Kubernetes tooling only gets the config we explicitly specify. unexport KUBECONFIG +ifdef IPV6 +KIND_CONFIG ?= $(KUMA_DIR)/test/kind/cluster-ipv6-kuma.yaml +else +KIND_CONFIG ?= $(KUMA_DIR)/test/kind/cluster-kuma.yaml +endif + ifeq ($(KUMACTL_INSTALL_USE_LOCAL_IMAGES),true) KUMACTL_INSTALL_CONTROL_PLANE_IMAGES := --control-plane-registry=$(DOCKER_REGISTRY) --dataplane-registry=$(DOCKER_REGISTRY) --dataplane-init-registry=$(DOCKER_REGISTRY) else From f365c0de44775a1c575407b461a56c677beac988 Mon Sep 17 00:00:00 2001 From: Lukasz Dziedziak Date: Wed, 21 Feb 2024 11:32:15 -0500 Subject: [PATCH 3/4] remove env Signed-off-by: Lukasz Dziedziak --- mk/kind.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/mk/kind.mk b/mk/kind.mk index 619d5d6e6a2c..ba785980ec10 100644 --- a/mk/kind.mk +++ b/mk/kind.mk @@ -10,12 +10,6 @@ KIND_KUBECONFIG := $(KIND_KUBECONFIG_DIR)/kind-$(KIND_CLUSTER_NAME)-config # Ensure Kubernetes tooling only gets the config we explicitly specify. unexport KUBECONFIG -ifdef IPV6 -KIND_CONFIG ?= $(KUMA_DIR)/test/kind/cluster-ipv6-kuma.yaml -else -KIND_CONFIG ?= $(KUMA_DIR)/test/kind/cluster-kuma.yaml -endif - ifeq ($(KUMACTL_INSTALL_USE_LOCAL_IMAGES),true) KUMACTL_INSTALL_CONTROL_PLANE_IMAGES := --control-plane-registry=$(DOCKER_REGISTRY) --dataplane-registry=$(DOCKER_REGISTRY) --dataplane-init-registry=$(DOCKER_REGISTRY) else From 8d719badb6c4dee9b8139d60941031df24572777 Mon Sep 17 00:00:00 2001 From: Lukasz Dziedziak Date: Wed, 21 Feb 2024 14:25:39 -0500 Subject: [PATCH 4/4] trigger job Signed-off-by: Lukasz Dziedziak