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: 4 additions & 4 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,11 @@ jobs:
# Test the latest Kubernetes version with the latest Gateway API
# version, as well as the vendored Gateway API CRDs.
k8s:
- v1.32
- v1.34
gateway-api:
- version: linkerd
channel: experimental
- version: v1.3.0-rc.1
- version: v1.4.0
channel: experimental
# Also test the Minimum Supported Kubernetes Version with the Minimum
# Supported Gateway API version.
Expand Down Expand Up @@ -334,8 +334,8 @@ jobs:
matrix:
cases:
- {k8s: "v1.23", manage-controllers: false}
- {k8s: "v1.32", manage-controllers: false}
- {k8s: "v1.32", manage-controllers: true}
- {k8s: "v1.34", manage-controllers: false}
- {k8s: "v1.34", manage-controllers: true}
name: "test-multicluster(${{ matrix.cases.k8s }}, ${{ matrix.cases.manage-controllers && 'managed-controllers' || 'unmanaged-controllers' }})"
steps:
- uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,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 -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.2.1/standard-install.yaml
kubectl apply --server-side -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.4.0/standard-install.yaml

or see https://gateway-api.sigs.k8s.io/guides/#installing-gateway-api for more options.`)
}
Expand Down
4 changes: 2 additions & 2 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,9 @@ linkerd *flags:

# Install crds on the test cluster.
linkerd-crds-install: _k3d-init
if [ -n "{{ _gateway-url }}" ]; then {{ _kubectl }} apply -f "{{ _gateway-url }}" ; fi
if [ -n "{{ _gateway-url }}" ]; then {{ _kubectl }} apply --server-side -f "{{ _gateway-url }}" ; fi
{{ _linkerd }} install --crds --set installGatewayAPI={{ if _gateway-url == "" { "true "} else { "false "} }} \
| {{ _kubectl }} apply -f -
| {{ _kubectl }} apply --server-side -f -
{{ _kubectl }} wait crd --for condition=established \
--selector='linkerd.io/control-plane-ns' \
--timeout=1m
Expand Down