diff --git a/.tool-versions b/.tool-versions index 758ab370d..010d49ff5 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -golang 1.25.2 +golang 1.25.3 diff --git a/Dockerfile b/Dockerfile index 5754bdae1..5052d54e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.25.2-alpine3.22@sha256:6104e2bbe9f6a07a009159692fe0df1a97b77f5b7409ad804b17d6916c635ae5 AS builder +FROM --platform=$BUILDPLATFORM golang:1.25.3-alpine3.22@sha256:aee43c3ccbf24fdffb7295693b6e33b21e01baec1b2a55acc351fde345e9ec34 AS builder RUN apk add --update --no-cache ca-certificates make git curl diff --git a/e2e/go.mod b/e2e/go.mod index ad069ad8d..4813aaad7 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -6,9 +6,9 @@ require ( emperror.dev/errors v0.8.1 github.com/MakeNowJust/heredoc v1.0.0 github.com/cisco-open/operator-tools v0.37.0 - github.com/kube-logging/logging-operator v0.0.0-20251007182507-34ac4af0e925 + github.com/kube-logging/logging-operator daed40d20c26 github.com/kube-logging/logging-operator/pkg/sdk v0.12.0 - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.86.0 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.86.1 github.com/spf13/cast v1.10.0 github.com/stretchr/testify v1.11.1 helm.sh/helm/v3 v3.19.0 @@ -16,7 +16,7 @@ require ( k8s.io/apiextensions-apiserver v0.34.1 k8s.io/apimachinery v0.34.1 k8s.io/client-go v0.34.1 - sigs.k8s.io/controller-runtime v0.22.2 + sigs.k8s.io/controller-runtime v0.22.3 sigs.k8s.io/e2e-framework v0.6.0 ) diff --git a/go.mod b/go.mod index 51ef9042d..62b09af9f 100644 --- a/go.mod +++ b/go.mod @@ -10,22 +10,22 @@ require ( github.com/go-logr/logr v1.4.3 github.com/kube-logging/logging-operator/pkg/sdk v0.12.0 github.com/kube-logging/logging-operator/pkg/sdk/logging/model/syslogng/config v0.0.0 - github.com/kube-logging/telemetry-controller v0.0.0-20251002105359-c2bf45b8409c + github.com/kube-logging/telemetry-controller 55fe5c812077 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.38.2 github.com/pborman/uuid v1.2.1 - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.86.0 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.86.1 github.com/prometheus/client_golang v1.23.2 github.com/siliconbrain/go-seqs v0.15.0 github.com/spf13/cast v1.10.0 github.com/stretchr/testify v1.11.1 - golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9 + golang.org/x/exp 90e834f514db k8s.io/api v0.34.1 k8s.io/apiextensions-apiserver v0.34.1 k8s.io/apimachinery v0.34.1 k8s.io/client-go v0.34.1 k8s.io/klog/v2 v2.130.1 - sigs.k8s.io/controller-runtime v0.22.2 + sigs.k8s.io/controller-runtime v0.22.3 ) require ( diff --git a/images/config-reloader/Dockerfile b/images/config-reloader/Dockerfile index e11cfa5b4..0047d1780 100644 --- a/images/config-reloader/Dockerfile +++ b/images/config-reloader/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25.2-alpine3.22@sha256:6104e2bbe9f6a07a009159692fe0df1a97b77f5b7409ad804b17d6916c635ae5 AS builder +FROM golang:1.25.3-alpine3.22@sha256:aee43c3ccbf24fdffb7295693b6e33b21e01baec1b2a55acc351fde345e9ec34 AS builder WORKDIR /workspace diff --git a/images/fluentd-drain-watch/Dockerfile b/images/fluentd-drain-watch/Dockerfile index 7d50d2051..d345b8d5e 100644 --- a/images/fluentd-drain-watch/Dockerfile +++ b/images/fluentd-drain-watch/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.22.1@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1 +FROM alpine:3.22.2@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412 RUN apk add curl diff --git a/images/fluentd/outputs/Gemfile b/images/fluentd/outputs/Gemfile index 04dd573a9..26c3619e8 100644 --- a/images/fluentd/outputs/Gemfile +++ b/images/fluentd/outputs/Gemfile @@ -21,7 +21,7 @@ gem 'fluent-plugin-lm-logs', '1.2.8' gem 'fluent-plugin-gelf-best', '1.4.1' gem 'fluent-plugin-s3', '1.8.3' gem 'fluent-plugin-gcs', '0.4.4' -gem 'rdkafka', '0.23.1' +gem 'rdkafka', '0.24.1' gem 'fluent-plugin-rabbitmq', '0.1.5' #gem 'fluent-plugin-aws-elasticsearch-service', '2.4.1' #gem 'fluent-plugin-logdna', '~> 0.4.0' diff --git a/images/fluentd/outputs/Gemfile.lock b/images/fluentd/outputs/Gemfile.lock index bc6aeb5b2..6260f764a 100644 --- a/images/fluentd/outputs/Gemfile.lock +++ b/images/fluentd/outputs/Gemfile.lock @@ -371,7 +371,7 @@ GEM json-jwt (>= 1.11.0) rack (>= 2.1.0) rake (13.3.0) - rdkafka (0.23.1) + rdkafka (0.24.1) ffi (~> 1.15) json (> 2.0) logger @@ -460,7 +460,7 @@ DEPENDENCIES fluent-plugin-vmware-log-intelligence (= 2.0.8) fluent-plugin-vmware-loginsight (= 1.4.2) fluent-plugin-webhdfs (= 1.6.0) - rdkafka (= 0.23.1) + rdkafka (= 0.24.1) BUNDLED WITH 2.5.23 diff --git a/images/syslog-ng-reloader/Dockerfile b/images/syslog-ng-reloader/Dockerfile index 6d561b071..120b3e5fa 100644 --- a/images/syslog-ng-reloader/Dockerfile +++ b/images/syslog-ng-reloader/Dockerfile @@ -1,6 +1,6 @@ FROM ghcr.io/kube-logging/custom-runner:v0.13.0 AS custom-runner -FROM alpine:3.22.1@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1 +FROM alpine:3.22.2@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412 RUN apk add socat diff --git a/pkg/sdk/go.mod b/pkg/sdk/go.mod index 195877328..e2fcd91d6 100644 --- a/pkg/sdk/go.mod +++ b/pkg/sdk/go.mod @@ -9,18 +9,18 @@ require ( github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 github.com/cisco-open/operator-tools v0.37.0 github.com/go-logr/zapr v1.3.0 - github.com/kube-logging/logging-operator v0.0.0-20251007182507-34ac4af0e925 + github.com/kube-logging/logging-operator daed40d20c26 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.38.2 - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.86.0 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.86.1 github.com/spf13/cast v1.10.0 github.com/stretchr/testify v1.11.1 go.uber.org/zap v1.27.0 - golang.org/x/net v0.45.0 + golang.org/x/net v0.46.0 k8s.io/api v0.34.1 k8s.io/apimachinery v0.34.1 k8s.io/client-go v0.34.1 - sigs.k8s.io/controller-runtime v0.22.2 + sigs.k8s.io/controller-runtime v0.22.3 sigs.k8s.io/yaml v1.6.0 ) diff --git a/pkg/sdk/logging/model/syslogng/config/go.mod b/pkg/sdk/logging/model/syslogng/config/go.mod index 135043295..44a61795c 100644 --- a/pkg/sdk/logging/model/syslogng/config/go.mod +++ b/pkg/sdk/logging/model/syslogng/config/go.mod @@ -9,10 +9,10 @@ require ( github.com/kube-logging/logging-operator/pkg/sdk v0.12.0 github.com/siliconbrain/go-seqs v0.15.0 github.com/stretchr/testify v1.11.1 - golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9 + golang.org/x/exp 90e834f514db k8s.io/api v0.34.1 k8s.io/apimachinery v0.34.1 - sigs.k8s.io/controller-runtime v0.22.2 + sigs.k8s.io/controller-runtime v0.22.3 ) require (