From 32cc172de90578be45d483ea71b727370eb625e7 Mon Sep 17 00:00:00 2001 From: Alex Leong Date: Tue, 28 Apr 2026 00:06:45 +0000 Subject: [PATCH 1/2] fix(CLI): correct gateway api version in user instructions Signed-off-by: Alex Leong --- cli/cmd/install.go | 2 +- justfile | 40 +++++++++++++++++++++++++++++++--------- testutil/test_helper.go | 2 +- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/cli/cmd/install.go b/cli/cmd/install.go index bf90f78f60ba5..cc18a9bb4c302 100644 --- a/cli/cmd/install.go +++ b/cli/cmd/install.go @@ -421,7 +421,7 @@ func validateFinalValues(installed GatewayAPICRDs, finalValues map[string]interf // if we are not installing GW API Resources and they are not present, error return errors.New(`The Gateway API CRDs must be installed prior to installing Linkerd. Run: -kubectl apply --server-side -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.4.0/standard-install.yaml +kubectl apply --server-side -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.2.1/standard-install.yaml or see https://gateway-api.sigs.k8s.io/guides/#installing-gateway-api for more options.`) } diff --git a/justfile b/justfile index c93f99d5b2b89..170a45d0eee37 100644 --- a/justfile +++ b/justfile @@ -2,7 +2,7 @@ lint: action-lint action-dev-check md-lint sh-lint rs-fetch rs-clippy rs-check-fmt go-lint -export GWAPI_VERSION := "v1.2.0" +export GWAPI_VERSION := "v1.2.1" ## ## Go @@ -472,7 +472,8 @@ _linkerd-viz-uninit: ## linkerd multicluster ## -_mc-target-k3d-flags := "--k3s-arg --disable='local-storage,metrics-server@server:*' --k3s-arg '--cluster-cidr=10.23.0.0/24@server:*'" +_mc-east-k3d-flags := "--k3s-arg --disable='local-storage,metrics-server@server:*' --k3s-arg '--cluster-cidr=10.23.0.0/24@server:*'" +_mc-north-k3d-flags := "--k3s-arg --disable='local-storage,metrics-server@server:*' --k3s-arg '--cluster-cidr=10.24.0.0/24@server:*'" linkerd-mc-install: _linkerd-init {{ _linkerd }} mc install --set='linkerdVersion={{ linkerd-tag }}' \ @@ -494,14 +495,29 @@ mc-target-k3d-delete: mc-load: _k3d-init linkerd-load -mc-target-load: +mc-east-load: @{{ just_executable() }} \ - k3d-name='{{ k3d-name }}-target' \ + k3d-name='{{ k3d-name }}-east' \ k3d-k8s='{{ k3d-k8s }}' \ k3d-agents='{{ k3d-agents }}' \ k3d-servers='{{ k3d-servers }}' \ k3d-network='{{ k3d-network }}' \ - _k3d-flags='{{ _mc-target-k3d-flags }}' \ + _k3d-flags='{{ _mc-east-k3d-flags }}' \ + controller-image='{{ controller-image }}' \ + proxy-image='{{ proxy-image }}' \ + linkerd-exec='{{ linkerd-exec }}' \ + linkerd-tag='{{ linkerd-tag }}' \ + _pause-load \ + mc-load + +mc-north-load: + @{{ just_executable() }} \ + k3d-name='{{ k3d-name }}-north' \ + k3d-k8s='{{ k3d-k8s }}' \ + k3d-agents='{{ k3d-agents }}' \ + k3d-servers='{{ k3d-servers }}' \ + k3d-network='{{ k3d-network }}' \ + _k3d-flags='{{ _mc-north-k3d-flags }}' \ controller-image='{{ controller-image }}' \ proxy-image='{{ proxy-image }}' \ linkerd-exec='{{ linkerd-exec }}' \ @@ -520,14 +536,20 @@ k3d-source-server := "k3d-" + k3d-name + "-server-0" k3d-target-server := "k3d-" + k3d-name + "-target-server-0" _mc-route-output-fmt := "-o jsonpath='ip route add {.spec.podCIDR} via {.status.addresses[?(.type==\"InternalIP\")].address}'" -_mc-print-source-route := _kubectl + " " + "get node " + k3d-source-server + " " + _mc-route-output-fmt -_mc-print-target-route := "kubectl --context=k3d-" + k3d-name + "-target "+ "get node " + k3d-target-server + " " + _mc-route-output-fmt +_mc-print-north-route := "kubectl --context=k3d-l5d-test-north get node k3d-l5d-test-north-server-0" + " " + _mc-route-output-fmt +_mc-print-east-route := "kubectl --context=k3d-l5d-test-east get node k3d-l5d-test-east-server-0" + " " + _mc-route-output-fmt +_mc-print-west-route := "kubectl --context=k3d-l5d-test get node k3d-l5d-test-server-0" + " " + _mc-route-output-fmt # Allow two k3d server nodes to participate in a flat network mc-flat-network-init: - @docker exec k3d-{{k3d-name}}-server-0 `{{_mc-print-target-route}}` - @docker exec k3d-{{k3d-name}}-target-server-0 `{{_mc-print-source-route}}` + @docker exec k3d-l5d-test-server-0 `{{_mc-print-east-route}}` + @docker exec k3d-l5d-test-server-0 `{{_mc-print-north-route}}` + + @docker exec k3d-l5d-test-east-server-0 `{{_mc-print-west-route}}` + @docker exec k3d-l5d-test-east-server-0 `{{_mc-print-north-route}}` + @docker exec k3d-l5d-test-north-server-0 `{{_mc-print-east-route}}` + @docker exec k3d-l5d-test-north-server-0 `{{_mc-print-west-route}}` # Run the multicluster tests without any setup mc-test-run *flags: diff --git a/testutil/test_helper.go b/testutil/test_helper.go index e0a5f7e251f7a..6ba5525b1e10b 100644 --- a/testutil/test_helper.go +++ b/testutil/test_helper.go @@ -22,7 +22,7 @@ import ( corev1 "k8s.io/api/core/v1" ) -const GATEWAY_API_VERSION = "v1.2.0" +const GATEWAY_API_VERSION = "v1.2.1" // TestHelper provides helpers for running the linkerd integration tests. type TestHelper struct { From cc27e1f2d0d68b4c8ecb427d6524ede2b370c892 Mon Sep 17 00:00:00 2001 From: Alex Leong Date: Tue, 28 Apr 2026 00:08:15 +0000 Subject: [PATCH 2/2] revert changes to justfile Signed-off-by: Alex Leong --- justfile | 40 +++++++++------------------------------- 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/justfile b/justfile index 170a45d0eee37..c93f99d5b2b89 100644 --- a/justfile +++ b/justfile @@ -2,7 +2,7 @@ lint: action-lint action-dev-check md-lint sh-lint rs-fetch rs-clippy rs-check-fmt go-lint -export GWAPI_VERSION := "v1.2.1" +export GWAPI_VERSION := "v1.2.0" ## ## Go @@ -472,8 +472,7 @@ _linkerd-viz-uninit: ## linkerd multicluster ## -_mc-east-k3d-flags := "--k3s-arg --disable='local-storage,metrics-server@server:*' --k3s-arg '--cluster-cidr=10.23.0.0/24@server:*'" -_mc-north-k3d-flags := "--k3s-arg --disable='local-storage,metrics-server@server:*' --k3s-arg '--cluster-cidr=10.24.0.0/24@server:*'" +_mc-target-k3d-flags := "--k3s-arg --disable='local-storage,metrics-server@server:*' --k3s-arg '--cluster-cidr=10.23.0.0/24@server:*'" linkerd-mc-install: _linkerd-init {{ _linkerd }} mc install --set='linkerdVersion={{ linkerd-tag }}' \ @@ -495,29 +494,14 @@ mc-target-k3d-delete: mc-load: _k3d-init linkerd-load -mc-east-load: +mc-target-load: @{{ just_executable() }} \ - k3d-name='{{ k3d-name }}-east' \ + k3d-name='{{ k3d-name }}-target' \ k3d-k8s='{{ k3d-k8s }}' \ k3d-agents='{{ k3d-agents }}' \ k3d-servers='{{ k3d-servers }}' \ k3d-network='{{ k3d-network }}' \ - _k3d-flags='{{ _mc-east-k3d-flags }}' \ - controller-image='{{ controller-image }}' \ - proxy-image='{{ proxy-image }}' \ - linkerd-exec='{{ linkerd-exec }}' \ - linkerd-tag='{{ linkerd-tag }}' \ - _pause-load \ - mc-load - -mc-north-load: - @{{ just_executable() }} \ - k3d-name='{{ k3d-name }}-north' \ - k3d-k8s='{{ k3d-k8s }}' \ - k3d-agents='{{ k3d-agents }}' \ - k3d-servers='{{ k3d-servers }}' \ - k3d-network='{{ k3d-network }}' \ - _k3d-flags='{{ _mc-north-k3d-flags }}' \ + _k3d-flags='{{ _mc-target-k3d-flags }}' \ controller-image='{{ controller-image }}' \ proxy-image='{{ proxy-image }}' \ linkerd-exec='{{ linkerd-exec }}' \ @@ -536,20 +520,14 @@ k3d-source-server := "k3d-" + k3d-name + "-server-0" k3d-target-server := "k3d-" + k3d-name + "-target-server-0" _mc-route-output-fmt := "-o jsonpath='ip route add {.spec.podCIDR} via {.status.addresses[?(.type==\"InternalIP\")].address}'" -_mc-print-north-route := "kubectl --context=k3d-l5d-test-north get node k3d-l5d-test-north-server-0" + " " + _mc-route-output-fmt -_mc-print-east-route := "kubectl --context=k3d-l5d-test-east get node k3d-l5d-test-east-server-0" + " " + _mc-route-output-fmt -_mc-print-west-route := "kubectl --context=k3d-l5d-test get node k3d-l5d-test-server-0" + " " + _mc-route-output-fmt +_mc-print-source-route := _kubectl + " " + "get node " + k3d-source-server + " " + _mc-route-output-fmt +_mc-print-target-route := "kubectl --context=k3d-" + k3d-name + "-target "+ "get node " + k3d-target-server + " " + _mc-route-output-fmt # Allow two k3d server nodes to participate in a flat network mc-flat-network-init: - @docker exec k3d-l5d-test-server-0 `{{_mc-print-east-route}}` - @docker exec k3d-l5d-test-server-0 `{{_mc-print-north-route}}` - - @docker exec k3d-l5d-test-east-server-0 `{{_mc-print-west-route}}` - @docker exec k3d-l5d-test-east-server-0 `{{_mc-print-north-route}}` + @docker exec k3d-{{k3d-name}}-server-0 `{{_mc-print-target-route}}` + @docker exec k3d-{{k3d-name}}-target-server-0 `{{_mc-print-source-route}}` - @docker exec k3d-l5d-test-north-server-0 `{{_mc-print-east-route}}` - @docker exec k3d-l5d-test-north-server-0 `{{_mc-print-west-route}}` # Run the multicluster tests without any setup mc-test-run *flags: