From f59af607e68c38aa29f6cac8ce578d723c73eb8f Mon Sep 17 00:00:00 2001 From: Clemens Beck Date: Mon, 16 Oct 2023 14:43:20 +0200 Subject: [PATCH] Update kubectl from 1.24.17 to 1.25.14 Update kubectl and configure deps io to create MRs for 1.25.x patches automatically. Closes https://gitlab.com/gitlab-org/build/CNG/-/issues/718 Changelog: changed --- ci_files/variables.yml | 2 +- deps.yml | 2 +- kubectl/Dockerfile | 2 +- kubectl/Dockerfile.build.ubi8 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci_files/variables.yml b/ci_files/variables.yml index ccf626663..bac484e7f 100644 --- a/ci_files/variables.yml +++ b/ci_files/variables.yml @@ -37,7 +37,7 @@ variables: NEXT_RUBY_CACHE_KEY: "3.0" RUST_VERSION: 1.65.0 PYTHON_VERSION: "3.9.18" - KUBECTL_VERSION: "1.24.17" + KUBECTL_VERSION: "1.25.14" YQ_VERSION: "4.35.2" PG_VERSION: "15.1" CA_PKG_VERSION: "20220614-r0" diff --git a/deps.yml b/deps.yml index a959cef12..bd0fd75e2 100644 --- a/deps.yml +++ b/deps.yml @@ -137,7 +137,7 @@ dependencies: matching: 'kubernetes-(\S+)' sort_as: '$1' output_as: '$1' - range: '< 1.25.0' + range: '< 1.26.0' - <<: *kubectl-replace filename: kubectl/Dockerfile.build.ubi8 pattern: 'ARG KUBECTL_VERSION=(\S+)' diff --git a/kubectl/Dockerfile b/kubectl/Dockerfile index 3b8f71148..f96a0c26c 100644 --- a/kubectl/Dockerfile +++ b/kubectl/Dockerfile @@ -1,7 +1,7 @@ ## FINAL IMAGE ## ARG DEBIAN_IMAGE=debian:bullseye-slim -ARG KUBECTL_VERSION="1.24.17" +ARG KUBECTL_VERSION="1.25.14" ARG YQ_VERSION="4.35.2" FROM --platform=${TARGETPLATFORM} ${DEBIAN_IMAGE} diff --git a/kubectl/Dockerfile.build.ubi8 b/kubectl/Dockerfile.build.ubi8 index 62c2deff3..fc99b562e 100644 --- a/kubectl/Dockerfile.build.ubi8 +++ b/kubectl/Dockerfile.build.ubi8 @@ -2,7 +2,7 @@ ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.8 FROM ${UBI_IMAGE} -ARG KUBECTL_VERSION=1.24.17 +ARG KUBECTL_VERSION=1.25.14 ARG YQ_VERSION=4.35.2 ADD https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl /assets/usr/local/bin/kubectl -- GitLab