From 547d5d43fa1036766ca89d3169c1295027403f1e Mon Sep 17 00:00:00 2001 From: Bob Callaway Date: Thu, 13 Jun 2024 08:44:05 -0400 Subject: [PATCH 1/3] upgrade metallb Signed-off-by: Bob Callaway --- hack/setup-kind.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/setup-kind.sh b/hack/setup-kind.sh index a8d752d9a..8f8d58165 100755 --- a/hack/setup-kind.sh +++ b/hack/setup-kind.sh @@ -211,7 +211,7 @@ echo '::endgroup::' ############################################################# echo '::group:: Setup metallb' -kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.13.5/config/manifests/metallb-native.yaml +kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.14.5/config/manifests/metallb-native.yaml kubectl create secret generic -n metallb-system memberlist --from-literal=secretkey="$(openssl rand -base64 128)" # Wait for Metallb to be ready (or webhook will reject CRDs) From 122b7232d31abfb2cb4c47e65deee0ca597955a4 Mon Sep 17 00:00:00 2001 From: Bob Callaway Date: Thu, 13 Jun 2024 14:49:59 -0400 Subject: [PATCH 2/3] print version Signed-off-by: Bob Callaway --- hack/setup-kind.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/setup-kind.sh b/hack/setup-kind.sh index 8f8d58165..9d04aaaff 100755 --- a/hack/setup-kind.sh +++ b/hack/setup-kind.sh @@ -209,7 +209,7 @@ echo '::endgroup::' # Setup metallb # ############################################################# -echo '::group:: Setup metallb' +echo '::group:: Setup metallb 0.14.5' kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.14.5/config/manifests/metallb-native.yaml kubectl create secret generic -n metallb-system memberlist --from-literal=secretkey="$(openssl rand -base64 128)" From cd9ff9f841d67b7b44ccfc722907b2909fbd6ca4 Mon Sep 17 00:00:00 2001 From: Bob Callaway Date: Thu, 13 Jun 2024 15:47:15 -0400 Subject: [PATCH 3/3] change network subnet calc Signed-off-by: Bob Callaway --- hack/setup-kind.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/setup-kind.sh b/hack/setup-kind.sh index 9d04aaaff..33ebe8714 100755 --- a/hack/setup-kind.sh +++ b/hack/setup-kind.sh @@ -222,7 +222,7 @@ done # And allow for few seconds for things to settle just to make sure things are up sleep 5 -network=$(docker network inspect kind -f "{{(index .IPAM.Config 0).Subnet}}" | cut -d '.' -f1,2) +network=$(docker network inspect kind | jq -r '.[0].IPAM.Config[] | select(.Subnet | test("^[0-9]+\\.")) | .Subnet' | cut -d '.' -f1,2) cat <>./metallb-crds.yaml apiVersion: metallb.io/v1beta1 kind: IPAddressPool