From 8d6ce32a283c4bead01450589805dd2444439e90 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2025 15:09:00 +0000
Subject: [PATCH 1/3] chore(deps): update k8s related bumps

---
 bosh-cli-v2/Dockerfile      | 2 +-
 k8s-tools/Dockerfile        | 8 ++++----
 k8s-tools/k8s-tools_spec.rb | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bosh-cli-v2/Dockerfile b/bosh-cli-v2/Dockerfile
index e5db2660..84b4dbdf 100644
--- a/bosh-cli-v2/Dockerfile
+++ b/bosh-cli-v2/Dockerfile
@@ -34,7 +34,7 @@ RUN wget -nv https://github.com/cloudfoundry/credhub-cli/releases/download/${CRE
   && mv credhub /usr/local/bin/credhub
 
 # renovate: datasource=github-releases depName=mikefarah/yq
-ENV YQ_VERSION 4.44.5
+ENV YQ_VERSION 4.45.1
 ENV YQ_SUM 638c4b251c49201fc94b598834b715f8f1c6e9b1854d2820772d2c79f0289002
 ENV YQ_FILENAME yq_linux_amd64
 ENV YQ_REPO github.com/mikefarah/yq
diff --git a/k8s-tools/Dockerfile b/k8s-tools/Dockerfile
index 87b5c999..4ac2ba4c 100644
--- a/k8s-tools/Dockerfile
+++ b/k8s-tools/Dockerfile
@@ -13,7 +13,7 @@ RUN apt-get update \
 WORKDIR /usr/local/bin
 
 # renovate: datasource=github-releases depName=k14s/ytt
-ENV YTT_VERSION "0.51.0"
+ENV YTT_VERSION "0.51.1"
 ENV YTT_SUM f7ac37761607fefe06a4cc40840a3378a6e8365417d70d06f171cbc4d5469aca
 ENV YTT_FILENAME ytt-linux-amd64
 ADD https://github.com/k14s/ytt/releases/download/v${YTT_VERSION}/${YTT_FILENAME} .
@@ -41,7 +41,7 @@ RUN echo "Computed sha256sum: $(sha256sum ${KUSTOMIZE_FILENAME})" \
     && tar zxvf ${KUSTOMIZE_FILENAME}
 
 # renovate: datasource=github-releases depName=k14s/kapp
-ENV KAPP_VERSION 0.63.3
+ENV KAPP_VERSION 0.64.0
 ENV KAPP_SUM 33702a40b6032ada742d73c59afeb393d0830a1913e3a599ca995eba3e68a57e
 ENV KAPP_FILENAME kapp-linux-amd64
 ADD https://github.com/k14s/kapp/releases/download/v${KAPP_VERSION}/kapp-linux-amd64 .
@@ -70,7 +70,7 @@ RUN echo "Computed sha256sum: $(sha256sum ${HELM_FILENAME})" \
     && rm -rf linux-amd64
 
 # renovate: datasource=github-releases depName=kudobuilder/kuttl
-ENV KUTTL_VERSION 0.19.0
+ENV KUTTL_VERSION 0.21.0
 ENV KUTTL_PLUGIN_SUM 376162ead2a1681505c3a449c3f02f3b2e6c8f604963c5a729cf7be532b1ae29
 ENV KUTTL_PLUGIN_FILENAME kubectl-kuttl_${KUTTL_VERSION}_linux_x86_64
 ADD https://github.com/kudobuilder/kuttl/releases/download/v${KUTTL_VERSION}/${KUTTL_PLUGIN_FILENAME} .
@@ -80,7 +80,7 @@ RUN echo "Computed ${KUTTL_PLUGIN_FILENAME} sha256sum: $(sha256sum ${KUTTL_PLUGI
     && ln -s kubectl-kuttl kuttl
 
 # renovate: datasource=github-releases depName=mikefarah/yq
-ENV YQ_VERSION 4.44.5
+ENV YQ_VERSION 4.45.1
 ENV YQ_SUM 638c4b251c49201fc94b598834b715f8f1c6e9b1854d2820772d2c79f0289002
 ENV YQ_FILENAME yq_linux_amd64
 ADD https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/${YQ_FILENAME} .
diff --git a/k8s-tools/k8s-tools_spec.rb b/k8s-tools/k8s-tools_spec.rb
index 878f2952..ae3bc214 100644
--- a/k8s-tools/k8s-tools_spec.rb
+++ b/k8s-tools/k8s-tools_spec.rb
@@ -3,13 +3,13 @@
 require 'serverspec'
 
 BOSH_CLI_VERSION="7.7.1" # renovate: datasource=github-releases depName=cloudfoundry/bosh-cli
-YTT_VERSION="0.51.0"  # renovate: datasource=github-releases depName=k14s/ytt
+YTT_VERSION="0.51.1"  # renovate: datasource=github-releases depName=k14s/ytt
 CREDHUB_CLI_VERSION='2.9.39' # renovate: datasource=github-releases depName=cloudfoundry/credhub-cli
 KUSTOMIZE_VERSION="5.0.3" # renovate: datasource=github-releases depName=kubernetes-sigs/kustomize
