From 3e0d2d53713e9e8625f63d38897abe002f012fa6 Mon Sep 17 00:00:00 2001 From: Adi Muraru Date: Fri, 14 Nov 2025 11:37:59 +0100 Subject: [PATCH] chore(deps): update all non-major dependencies --- .github/actions/kind-create/action.yaml | 2 +- Dockerfile | 2 +- Makefile | 4 ++-- api/v1beta1/kafkacluster_types.go | 2 +- docker/jmx_exporter/Dockerfile | 2 +- docker/kafka/Dockerfile | 2 +- .../examples/springboot-kafka-avro/Dockerfile | 19 +++++++++++-------- docs/examples/springboot-kafka-avro/pom.xml | 2 +- hack/kafka-test-pod/Dockerfile | 2 +- renovate.json | 5 +++-- tests/e2e/versions.go | 4 ++-- .../deploy/docker-compose.yml | 2 +- 12 files changed, 26 insertions(+), 22 deletions(-) diff --git a/.github/actions/kind-create/action.yaml b/.github/actions/kind-create/action.yaml index 5e133cf13..c1b84160d 100644 --- a/.github/actions/kind-create/action.yaml +++ b/.github/actions/kind-create/action.yaml @@ -25,7 +25,7 @@ runs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Setup Kind - uses: helm/kind-action@v1.12.0 + uses: helm/kind-action@v1.13.0 with: cluster_name: ${{ inputs.kind_cluster_name }} version: v0.30.0 diff --git a/Dockerfile b/Dockerfile index 7c3e172c3..f66184303 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.25@sha256:6bac879c5b77e0fc9c556a5ed8920e89dab1709bd510a854903509c828f67f96 AS builder +FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.25@sha256:e68f6a00e88586577fafa4d9cefad1349c2be70d21244321321c407474ff9bf2 AS builder ARG BUILDPLATFORM ARG TARGETPLATFORM diff --git a/Makefile b/Makefile index 1922767e5..c48a89b1c 100644 --- a/Makefile +++ b/Makefile @@ -18,10 +18,10 @@ RELEASE_MSG ?= "koperator release" REL_TAG = $(shell ./scripts/increment_version.sh -${RELEASE_TYPE} ${TAG}) # Version constants -GOLANGCI_VERSION = 2.6.0 # renovate: datasource=github-releases depName=golangci/golangci-lint +GOLANGCI_VERSION = 2.6.1 # renovate: datasource=github-releases depName=golangci/golangci-lint LICENSEI_VERSION = 0.9.0 # renovate: datasource=github-releases depName=goph/licensei CONTROLLER_GEN_VERSION = v0.19.0 # renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools -ENVTEST_K8S_VERSION = 1.34.1 # renovate: datasource=github-releases depName=kubernetes/kubernetes +ENVTEST_K8S_VERSION = 1.34.1 # renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools extractVersion=^envtest-v(?.+)$ SETUP_ENVTEST_VERSION := latest ADDLICENSE_VERSION := 1.2.0 # renovate: datasource=github-releases depName=google/addlicense GOTEMPLATE_VERSION := 3.12.0 # renovate: datasource=github-releases depName=cznic/gotemplate diff --git a/api/v1beta1/kafkacluster_types.go b/api/v1beta1/kafkacluster_types.go index c629d6b6e..a73290471 100644 --- a/api/v1beta1/kafkacluster_types.go +++ b/api/v1beta1/kafkacluster_types.go @@ -62,7 +62,7 @@ const ( DefaultMonitorImage = "ghcr.io/adobe/koperator/jmx-javaagent:1.4.0" // renovate: datasource=docker depName=ghcr.io/adobe/koperator/jmx-javaagent // DefaultEnvoyImage is the default Envoy proxy image used when users don't specify it in EnvoyConfig.Image - DefaultEnvoyImage = "envoyproxy/envoy:v1.22.2" // renovate: datasource=docker depName=envoyproxy/envoy + DefaultEnvoyImage = "envoyproxy/envoy:v1.36.2" // renovate: datasource=docker depName=envoyproxy/envoy // ControllerNodeProcessRole represents the node is a controller node ControllerNodeProcessRole = "controller" diff --git a/docker/jmx_exporter/Dockerfile b/docker/jmx_exporter/Dockerfile index 031278085..7f9b6696b 100644 --- a/docker/jmx_exporter/Dockerfile +++ b/docker/jmx_exporter/Dockerfile @@ -1,6 +1,6 @@ ARG JMX_EXPORTER_VERSION=1.5.0 # renovate: datasource=github-releases depName=prometheus/jmx_exporter -FROM maven:3-amazoncorretto-21@sha256:0d4b06890e8ecece68c7854e606f09dcdbc11644c98fb4a96a24193f3084275a AS build +FROM maven:3-amazoncorretto-21@sha256:c7fb7661ddc880221e4517cc146d3debda3fcf0142aca98b140335078fac55d1 AS build ARG JMX_EXPORTER_VERSION # Install wget to download the release tarball diff --git a/docker/kafka/Dockerfile b/docker/kafka/Dockerfile index 3e3a0d6df..ed89b5c96 100644 --- a/docker/kafka/Dockerfile +++ b/docker/kafka/Dockerfile @@ -28,7 +28,7 @@ RUN apk add --no-cache gnupg wget && \ # backported from https://github.com/docker-library/openjdk/blob/master/18/jdk/slim-bullseye/Dockerfile -FROM debian:bullseye-slim@sha256:52927eff8153b563244f98cdc802ba97918afcdf67f9e4867cbf1f7afb3d147b +FROM debian:bullseye-slim@sha256:75e0b7a6158b4cc911d4be07d9f6b8a65254eb8c58df14023c3da5c462335593 ARG scala_version ARG kafka_version diff --git a/docs/examples/springboot-kafka-avro/Dockerfile b/docs/examples/springboot-kafka-avro/Dockerfile index e9467e7be..6750419bd 100644 --- a/docs/examples/springboot-kafka-avro/Dockerfile +++ b/docs/examples/springboot-kafka-avro/Dockerfile @@ -1,15 +1,18 @@ -FROM maven:3.8-jdk-11-slim@sha256:2cb7c73ba2fd0f7ae64cfabd99180030ec85841a1197b4ae821d21836cb0aa3b as build +FROM maven:3.9-eclipse-temurin-21-alpine as build + +# Set working directory +WORKDIR /usr/src/myapp # Resolve all the dependencies and cache them to save a LOT of time -COPY pom.xml /usr/src/myapp/ -RUN mvn -f /usr/src/myapp/pom.xml dependency:resolve dependency:resolve-plugins +COPY pom.xml . +RUN mvn dependency:resolve dependency:resolve-plugins # Build the application, usually only this part gets rebuilt locally, use offline mode and skip tests -COPY src /usr/src/myapp/src -RUN mvn -f /usr/src/myapp/pom.xml clean package -DskipTests +COPY src ./src +RUN mvn clean package -DskipTests # The final image should have minimal layers -FROM openjdk:11-jre-slim@sha256:93af7df2308c5141a751c4830e6b6c5717db102b3b31f012ea29d842dc4f2b02 -RUN apt-get update && apt-get install curl -y +FROM eclipse-temurin:21-jre-alpine +RUN apk add --no-cache curl COPY --from=build /usr/src/myapp/target/kafka-avro-0.0.1-SNAPSHOT.jar app.jar -ENTRYPOINT java -jar app.jar \ No newline at end of file +ENTRYPOINT ["java", "-jar", "app.jar"] \ No newline at end of file diff --git a/docs/examples/springboot-kafka-avro/pom.xml b/docs/examples/springboot-kafka-avro/pom.xml index f8443d2d2..3905f0aa7 100644 --- a/docs/examples/springboot-kafka-avro/pom.xml +++ b/docs/examples/springboot-kafka-avro/pom.xml @@ -15,7 +15,7 @@ Demo project for Spring Boot - 1.8 + 21 diff --git a/hack/kafka-test-pod/Dockerfile b/hack/kafka-test-pod/Dockerfile index d82dd55bf..c9789527f 100644 --- a/hack/kafka-test-pod/Dockerfile +++ b/hack/kafka-test-pod/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25@sha256:6bac879c5b77e0fc9c556a5ed8920e89dab1709bd510a854903509c828f67f96 as builder +FROM golang:1.25@sha256:e68f6a00e88586577fafa4d9cefad1349c2be70d21244321321c407474ff9bf2 as builder WORKDIR /workspace diff --git a/renovate.json b/renovate.json index 5e689356c..4615d0e7e 100644 --- a/renovate.json +++ b/renovate.json @@ -22,10 +22,11 @@ "/(^|/)Dockerfile$/" ], "matchStrings": [ - "(?\\w+)_VERSION\\s*=\\s*(?[^\\s]+)\\s*#\\s*renovate:\\s*datasource=(?[^\\s]+)\\s*depName=(?[^\\s]+)" + "(?[A-Z][A-Z0-9_]*)_VERSION\\s*=\\s*(?[^\\s]+)\\s*#\\s*renovate:\\s*datasource=(?[^\\s]+)\\s*depName=(?[^\\s]+)(?:\\s*extractVersion=(?[^\\s]+))?" ], "datasourceTemplate": "{{datasource}}", - "depNameTemplate": "{{packageName}}" + "depNameTemplate": "{{packageName}}", + "extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{/if}}" }, { "customType": "regex", diff --git a/tests/e2e/versions.go b/tests/e2e/versions.go index a319f82d1..108bb805b 100644 --- a/tests/e2e/versions.go +++ b/tests/e2e/versions.go @@ -19,13 +19,13 @@ package e2e // These versions are monitored by Renovate for automatic updates const ( // CertManagerVersion is the version of cert-manager Helm chart - CertManagerVersion = "v1.18.2" // renovate: datasource=helm depName=cert-manager registryUrl=https://charts.jetstack.io + CertManagerVersion = "v1.19.1" // renovate: datasource=helm depName=cert-manager registryUrl=https://charts.jetstack.io // ContourVersion is the version of Contour ingress controller Helm chart ContourVersion = "0.1.0" // renovate: datasource=helm depName=contour registryUrl=https://projectcontour.github.io/helm-charts // PrometheusOperatorVersion is the version of kube-prometheus-stack Helm chart - PrometheusOperatorVersion = "77.12.0" // renovate: datasource=helm depName=kube-prometheus-stack registryUrl=https://prometheus-community.github.io/helm-charts + PrometheusOperatorVersion = "77.14.0" // renovate: datasource=helm depName=kube-prometheus-stack registryUrl=https://prometheus-community.github.io/helm-charts // ZookeeperOperatorVersion is the version of zookeeper-operator ZookeeperOperatorVersion = "0.2.15-adobe-20250923" // renovate: datasource=docker depName=ghcr.io/adobe/helm-charts/zookeeper-operator diff --git a/third_party/github.com/banzaicloud/go-cruise-control/deploy/docker-compose.yml b/third_party/github.com/banzaicloud/go-cruise-control/deploy/docker-compose.yml index acbb669de..61734fd91 100644 --- a/third_party/github.com/banzaicloud/go-cruise-control/deploy/docker-compose.yml +++ b/third_party/github.com/banzaicloud/go-cruise-control/deploy/docker-compose.yml @@ -1,6 +1,6 @@ services: zookeeper: - image: zookeeper:3.9.4@sha256:2408ba6f6eb91a4dbf65548428b90f9e5e9cf9d77e5f280a4bf80270d465a80f + image: ghcr.io/adobe/zookeeper-operator/zookeeper:3.8.4-0.2.15-adobe-20250923 restart: unless-stopped hostname: zookeeper container_name: zookeeper