From 035678da48efab6a935bdfee41f8073313007304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= Date: Tue, 9 Jun 2026 16:29:44 +0200 Subject: [PATCH] =?UTF-8?q?=E2=8F=AB=20Bump=20up=20Helm=20and=20Cilium;=20?= =?UTF-8?q?fix=20kubectl=20apply=20-f-?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On some versions of pssh, if we use kubectl apply -f- but nothing is connected to stdin, we get errors. So execute cat instead of kubectl apply -f- when needed. --- prepare-labs/lib/commands.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/prepare-labs/lib/commands.sh b/prepare-labs/lib/commands.sh index 178ef164..4dd3b04d 100644 --- a/prepare-labs/lib/commands.sh +++ b/prepare-labs/lib/commands.sh @@ -567,7 +567,8 @@ EOF" # Install helm early # (so that we can use it to install e.g. Cilium etc.) ARCH=${ARCHITECTURE-amd64} - HELM_VERSION=3.19.1 + # https://github.com/helm/helm/releases + HELM_VERSION=4.2.0 pssh " if [ ! -x /usr/local/bin/helm ]; then curl -fsSL https://get.helm.sh/helm-v${HELM_VERSION}-linux-${ARCH}.tar.gz | @@ -709,8 +710,9 @@ EOF helm upgrade -i cilium cilium --repo https://helm.cilium.io/ \ --namespace kube-system \ --values /tmp/cilium.yaml \ - --version 1.18.3 + --version 1.19.4 fi" + # https://github.com/cilium/cilium/releases # FIXME this is a gross hack to add the deployment key to our SSH agent, # so that it can be used to bounce from host to host (which is necessary @@ -734,7 +736,9 @@ EOF # Install metrics server pssh -I <../k8s/metrics-server.yaml " if i_am_first_node; then - kubectl apply -f- + kubectl apply -f- + else + cat fi" # It would be nice to be able to use that helm chart for metrics-server. # Unfortunately, the charts themselves are on github.com and we want to