-KAPP_VERSION="0.63.3" # renovate: datasource=github-releases depName=k14s/kapp
+KAPP_VERSION="0.64.0" # renovate: datasource=github-releases depName=k14s/kapp
 KUBECTL_VERSION="1.30.9" # renovate: datasource=github-tags depName=kubernetes/kubectl
 HELM_VERSION="3.14.4" # renovate: datasource=github-releases depName=helm/helm
-KUTTL_VERSION="0.19.0" # renovate: datasource=github-releases depName=kudobuilder/kuttl
+KUTTL_VERSION="0.21.0" # renovate: datasource=github-releases depName=kudobuilder/kuttl
 RUBY_VERSION = "3.1"
 
 DEPS = "unzip curl openssl ca-certificates git libc6 bash jq gettext"

From ea0bca5f5efb8a4933206230f9f66237b652ec30 Mon Sep 17 00:00:00 2001
From: Olivier ORAND <olivier.orand@orange.com>
Date: Mon, 10 Feb 2025 16:20:56 +0100
Subject: [PATCH 2/3] k8s-tools|bosh-cli-v2: fix SHA-256 manually for yq

---
 bosh-cli-v2/Dockerfile | 5 ++++-
 k8s-tools/Dockerfile   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bosh-cli-v2/Dockerfile b/bosh-cli-v2/Dockerfile
