From cce6f396df4fc49a50769a0930a65ee9baef853f Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Wed, 27 May 2026 13:14:29 -0400 Subject: [PATCH 1/2] Bump to go 1.26.3. 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 9b15e9933..1bfd30c39 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Kubebuilder DevContainer", - "image": "docker.io/golang:1.26.2", + "image": "docker.io/golang:1.26.3", "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 ec20ee0a5..90343c324 100644 --- a/cmd/fluent-manager/Dockerfile +++ b/cmd/fluent-manager/Dockerfile @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.26.2 +ARG GO_VERSION=1.26.3 # 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 bafebb0a3..0a2f3c558 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.2 + GO_VERSION=1.26.3 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 b9c44931c..bc79e401f 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.2 + GO_VERSION=1.26.3 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 1cc2e06b1..c80668f7b 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.2 + GO_VERSION=1.26.3 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 db83c6441..334d3d9fa 100644 --- a/docs/best-practice/forwarding-logs-via-http/Dockerfile +++ b/docs/best-practice/forwarding-logs-via-http/Dockerfile @@ -1,4 +1,4 @@ -GO_VERSION=1.26.2 +GO_VERSION=1.26.3 # Build the manager binary FROM golang:${GO_VERSION} AS builder diff --git a/go.mod b/go.mod index 214a8ea4b..6146c6a74 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/fluent/fluent-operator/v3 -go 1.26.2 +go 1.26.3 require ( github.com/fsnotify/fsnotify v1.10.1 From 2a9b8cf75150eb0bbcf92ab9d4a282b1af064b41 Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Wed, 27 May 2026 13:23:36 -0400 Subject: [PATCH 2/2] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Signed-off-by: Josh Baird --- docs/best-practice/forwarding-logs-via-http/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/best-practice/forwarding-logs-via-http/Dockerfile b/docs/best-practice/forwarding-logs-via-http/Dockerfile index 334d3d9fa..131492bd1 100644 --- a/docs/best-practice/forwarding-logs-via-http/Dockerfile +++ b/docs/best-practice/forwarding-logs-via-http/Dockerfile @@ -1,4 +1,4 @@ -GO_VERSION=1.26.3 +ARG GO_VERSION=1.26.3 # Build the manager binary FROM golang:${GO_VERSION} AS builder