Skip to content

Commit e8c2302

Browse files
authored
Merge branch 'main' into dependabot/github_actions/styfle/cancel-workflow-action-0.13.0
2 parents 596e0d5 + da6692c commit e8c2302

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

k8s-tools/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ RUN echo "Computed sha256sum: $(sha256sum ${KUSTOMIZE_FILENAME})" \
5050
# && mv kapp-linux-amd64 kapp
5151

5252
# renovate: datasource=github-tags depName=kubernetes/kubectl
53-
ENV KUBECTL_VERSION 1.30.9
54-
ENV KUBECTL_SUM d77041f285d9237c4aa451370c3ec6e5c042007dbb55c894f0a179b1d149bf32
53+
ENV KUBECTL_VERSION 1.32.11
54+
ENV KUBECTL_SUM 48581d0e808bd8b7d3c3fc014e86b170e25a987df04c8a879b982b28a5180815
5555
ENV KUBECTL_FILENAME kubectl
5656
ADD https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl .
5757
#ADD https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl .

k8s-tools/k8s-tools_spec.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
CREDHUB_CLI_VERSION='2.9.52' # renovate: datasource=github-releases depName=cloudfoundry/credhub-cli
88
KUSTOMIZE_VERSION="5.0.3" # renovate: datasource=github-releases depName=kubernetes-sigs/kustomize
99
KAPP_VERSION="0.65.0" # renovate: datasource=github-releases depName=k14s/kapp
10-
KUBECTL_VERSION="1.30.9" # renovate: datasource=github-tags depName=kubernetes/kubectl
10+
KUBECTL_VERSION="1.32.11" # renovate: datasource=github-tags depName=kubernetes/kubectl
1111
HELM_VERSION="3.14.4" # renovate: datasource=github-releases depName=helm/helm
1212
KUTTL_VERSION="0.24.0" # renovate: datasource=github-releases depName=kudobuilder/kuttl
1313
RUBY_VERSION = "3.4"
@@ -26,10 +26,9 @@
2626
end
2727

2828
it "has the expected version of Kubectl (#{KUBECTL_VERSION}) with embedded Kustomize" do
29-
EMBEDDED_KUSTOMIZE_VERSION="5.0.4-0.20230601165947-6ce0bf390ce3"
29+
EMBEDDED_KUSTOMIZE_VERSION="5.5.0"
3030
expect(
3131
command("kubectl version --client=true").stdout.strip
32-
# ).to eq("Client Version: v#{KUBECTL_VERSION}\nKustomize Version: v#{KUSTOMIZE_VERSION}")
3332
).to eq("Client Version: v#{KUBECTL_VERSION}\nKustomize Version: v#{EMBEDDED_KUSTOMIZE_VERSION}")
3433
end
3534

0 commit comments

Comments
 (0)