index 84b4dbdf..79c9bf61 100644
--- a/bosh-cli-v2/Dockerfile
+++ b/bosh-cli-v2/Dockerfile
@@ -18,6 +18,7 @@ RUN apt-get update \
   && rm -rf /var/lib/apt/lists/*
 
 RUN wget -nv https://github.com/cloudfoundry/bosh-cli/releases/download/v${BOSH_CLI_VERSION}/${BOSH_CLI_FILENAME} \
+  && echo "Computed sha256sum: $(sha256sum ${BOSH_CLI_FILENAME})" \
   && echo "${BOSH_CLI_SUM}  ${BOSH_CLI_FILENAME}" | sha256sum -c - \
   && chmod +x ${BOSH_CLI_FILENAME} \
   && mv ${BOSH_CLI_FILENAME} /usr/local/bin/bosh
@@ -28,6 +29,7 @@ ENV CREDHUB_CLI_SUM 15cb96ea05a85020c83ef81d7a72f7da43a8671f8e60ed3f7ddc6660a0c8
 ENV CREDHUB_CLI_FILENAME credhub-linux-amd64-${CREDHUB_CLI_VERSION}.tgz
 
 RUN wget -nv https://github.com/cloudfoundry/credhub-cli/releases/download/${CREDHUB_CLI_VERSION}/${CREDHUB_CLI_FILENAME} \
+  && echo "Computed sha256sum: $(sha256sum ${CREDHUB_CLI_FILENAME})" \
   && echo "${CREDHUB_CLI_SUM}  ${CREDHUB_CLI_FILENAME}" | sha256sum -c - \
   && tar zxvf ${CREDHUB_CLI_FILENAME} \
   && chmod +x credhub \
@@ -35,10 +37,11 @@ RUN wget -nv https://github.com/cloudfoundry/credhub-cli/releases/download/${CRE
 
 # renovate: datasource=github-releases depName=mikefarah/yq
 ENV YQ_VERSION 4.45.1
-ENV YQ_SUM 638c4b251c49201fc94b598834b715f8f1c6e9b1854d2820772d2c79f0289002
+ENV YQ_SUM 654d2943ca1d3be2024089eb4f270f4070f491a0610481d128509b2834870049
 ENV YQ_FILENAME yq_linux_amd64
 ENV YQ_REPO github.com/mikefarah/yq
 RUN wget -nv https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/${YQ_FILENAME} \
+  && echo "Computed sha256sum: $(sha256sum ${YQ_FILENAME})" \
   && echo "${YQ_SUM}  ${YQ_FILENAME}" | sha256sum -c - \
   && chmod +x ${YQ_FILENAME} \
   && mv ${YQ_FILENAME} /usr/local/bin/yq
diff --git a/k8s-tools/Dockerfile b/k8s-tools/Dockerfile
index 4ac2ba4c..4ff52386 100644
--- a/k8s-tools/Dockerfile
+++ b/k8s-tools/Dockerfile
@@ -81,7 +81,7 @@ RUN echo "Computed ${KUTTL_PLUGIN_FILENAME} sha256sum: $(sha256sum ${KUTTL_PLUGI
 
 # renovate: datasource=github-releases depName=mikefarah/yq
 ENV YQ_VERSION 4.45.1
-ENV YQ_SUM 638c4b251c49201fc94b598834b715f8f1c6e9b1854d2820772d2c79f0289002
+ENV YQ_SUM 654d2943ca1d3be2024089eb4f270f4070f491a0610481d128509b2834870049
 ENV YQ_FILENAME yq_linux_amd64
 ADD https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/${YQ_FILENAME} .
 RUN echo "Computed ${YQ_FILENAME} sha256sum: $(sha256sum ${YQ_FILENAME})" \

From c32526283cb36db784e9a5cadedc2ffae06b1032 Mon Sep 17 00:00:00 2001
From: Olivier ORAND <olivier.orand@orange.com>
Date: Mon, 10 Feb 2025 18:36:23 +0100
Subject: [PATCH 3/3] k8s-tools: fix SHA-256 manually and disable kapp

---
 k8s-tools/Dockerfile        | 18 +++++++++---------
 k8s-tools/k8s-tools_spec.rb |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/k8s-tools/Dockerfile b/k8s-tools/Dockerfile
index 4ff52386..af349eff 100644
--- a/k8s-tools/Dockerfile
+++ b/k8s-tools/Dockerfile
@@ -14,7 +14,7 @@ WORKDIR /usr/local/bin
 
 # renovate: datasource=github-releases depName=k14s/ytt
 ENV YTT_VERSION "0.51.1"
-ENV YTT_SUM f7ac37761607fefe06a4cc40840a3378a6e8365417d70d06f171cbc4d5469aca
+ENV YTT_SUM 026a12ee7108ff2d1150eb1347d544367d92e993ade7b2d2727c4c8d13a47a6b
 ENV YTT_FILENAME ytt-linux-amd64
 ADD https://github.com/k14s/ytt/releases/download/v${YTT_VERSION}/${YTT_FILENAME} .
 RUN echo "Computed sha256sum: $(sha256sum ${YTT_FILENAME})" \
@@ -41,13 +41,13 @@ RUN echo "Computed sha256sum: $(sha256sum ${KUSTOMIZE_FILENAME})" \
     && tar zxvf ${KUSTOMIZE_FILENAME}
 
 # renovate: datasource=github-releases depName=k14s/kapp
-ENV KAPP_VERSION 0.64.0
-ENV KAPP_SUM 33702a40b6032ada742d73c59afeb393d0830a1913e3a599ca995eba3e68a57e
-ENV KAPP_FILENAME kapp-linux-amd64
-ADD https://github.com/k14s/kapp/releases/download/v${KAPP_VERSION}/kapp-linux-amd64 .
-RUN echo "Computed sha256sum: $(sha256sum ${KAPP_FILENAME})" \
-    && echo "${KAPP_SUM}  ${KAPP_FILENAME}" | sha256sum -c - \
-    && mv kapp-linux-amd64 kapp
+#ENV KAPP_VERSION 0.64.0
+#ENV KAPP_SUM 33702a40b6032ada742d73c59afeb393d0830a1913e3a599ca995eba3e68a57e
+#ENV KAPP_FILENAME kapp-linux-amd64
+#ADD https://github.com/k14s/kapp/releases/download/v${KAPP_VERSION}/kapp-linux-amd64 .
+#RUN echo "Computed sha256sum: $(sha256sum ${KAPP_FILENAME})" \
+#    && echo "${KAPP_SUM}  ${KAPP_FILENAME}" | sha256sum -c - \
+#    && mv kapp-linux-amd64 kapp
 
 # renovate: datasource=github-tags depName=kubernetes/kubectl
 ENV KUBECTL_VERSION 1.30.9
@@ -71,7 +71,7 @@ RUN echo "Computed sha256sum: $(sha256sum ${HELM_FILENAME})" \
 
 # renovate: datasource=github-releases depName=kudobuilder/kuttl
 ENV KUTTL_VERSION 0.21.0
-ENV KUTTL_PLUGIN_SUM 376162ead2a1681505c3a449c3f02f3b2e6c8f604963c5a729cf7be532b1ae29
+ENV KUTTL_PLUGIN_SUM 5fdca46d6ee88c14e2f4aa6b2a398b205f0991fb5e078caf36cd87c9414b715c
 ENV KUTTL_PLUGIN_FILENAME kubectl-kuttl_${KUTTL_VERSION}_linux_x86_64
 ADD https://github.com/kudobuilder/kuttl/releases/download/v${KUTTL_VERSION}/${KUTTL_PLUGIN_FILENAME} .
 RUN echo "Computed ${KUTTL_PLUGIN_FILENAME} sha256sum: $(sha256sum ${KUTTL_PLUGIN_FILENAME})" \
diff --git a/k8s-tools/k8s-tools_spec.rb b/k8s-tools/k8s-tools_spec.rb
index ae3bc214..4c260d82 100644
--- a/k8s-tools/k8s-tools_spec.rb
+++ b/k8s-tools/k8s-tools_spec.rb
@@ -51,10 +51,10 @@
     ).to match("v#{KUSTOMIZE_VERSION}\n")
   end
 
-  it "has the expected version of Kapp (#{KAPP_VERSION})" do
+  it "has NOT the expected version of Kapp (#{KAPP_VERSION})" do
     expect(
-        command("kapp --version").stdout
-    ).to match(/#{KAPP_VERSION}/)
+        command("kapp --version").stderr
+    ).to match(/kapp: not found/)
   end
 
   it "has the expected version of helm (#{HELM_VERSION})" do