From 80212daf2539d13eea3898b3f24efbca2170992b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 10:05:12 +0000 Subject: [PATCH 1/3] chore(deps): update dependency kubernetes/kubectl to v1.28.13 --- 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 4c66df54..e6b0c046 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.26.15 +ENV KUBECTL_VERSION 1.28.13 ENV KUBECTL_SUM b75f359e6fad3cdbf05a0ee9d5872c43383683bb8527a9e078bb5b8a44350a41 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 a094e47b..bf9c32ea 100644 --- a/k8s-tools/k8s-tools_spec.rb +++ b/k8s-tools/k8s-tools_spec.rb @@ -7,7 +7,7 @@ CREDHUB_CLI_VERSION='2.9.31' # renovate: datasource=github-releases depName=cloudfoundry/credhub-cli KUSTOMIZE_VERSION="5.0.3" # renovate: datasource=github-releases depName=kubernetes-sigs/kustomize KAPP_VERSION="0.62.1" # renovate: datasource=github-releases depName=k14s/kapp -KUBECTL_VERSION="1.26.15" # renovate: datasource=github-tags depName=kubernetes/kubectl +KUBECTL_VERSION="1.28.13" # renovate: datasource=github-tags depName=kubernetes/kubectl HELM_VERSION="3.14.4" # renovate: datasource=github-releases depName=helm/helm KUTTL_VERSION="0.17.0" # renovate: datasource=github-releases depName=kudobuilder/kuttl RUBY_VERSION = "3.1" From e9cfe77399deccef78382ad76e9273e4968d409a Mon Sep 17 00:00:00 2001 From: Olivier ORAND Date: Wed, 4 Sep 2024 16:00:42 +0000 Subject: [PATCH 2/3] k8s-tools: fix SHA-256 manually for kubectl --- k8s-tools/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-tools/Dockerfile b/k8s-tools/Dockerfile index e6b0c046..f20daf6f 100644 --- a/k8s-tools/Dockerfile +++ b/k8s-tools/Dockerfile @@ -51,7 +51,7 @@ RUN echo "Computed sha256sum: $(sha256sum ${KAPP_FILENAME})" \ # renovate: datasource=github-tags depName=kubernetes/kubectl ENV KUBECTL_VERSION 1.28.13 -ENV KUBECTL_SUM b75f359e6fad3cdbf05a0ee9d5872c43383683bb8527a9e078bb5b8a44350a41 +ENV KUBECTL_SUM d7d363dd5a4c95444329bc5239b8718ebe84a043052958b2f15ee2feef9a28c6 ENV KUBECTL_FILENAME kubectl ADD https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl . RUN echo "Computed sha256sum: $(sha256sum ${KUBECTL_FILENAME})" \ From f56ad823a5eb9d107b420b2d0234953b57482892 Mon Sep 17 00:00:00 2001 From: Olivier ORAND Date: Wed, 4 Sep 2024 16:16:13 +0000 Subject: [PATCH 3/3] k8s-tools: fix kubectl version command Option --short is not available anymore in kubectl. Embedded kustomize is also updated --- k8s-tools/k8s-tools_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/k8s-tools/k8s-tools_spec.rb b/k8s-tools/k8s-tools_spec.rb index bf9c32ea..baef427a 100644 --- a/k8s-tools/k8s-tools_spec.rb +++ b/k8s-tools/k8s-tools_spec.rb @@ -26,11 +26,11 @@ end it "has the expected version of Kubectl (#{KUBECTL_VERSION}) with embedded Kustomize" do - OLD_KUSTOMIZE_VERSION="4.5.7" + EMBEDDED_KUSTOMIZE_VERSION="5.0.4-0.20230601165947-6ce0bf390ce3" expect( - command("kubectl version --short --client=true").stdout.strip + command("kubectl version --client=true").stdout.strip # ).to eq("Client Version: v#{KUBECTL_VERSION}\nKustomize Version: v#{KUSTOMIZE_VERSION}") - ).to eq("Client Version: v#{KUBECTL_VERSION}\nKustomize Version: v#{OLD_KUSTOMIZE_VERSION}") + ).to eq("Client Version: v#{KUBECTL_VERSION}\nKustomize Version: v#{EMBEDDED_KUSTOMIZE_VERSION}") end it "has the expected version of YTT (#{YTT_VERSION})" do