From 593d7f459be521dfb9661807cc827ed2404f414b Mon Sep 17 00:00:00 2001 From: Alex Leong Date: Mon, 5 May 2025 21:53:16 +0000 Subject: [PATCH 1/2] Append inbound skip ports instead of replacing Signed-off-by: Alex Leong --- cni-plugin/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cni-plugin/main.go b/cni-plugin/main.go index 599f933f..1032a17d 100644 --- a/cni-plugin/main.go +++ b/cni-plugin/main.go @@ -247,7 +247,7 @@ func cmdAdd(args *skel.CmdArgs) error { if inboundSkipOverride != "" { logEntry.Debugf("linkerd-cni: overriding InboundPortsToIgnore to %s", inboundSkipOverride) - options.InboundPortsToIgnore = strings.Split(inboundSkipOverride, ",") + options.InboundPortsToIgnore = append(options.InboundPortsToIgnore, strings.Split(inboundSkipOverride, ",")...) } // Check if there are any subnets to skip From 02cc3ab47d3ad9adbd82e8cdf4421d8dde44d089 Mon Sep 17 00:00:00 2001 From: Alex Leong Date: Mon, 5 May 2025 23:39:24 +0000 Subject: [PATCH 2/2] install gateway api during integration tests Signed-off-by: Alex Leong --- cni-repair-controller/integration/run.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cni-repair-controller/integration/run.sh b/cni-repair-controller/integration/run.sh index ba6fc294..e01dd9b2 100755 --- a/cni-repair-controller/integration/run.sh +++ b/cni-repair-controller/integration/run.sh @@ -25,6 +25,9 @@ kubectl apply -f https://k3d.io/v5.1.0/usage/advanced/calico.yaml kubectl --namespace=kube-system wait --for=condition=available --timeout=120s \ deploy/calico-kube-controllers +# Install gateway API +kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.2.1/experimental-install.yaml + step 'Installing latest linkerd edge' scurl https://run.linkerd.io/install-edge | sh export PATH=$PATH:$HOME/.linkerd2/bin