From 1e126da0dc5798b43062bce7a89a6dfd9c1f8257 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 23 Oct 2024 11:59:18 +0000
Subject: [PATCH 1/2] chore(deps): update dependency kubernetes/kubectl to
 v1.28.15

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

diff --git a/k8s-tools/Dockerfile b/k8s-tools/Dockerfile
index d743f9cd..ca4f8fd9 100644
--- a/k8s-tools/Dockerfile
+++ b/k8s-tools/Dockerfile
@@ -50,7 +50,7 @@ RUN echo "Computed sha256sum: $(sha256sum ${KAPP_FILENAME})" \
     && mv kapp-linux-amd64 kapp
 
 # renovate: datasource=github-tags depName=kubernetes/kubectl
-ENV KUBECTL_VERSION 1.28.13
+ENV KUBECTL_VERSION 1.28.15
 ENV KUBECTL_SUM d7d363dd5a4c95444329bc5239b8718ebe84a043052958b2f15ee2feef9a28c6
 ENV KUBECTL_FILENAME kubectl
 ADD https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl .
diff --git a/k8s-tools/k8s-tools_spec.rb b/k8s-tools/k8s-tools_spec.rb
index f800b4ba..dec05793 100644
--- a/k8s-tools/k8s-tools_spec.rb
+++ b/k8s-tools/k8s-tools_spec.rb
@@ -7,7 +7,7 @@
 CREDHUB_CLI_VERSION='2.9.36' # 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
-KUBECTL_VERSION="1.28.13" # renovate: datasource=github-tags depName=kubernetes/kubectl
+KUBECTL_VERSION="1.28.15" # 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
 RUBY_VERSION = "3.1"

From 2fa2546b347c68ac06b777a7c07cf75a5d294424 Mon Sep 17 00:00:00 2001
From: Olivier ORAND <olivier.orand@orange.com>
Date: Wed, 27 Nov 2024 15:50:10 +0000
Subject: [PATCH 2/2] k8s-tools: update kubectl download url and fix SHA-256

---
 k8s-tools/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/k8s-tools/Dockerfile b/k8s-tools/Dockerfile
index ca4f8fd9..2844c24b 100644
--- a/k8s-tools/Dockerfile
+++ b/k8s-tools/Dockerfile
@@ -51,9 +51,10 @@ RUN echo "Computed sha256sum: $(sha256sum ${KAPP_FILENAME})" \
 
 # renovate: datasource=github-tags depName=kubernetes/kubectl
 ENV KUBECTL_VERSION 1.28.15
-ENV KUBECTL_SUM d7d363dd5a4c95444329bc5239b8718ebe84a043052958b2f15ee2feef9a28c6
+ENV KUBECTL_SUM 1f7651ad0b50ef4561aa82e77f3ad06599b5e6b0b2a5fb6c4f474d95a77e41c5
 ENV KUBECTL_FILENAME kubectl
-ADD https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl .
+ADD https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl .
+#ADD https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl .
 RUN echo "Computed sha256sum: $(sha256sum ${KUBECTL_FILENAME})" \
     && echo "${KUBECTL_SUM}  ${KUBECTL_FILENAME}" | sha256sum -c -