Skip to content

Commit f0ea314

Browse files
authored
Merge pull request #1 from alpeb/l5d-2.18
chore: update for linkerd v2.18 - Install GatewayAPI CRDs before installing linkerd - Added multicluster config (east/mv-values.yml and west/mc-values.yml) to be fed into `linkerd mc install` - Use `linkerd mc link-gen` instead of `linkerd mc link` - Other various fixes Tested against linkerd/website#1945
2 parents 8600408 + 884b31a commit f0ea314

File tree

4 files changed

+20
-5
lines changed

4 files changed

+20
-5
lines changed

east/mc-values.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
controllers:
2+
- link:
3+
ref:
4+
name: k3d-west
5+
logLevel: debug
6+
enableHeadlessServices: true

install.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ set -x
88

99
ORG_DOMAIN="${ORG_DOMAIN:-cluster.local}"
1010
LINKERD="${LINKERD:-linkerd}"
11+
GATEWAY_API_VERSION="v1.1.1"
1112

1213
case $(uname) in
1314
Darwin)
@@ -48,6 +49,9 @@ for cluster in east west ; do
4849
--profile=intermediate-ca \
4950
--not-after 8760h --no-password --insecure
5051

52+
# Install GatewayAPI CRDs
53+
kubectl --context="k3d-$cluster" apply -f "https://github.com/kubernetes-sigs/gateway-api/releases/download/${GATEWAY_API_VERSION}/experimental-install.yaml"
54+
5155
#Install CRDs into cluster
5256
$LINKERD --context="k3d-$cluster" install --crds | kubectl --context="k3d-$cluster" apply -f -
5357

@@ -69,6 +73,6 @@ for cluster in east west ; do
6973
sleep 2
7074

7175
# Setup the multicluster components on the server
72-
$LINKERD --context="k3d-$cluster" multicluster install |
76+
$LINKERD --context="k3d-$cluster" multicluster install -f "$cluster/mc-values.yml" |
7377
kubectl --context="k3d-$cluster" apply -f -
7478
done

link.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,15 @@ fetch_credentials() {
1818

1919
# shellcheck disable=SC2001
2020
echo "$($LINKERD --context="k3d-$cluster" \
21-
multicluster link --set "enableHeadlessServices=true" \
21+
multicluster link-gen \
2222
--cluster-name="k3d-$cluster" \
23-
--log-level="debug" \
2423
--api-server-address="https://${lb_ip}:6443")"
2524
}
2625

2726
# East & West get access to each other.
28-
fetch_credentials east | kubectl --context=k3d-west apply -n linkerd-multicluster -f -
27+
fetch_credentials east | kubectl --context=k3d-west apply -f -
2928

30-
fetch_credentials west | kubectl --context=k3d-east apply -n linkerd-multicluster -f -
29+
fetch_credentials west | kubectl --context=k3d-east apply -f -
3130

3231
sleep 10
3332
for c in east west ; do

west/mc-values.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
controllers:
2+
- link:
3+
ref:
4+
name: k3d-east
5+
logLevel: debug
6+
enableHeadlessServices: true

0 commit comments

Comments
 (0)