Skip to content

Commit a5e6fb4

Browse files
authored
Merge pull request #127 from orange-cloudfoundry/renovate/k8s-related-bumps
chore(deps): update k8s related bumps
2 parents 47d6bab + c325262 commit a5e6fb4

File tree

3 files changed

+24
-21
lines changed

3 files changed

+24
-21
lines changed

bosh-cli-v2/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ RUN apt-get update \
1818
&& rm -rf /var/lib/apt/lists/*
1919

2020
RUN wget -nv https://github.com/cloudfoundry/bosh-cli/releases/download/v${BOSH_CLI_VERSION}/${BOSH_CLI_FILENAME} \
21+
&& echo "Computed sha256sum: $(sha256sum ${BOSH_CLI_FILENAME})" \
2122
&& echo "${BOSH_CLI_SUM} ${BOSH_CLI_FILENAME}" | sha256sum -c - \
2223
&& chmod +x ${BOSH_CLI_FILENAME} \
2324
&& mv ${BOSH_CLI_FILENAME} /usr/local/bin/bosh
@@ -28,17 +29,19 @@ ENV CREDHUB_CLI_SUM 15cb96ea05a85020c83ef81d7a72f7da43a8671f8e60ed3f7ddc6660a0c8
2829
ENV CREDHUB_CLI_FILENAME credhub-linux-amd64-${CREDHUB_CLI_VERSION}.tgz
2930

3031
RUN wget -nv https://github.com/cloudfoundry/credhub-cli/releases/download/${CREDHUB_CLI_VERSION}/${CREDHUB_CLI_FILENAME} \
32+
&& echo "Computed sha256sum: $(sha256sum ${CREDHUB_CLI_FILENAME})" \
3133
&& echo "${CREDHUB_CLI_SUM} ${CREDHUB_CLI_FILENAME}" | sha256sum -c - \
3234
&& tar zxvf ${CREDHUB_CLI_FILENAME} \
3335
&& chmod +x credhub \
3436
&& mv credhub /usr/local/bin/credhub
3537

3638
# renovate: datasource=github-releases depName=mikefarah/yq
37-
ENV YQ_VERSION 4.44.5
38-
ENV YQ_SUM 638c4b251c49201fc94b598834b715f8f1c6e9b1854d2820772d2c79f0289002
39+
ENV YQ_VERSION 4.45.1
40+
ENV YQ_SUM 654d2943ca1d3be2024089eb4f270f4070f491a0610481d128509b2834870049
3941
ENV YQ_FILENAME yq_linux_amd64
4042
ENV YQ_REPO github.com/mikefarah/yq
4143
RUN wget -nv https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/${YQ_FILENAME} \
44+
&& echo "Computed sha256sum: $(sha256sum ${YQ_FILENAME})" \
4245
&& echo "${YQ_SUM} ${YQ_FILENAME}" | sha256sum -c - \
4346
&& chmod +x ${YQ_FILENAME} \
4447
&& mv ${YQ_FILENAME} /usr/local/bin/yq

k8s-tools/Dockerfile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ RUN apt-get update \
1313
WORKDIR /usr/local/bin
1414

1515
# renovate: datasource=github-releases depName=k14s/ytt
16-
ENV YTT_VERSION "0.51.0"
17-
ENV YTT_SUM f7ac37761607fefe06a4cc40840a3378a6e8365417d70d06f171cbc4d5469aca
16+
ENV YTT_VERSION "0.51.1"
17+
ENV YTT_SUM 026a12ee7108ff2d1150eb1347d544367d92e993ade7b2d2727c4c8d13a47a6b
1818
ENV YTT_FILENAME ytt-linux-amd64
1919
ADD https://github.com/k14s/ytt/releases/download/v${YTT_VERSION}/${YTT_FILENAME} .
2020
RUN echo "Computed sha256sum: $(sha256sum ${YTT_FILENAME})" \
@@ -41,13 +41,13 @@ RUN echo "Computed sha256sum: $(sha256sum ${KUSTOMIZE_FILENAME})" \
4141
&& tar zxvf ${KUSTOMIZE_FILENAME}
4242

4343
# renovate: datasource=github-releases depName=k14s/kapp
44-
ENV KAPP_VERSION 0.63.3
45-
ENV KAPP_SUM 33702a40b6032ada742d73c59afeb393d0830a1913e3a599ca995eba3e68a57e
46-
ENV KAPP_FILENAME kapp-linux-amd64
47-
ADD https://github.com/k14s/kapp/releases/download/v${KAPP_VERSION}/kapp-linux-amd64 .
48-
RUN echo "Computed sha256sum: $(sha256sum ${KAPP_FILENAME})" \
49-
&& echo "${KAPP_SUM} ${KAPP_FILENAME}" | sha256sum -c - \
50-
&& mv kapp-linux-amd64 kapp
44+
#ENV KAPP_VERSION 0.64.0
45+
#ENV KAPP_SUM 33702a40b6032ada742d73c59afeb393d0830a1913e3a599ca995eba3e68a57e
46+
#ENV KAPP_FILENAME kapp-linux-amd64
47+
#ADD https://github.com/k14s/kapp/releases/download/v${KAPP_VERSION}/kapp-linux-amd64 .
48+
#RUN echo "Computed sha256sum: $(sha256sum ${KAPP_FILENAME})" \
49+
# && echo "${KAPP_SUM} ${KAPP_FILENAME}" | sha256sum -c - \
50+
# && mv kapp-linux-amd64 kapp
5151

5252
# renovate: datasource=github-tags depName=kubernetes/kubectl
5353
ENV KUBECTL_VERSION 1.30.9
@@ -70,8 +70,8 @@ RUN echo "Computed sha256sum: $(sha256sum ${HELM_FILENAME})" \
7070
&& rm -rf linux-amd64
7171

7272
# renovate: datasource=github-releases depName=kudobuilder/kuttl
73-
ENV KUTTL_VERSION 0.19.0
74-
ENV KUTTL_PLUGIN_SUM 376162ead2a1681505c3a449c3f02f3b2e6c8f604963c5a729cf7be532b1ae29
73+
ENV KUTTL_VERSION 0.21.0
74+
ENV KUTTL_PLUGIN_SUM 5fdca46d6ee88c14e2f4aa6b2a398b205f0991fb5e078caf36cd87c9414b715c
7575
ENV KUTTL_PLUGIN_FILENAME kubectl-kuttl_${KUTTL_VERSION}_linux_x86_64
7676
ADD https://github.com/kudobuilder/kuttl/releases/download/v${KUTTL_VERSION}/${KUTTL_PLUGIN_FILENAME} .
7777
RUN echo "Computed ${KUTTL_PLUGIN_FILENAME} sha256sum: $(sha256sum ${KUTTL_PLUGIN_FILENAME})" \
@@ -80,8 +80,8 @@ RUN echo "Computed ${KUTTL_PLUGIN_FILENAME} sha256sum: $(sha256sum ${KUTTL_PLUGI
8080
&& ln -s kubectl-kuttl kuttl
8181

8282
# renovate: datasource=github-releases depName=mikefarah/yq
83-
ENV YQ_VERSION 4.44.5
84-
ENV YQ_SUM 638c4b251c49201fc94b598834b715f8f1c6e9b1854d2820772d2c79f0289002
83+
ENV YQ_VERSION 4.45.1
84+
ENV YQ_SUM 654d2943ca1d3be2024089eb4f270f4070f491a0610481d128509b2834870049
8585
ENV YQ_FILENAME yq_linux_amd64
8686
ADD https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/${YQ_FILENAME} .
8787
RUN echo "Computed ${YQ_FILENAME} sha256sum: $(sha256sum ${YQ_FILENAME})" \

k8s-tools/k8s-tools_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
require 'serverspec'
44

55
BOSH_CLI_VERSION="7.7.1" # renovate: datasource=github-releases depName=cloudfoundry/bosh-cli
6-
YTT_VERSION="0.51.0" # renovate: datasource=github-releases depName=k14s/ytt
6+
YTT_VERSION="0.51.1" # renovate: datasource=github-releases depName=k14s/ytt
77
CREDHUB_CLI_VERSION='2.9.39' # renovate: datasource=github-releases depName=cloudfoundry/credhub-cli
88
KUSTOMIZE_VERSION="5.0.3" # renovate: datasource=github-releases depName=kubernetes-sigs/kustomize
9-
KAPP_VERSION="0.63.3" # renovate: datasource=github-releases depName=k14s/kapp
9+
KAPP_VERSION="0.64.0" # renovate: datasource=github-releases depName=k14s/kapp
1010
KUBECTL_VERSION="1.30.9" # renovate: datasource=github-tags depName=kubernetes/kubectl
1111
HELM_VERSION="3.14.4" # renovate: datasource=github-releases depName=helm/helm
12-
KUTTL_VERSION="0.19.0" # renovate: datasource=github-releases depName=kudobuilder/kuttl
12+
KUTTL_VERSION="0.21.0" # renovate: datasource=github-releases depName=kudobuilder/kuttl
1313
RUBY_VERSION = "3.1"
1414

1515
DEPS = "unzip curl openssl ca-certificates git libc6 bash jq gettext"
@@ -51,10 +51,10 @@
5151
).to match("v#{KUSTOMIZE_VERSION}\n")
5252
end
5353

54-
it "has the expected version of Kapp (#{KAPP_VERSION})" do
54+
it "has NOT the expected version of Kapp (#{KAPP_VERSION})" do
5555
expect(
56-
command("kapp --version").stdout
57-
).to match(/#{KAPP_VERSION}/)
56+
command("kapp --version").stderr
57+
).to match(/kapp: not found/)
5858
end
5959

6060
it "has the expected version of helm (#{HELM_VERSION})" do

0 commit comments

Comments
 (0)