Skip to content

Commit 3e0d2d5

Browse files
committed
chore(deps): update all non-major dependencies
1 parent 29bc681 commit 3e0d2d5

File tree

12 files changed

+26
-22
lines changed

12 files changed

+26
-22
lines changed

.github/actions/kind-create/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ runs:
2525
- name: Set up Docker Buildx
2626
uses: docker/setup-buildx-action@v3
2727
- name: Setup Kind
28-
uses: helm/kind-action@v1.12.0
28+
uses: helm/kind-action@v1.13.0
2929
with:
3030
cluster_name: ${{ inputs.kind_cluster_name }}
3131
version: v0.30.0

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.25@sha256:6bac879c5b77e0fc9c556a5ed8920e89dab1709bd510a854903509c828f67f96 AS builder
2+
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.25@sha256:e68f6a00e88586577fafa4d9cefad1349c2be70d21244321321c407474ff9bf2 AS builder
33

44
ARG BUILDPLATFORM
55
ARG TARGETPLATFORM

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ RELEASE_MSG ?= "koperator release"
1818
REL_TAG = $(shell ./scripts/increment_version.sh -${RELEASE_TYPE} ${TAG})
1919

2020
# Version constants
21-
GOLANGCI_VERSION = 2.6.0 # renovate: datasource=github-releases depName=golangci/golangci-lint
21+
GOLANGCI_VERSION = 2.6.1 # renovate: datasource=github-releases depName=golangci/golangci-lint
2222
LICENSEI_VERSION = 0.9.0 # renovate: datasource=github-releases depName=goph/licensei
2323
CONTROLLER_GEN_VERSION = v0.19.0 # renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools
24-
ENVTEST_K8S_VERSION = 1.34.1 # renovate: datasource=github-releases depName=kubernetes/kubernetes
24+
ENVTEST_K8S_VERSION = 1.34.1 # renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools extractVersion=^envtest-v(?<version>.+)$
2525
SETUP_ENVTEST_VERSION := latest
2626
ADDLICENSE_VERSION := 1.2.0 # renovate: datasource=github-releases depName=google/addlicense
2727
GOTEMPLATE_VERSION := 3.12.0 # renovate: datasource=github-releases depName=cznic/gotemplate

api/v1beta1/kafkacluster_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const (
6262
DefaultMonitorImage = "ghcr.io/adobe/koperator/jmx-javaagent:1.4.0" // renovate: datasource=docker depName=ghcr.io/adobe/koperator/jmx-javaagent
6363

6464
// DefaultEnvoyImage is the default Envoy proxy image used when users don't specify it in EnvoyConfig.Image
65-
DefaultEnvoyImage = "envoyproxy/envoy:v1.22.2" // renovate: datasource=docker depName=envoyproxy/envoy
65+
DefaultEnvoyImage = "envoyproxy/envoy:v1.36.2" // renovate: datasource=docker depName=envoyproxy/envoy
6666

6767
// ControllerNodeProcessRole represents the node is a controller node
6868
ControllerNodeProcessRole = "controller"

docker/jmx_exporter/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG JMX_EXPORTER_VERSION=1.5.0 # renovate: datasource=github-releases depName=prometheus/jmx_exporter
22

3-
FROM maven:3-amazoncorretto-21@sha256:0d4b06890e8ecece68c7854e606f09dcdbc11644c98fb4a96a24193f3084275a AS build
3+
FROM maven:3-amazoncorretto-21@sha256:c7fb7661ddc880221e4517cc146d3debda3fcf0142aca98b140335078fac55d1 AS build
44
ARG JMX_EXPORTER_VERSION
55

66
# Install wget to download the release tarball

docker/kafka/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN apk add --no-cache gnupg wget && \
2828

2929

3030
# backported from https://github.com/docker-library/openjdk/blob/master/18/jdk/slim-bullseye/Dockerfile
31-
FROM debian:bullseye-slim@sha256:52927eff8153b563244f98cdc802ba97918afcdf67f9e4867cbf1f7afb3d147b
31+
FROM debian:bullseye-slim@sha256:75e0b7a6158b4cc911d4be07d9f6b8a65254eb8c58df14023c3da5c462335593
3232

3333
ARG scala_version
3434
ARG kafka_version
Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
FROM maven:3.8-jdk-11-slim@sha256:2cb7c73ba2fd0f7ae64cfabd99180030ec85841a1197b4ae821d21836cb0aa3b as build
1+
FROM maven:3.9-eclipse-temurin-21-alpine as build
2+
3+
# Set working directory
4+
WORKDIR /usr/src/myapp
25

36
# Resolve all the dependencies and cache them to save a LOT of time
4-
COPY pom.xml /usr/src/myapp/
5-
RUN mvn -f /usr/src/myapp/pom.xml dependency:resolve dependency:resolve-plugins
7+
COPY pom.xml .
8+
RUN mvn dependency:resolve dependency:resolve-plugins
69

710
# Build the application, usually only this part gets rebuilt locally, use offline mode and skip tests
8-
COPY src /usr/src/myapp/src
9-
RUN mvn -f /usr/src/myapp/pom.xml clean package -DskipTests
11+
COPY src ./src
12+
RUN mvn clean package -DskipTests
1013

1114
# The final image should have minimal layers
12-
FROM openjdk:11-jre-slim@sha256:93af7df2308c5141a751c4830e6b6c5717db102b3b31f012ea29d842dc4f2b02
13-
RUN apt-get update && apt-get install curl -y
15+
FROM eclipse-temurin:21-jre-alpine
16+
RUN apk add --no-cache curl
1417
COPY --from=build /usr/src/myapp/target/kafka-avro-0.0.1-SNAPSHOT.jar app.jar
15-
ENTRYPOINT java -jar app.jar
18+
ENTRYPOINT ["java", "-jar", "app.jar"]

docs/examples/springboot-kafka-avro/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<description>Demo project for Spring Boot</description>
1616

1717
<properties>
18-
<java.version>1.8</java.version>
18+
<java.version>21</java.version>
1919
</properties>
2020

2121
<dependencies>

hack/kafka-test-pod/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.25@sha256:6bac879c5b77e0fc9c556a5ed8920e89dab1709bd510a854903509c828f67f96 as builder
1+
FROM golang:1.25@sha256:e68f6a00e88586577fafa4d9cefad1349c2be70d21244321321c407474ff9bf2 as builder
22

33
WORKDIR /workspace
44

renovate.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@
2222
"/(^|/)Dockerfile$/"
2323
],
2424
"matchStrings": [
25-
"(?<depName>\\w+)_VERSION\\s*=\\s*(?<currentValue>[^\\s]+)\\s*#\\s*renovate:\\s*datasource=(?<datasource>[^\\s]+)\\s*depName=(?<packageName>[^\\s]+)"
25+
"(?<depName>[A-Z][A-Z0-9_]*)_VERSION\\s*=\\s*(?<currentValue>[^\\s]+)\\s*#\\s*renovate:\\s*datasource=(?<datasource>[^\\s]+)\\s*depName=(?<packageName>[^\\s]+)(?:\\s*extractVersion=(?<extractVersion>[^\\s]+))?"
2626
],
2727
"datasourceTemplate": "{{datasource}}",
28-
"depNameTemplate": "{{packageName}}"
28+
"depNameTemplate": "{{packageName}}",
29+
"extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{/if}}"
2930
},
3031
{
3132
"customType": "regex",

0 commit comments

Comments
 (0)