From dc7819e54eef113a68838df5505931d266552533 Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Wed, 28 Oct 2026 14:45:30 -0400 Subject: [PATCH 1/3] build(deps): bump Go to 1.27.2 Co-Authored-By: Claude Opus 5.5 Signed-off-by: Josh Baird --- .devcontainer/devcontainer.json | 2 +- cmd/fluent-manager/Dockerfile | 2 +- cmd/fluent-watcher/fluentbit/Dockerfile | 2 +- cmd/fluent-watcher/fluentbit/Dockerfile.debug | 2 +- cmd/fluent-watcher/fluentd/Dockerfile | 2 +- docs/best-practice/forwarding-logs-via-http/Dockerfile | 2 +- go.mod | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 3a050eadf..e78204239 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Kubebuilder DevContainer", - "image": "docker.io/golang:1.26.6", + "image": "docker.io/golang:1.27.2", "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": {}, "ghcr.io/devcontainers/features/git:1": {} diff --git a/cmd/fluent-manager/Dockerfile b/cmd/fluent-manager/Dockerfile index a3ae1fe5b..40763aa8a 100644 --- a/cmd/fluent-manager/Dockerfile +++ b/cmd/fluent-manager/Dockerfile @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.26.6 +ARG GO_VERSION=1.27.2 # Build the manager binary \ FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine3.23 AS builder diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile b/cmd/fluent-watcher/fluentbit/Dockerfile index 07ce8a9f2..2a5f7d3bd 100644 --- a/cmd/fluent-watcher/fluentbit/Dockerfile +++ b/cmd/fluent-watcher/fluentbit/Dockerfile @@ -1,5 +1,5 @@ ARG FLUENT_BIT_BASE_VERSION=3.2.4 \ - GO_VERSION=1.26.6 + GO_VERSION=1.27.2 FROM golang:${GO_VERSION}-alpine3.23 AS buildergo RUN mkdir -p /fluent-bit diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile.debug b/cmd/fluent-watcher/fluentbit/Dockerfile.debug index dcaa81256..b85cba656 100644 --- a/cmd/fluent-watcher/fluentbit/Dockerfile.debug +++ b/cmd/fluent-watcher/fluentbit/Dockerfile.debug @@ -1,5 +1,5 @@ ARG FLUENT_BIT_BASE_VERSION=3.2.4 \ - GO_VERSION=1.26.6 + GO_VERSION=1.27.2 FROM golang:${GO_VERSION}-alpine3.23 AS buildergo RUN mkdir -p /fluent-bit diff --git a/cmd/fluent-watcher/fluentd/Dockerfile b/cmd/fluent-watcher/fluentd/Dockerfile index 5df5e4231..9dc782907 100644 --- a/cmd/fluent-watcher/fluentd/Dockerfile +++ b/cmd/fluent-watcher/fluentd/Dockerfile @@ -1,5 +1,5 @@ ARG FLUENTD_BASE_VERSION \ - GO_VERSION=1.26.6 + GO_VERSION=1.27.2 FROM golang:${GO_VERSION} AS builder diff --git a/docs/best-practice/forwarding-logs-via-http/Dockerfile b/docs/best-practice/forwarding-logs-via-http/Dockerfile index 7f19ee2b3..a6e5cb01d 100644 --- a/docs/best-practice/forwarding-logs-via-http/Dockerfile +++ b/docs/best-practice/forwarding-logs-via-http/Dockerfile @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.26.6 +ARG GO_VERSION=1.27.2 # Build the manager binary FROM golang:${GO_VERSION} AS builder diff --git a/go.mod b/go.mod index 75cbf0da8..7acdd9548 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/fluent/fluent-operator/v3 -go 1.26.6 +go 1.27.2 require ( github.com/fsnotify/fsnotify v1.10.1 From 1f7dd2fc61d1dea9b7f78115e7488c89f5d29643 Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Wed, 28 Oct 2026 15:42:17 -0400 Subject: [PATCH 2/3] build(deps): bump golangci-lint to v2.15.0 v2.13.2 can't read Go 1.27.2 export data (v5). Co-Authored-By: Claude Opus 5.5 Signed-off-by: Josh Baird --- .github/workflows/lint.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 81caaca91..ca469e9bf 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -24,7 +24,7 @@ jobs: - name: Run linter uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9.3.0 with: - version: v2.13.2 + version: v2.15.0 actionlint: name: Lint GitHub Actions workflows diff --git a/Makefile b/Makefile index 55b22f40c..342bab89b 100644 --- a/Makefile +++ b/Makefile @@ -240,7 +240,7 @@ CONTROLLER_TOOLS_VERSION ?= v0.18.0 ENVTEST_VERSION ?= $(shell go list -m -f "{{ .Version }}" sigs.k8s.io/controller-runtime | awk -F'[v.]' '{printf "release-%d.%d", $$2, $$3}') #ENVTEST_K8S_VERSION is the version of Kubernetes to use for setting up ENVTEST binaries (i.e. 1.31) ENVTEST_K8S_VERSION ?= $(shell go list -m -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d", $$3}') -GOLANGCI_LINT_VERSION ?= v2.13.2 +GOLANGCI_LINT_VERSION ?= v2.15.0 GINKGO_VERSION ?= v2.27.2 CODE_GENERATOR_VERSION ?= v0.32.3 KIND_VERSION ?= v0.30.0 From 7e55269b010aa2583c25098711a273e83677f140 Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Wed, 28 Oct 2026 15:48:04 -0400 Subject: [PATCH 3/3] fix(fluent-watcher): log fluentd watcher error Satisfies errcheck in golangci-lint v2.15.0. Co-Authored-By: Claude Opus 5.5 Signed-off-by: Josh Baird --- cmd/fluent-watcher/fluentd/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/fluent-watcher/fluentd/main.go b/cmd/fluent-watcher/fluentd/main.go index 395de99e0..5fa0e6f5e 100644 --- a/cmd/fluent-watcher/fluentd/main.go +++ b/cmd/fluent-watcher/fluentd/main.go @@ -149,8 +149,8 @@ func main() { reloadOrStop() resetTimer() _ = level.Info(logger).Log("msg", "Config file changed, gracefully reloaded configuration") - case <-watcher.Errors(): - _ = level.Error(logger).Log("msg", "Watcher stopped") + case err := <-watcher.Errors(): + _ = level.Error(logger).Log("msg", "Watcher stopped", "err", err) return nil } }