Merge branch 'main' into renovate/cf-org-bumps

orange-cloudfoundry · Nov 27, 2024 · 0541206 · 0541206
2 parents 86b497b + 1690076
commit 0541206
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/k8s-tools/Dockerfile b/k8s-tools/Dockerfile
@@ -50,10 +50,11 @@ 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_SUM d7d363dd5a4c95444329bc5239b8718ebe84a043052958b2f15ee2feef9a28c6
+ENV KUBECTL_VERSION 1.28.15
+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 -
 

diff --git a/k8s-tools/k8s-tools_spec.rb b/k8s-tools/k8s-tools_spec.rb
@@ -7,7 +7,7 @@
 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
-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"