From 8b6da21b6fa997420351572a33906584f773ebae Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Thu, 15 Aug 2024 14:53:12 -0600 Subject: [PATCH 1/2] Update versions: This gets the CAPT playground using Kubernetes 1.29 with the OS image coming from the official tinkerbell/cluster-api-provider-tinkerbell repo. Signed-off-by: Jacob Weinstock --- capt/config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/capt/config.yaml b/capt/config.yaml index 9cd0255..ffe0510 100644 --- a/capt/config.yaml +++ b/capt/config.yaml @@ -5,15 +5,15 @@ namespace: "tink" counts: controlPlanes: 1 workers: 1 - spares: 3 + spares: 1 versions: capt: 0.5.3 chart: 0.4.5 - kube: v1.28.3 + kube: v1.29.4 os: 20.04 - kubevip: 0.8.0 + kubevip: 0.8.2 os: - registry: ghcr.io/jacobweinstock/capi-images + registry: ghcr.io/tinkerbell/cluster-api-provider-tinkerbell distro: ubuntu sshKey: "" vm: From 8d83577e424185c0e31fd86b7c54c6a6e5ff547e Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Thu, 15 Aug 2024 14:54:40 -0600 Subject: [PATCH 2/2] Update versions in the Stack playground: This gets the K3D cluster to 1.30, uses the latest Helm chart, and local binaries like kubectl and helm. Signed-off-by: Jacob Weinstock --- stack/vagrant/.env | 9 ++++----- stack/vagrant/setup.sh | 5 +++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stack/vagrant/.env b/stack/vagrant/.env index e55361c..1db6c40 100644 --- a/stack/vagrant/.env +++ b/stack/vagrant/.env @@ -5,8 +5,7 @@ MACHINE1_IP=192.168.56.43 MACHINE1_MAC=08:00:27:9e:f5:3a # https://github.com/tinkerbell/charts/pkgs/container/charts%2Fstack -HELM_CHART_VERSION=0.4.4 -KUBECTL_VERSION=1.27.12 -# K3D version v5.6.3 doesn't work with host networking. https://github.com/k3d-io/k3d/issues/964 -K3D_VERSION=v5.6.0 -HELM_VERSION=v3.14.4 +HELM_CHART_VERSION=0.4.5 +KUBECTL_VERSION=1.30.4 +K3D_VERSION=v5.7.3 +HELM_VERSION=v3.15.4 diff --git a/stack/vagrant/setup.sh b/stack/vagrant/setup.sh index f4ab04d..2187fc5 100644 --- a/stack/vagrant/setup.sh +++ b/stack/vagrant/setup.sh @@ -47,7 +47,8 @@ install_k3d() { } start_k3d() { - k3d cluster create --network host --no-lb --k3s-arg "--disable=traefik,servicelb,metrics-server,local-storage" + # K3D_FIX_DNS=false is needed because host network mode won't work without it. + K3D_FIX_DNS=false k3d cluster create --network host --no-lb --k3s-arg "--disable=traefik,servicelb,metrics-server,local-storage" mkdir -p ~/.kube/ k3d kubeconfig get -a >~/.kube/config @@ -122,10 +123,10 @@ run_helm() { install_k3d "$k3d_version" start_k3d + kubectl_for_vagrant_user install_helm "$helm_version" helm_install_tink_stack "$namespace" "$helm_chart_version" "$loadbalancer_interface" "$loadbalancer_ip" apply_manifests "$worker_ip" "$worker_mac" "$manifests_dir" "$loadbalancer_ip" "$namespace" - kubectl_for_vagrant_user } main() {