Skip to content

fix(deps): bump Go toolchain to 1.26.6 for stdlib CVE fixes - #2047

Merged
marcofranssen merged 6 commits into
fluent:masterfrom
rcmi26133:fix/cve-go-toolchain-xtext
Sep 9, 2026
Merged

marcofranssen merged 6 commits into
fluent:masterfrom
rcmi26133:fix/cve-go-toolchain-xtext

Conversation

@rcmi26133

Copy link
Copy Markdown
Contributor

What this PR does / why we need it:

The released fluent-operator and fluent-bit images are built from this module's single root go.mod toolchain, currently pinned to go 1.26.3, which ships two known, already-patched Go stdlib CVEs:

CVE Component Fixed in
CVE-2026-39821 Go stdlib (net/http/idna ToASCII/ToUnicode confusion) Go 1.25.13 / 1.26.6 / 1.27.0-rc.3
CVE-2026-46600 Go stdlib (DNS SVCB/HTTPS RR parsing panic) Go 1.26.6 / 1.27.0-rc.3

Both cmd/manager (the operator) and cmd/fluent-watcher/fluentbit (fluent-bit-watcher) are built from this root go.mod, so both released binaries carry both findings.

This PR bumps the go directive from 1.26.3 to 1.26.6, which resolves both stdlib CVEs.

Note: issue #2044 also flagged CVE-2026-56852 in golang.org/x/text (fixed in v0.39.0). golang.org/x/text is already at v0.41.0 on master, so that finding is already resolved and no dependency change is needed here.

go build ./... passes cleanly with the Go 1.26.6 toolchain.

Which issue(s) this PR fixes:

Fixes #2044

Does this PR introduced a user-facing change?

Bump Go toolchain to 1.26.6 to resolve CVE-2026-39821 and CVE-2026-46600 in the published operator and fluent-bit images.

Additional documentation, usage docs, etc.:


🤖 Generated with Claude Code

The released fluent-operator and fluent-bit images are built from this
module's root go.mod toolchain, which is pinned to go 1.26.3 and ships
two known, already-patched Go stdlib CVEs:

- CVE-2026-39821 - fixed in Go 1.25.13 / 1.26.6 / 1.27.0-rc.3
- CVE-2026-46600 - fixed in Go 1.26.6 / 1.27.0-rc.3

Both cmd/manager and cmd/fluent-watcher/fluentbit are built from this
single root go.mod/toolchain, so both released binaries carry both
findings.

Bump the go directive from 1.26.3 to 1.26.6. golang.org/x/text is
already at v0.41.0 on master, so the related CVE-2026-56852 (fixed in
0.39.0) is already resolved and needs no change here.

Fixes fluent#2044

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Ryan Miller <ryan.miller@relativity.com>
Copilot AI lite review requested due to automatic review settings September 9, 2026 13:48

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Approval recommended

The change is narrowly scoped to a Go toolchain patch-level bump in go.mod and aligns with the stated security remediation goal.

Pull request overview

This PR updates the repository’s root Go module toolchain requirement so released operator and watcher binaries are built with a patched Go stdlib version addressing the CVEs called out in issue #2044.

Changes:

File summaries
File Description
go.mod Raises the minimum Go toolchain version used to build the project to a patched release.
Review details
  • Files reviewed: 1/1 changed files
  • Comments generated: 0
  • Review effort level: Lite

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Copilot AI review requested due to automatic review settings September 9, 2026 13:52

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Changes recommended

The fluent-bit watcher image build workflow appears to still build with a Dockerfile default GO_VERSION=1.26.3 (no GO_VERSION override from go.mod), so the PR may not actually remediate the stated CVEs in published fluent-bit images.

Once you've addressed the issues Copilot identified, you can request another Copilot review.

Review details
  • Files reviewed: 1/1 changed files
  • Comments generated: 1
  • Review effort level: Lite

Comment thread go.mod
@rcmi26133
rcmi26133 marked this pull request as draft September 9, 2026 14:27
@marcofranssen
marcofranssen marked this pull request as ready for review September 9, 2026 16:09
Copilot AI review requested due to automatic review settings September 9, 2026 16:09
@marcofranssen
marcofranssen enabled auto-merge (squash) September 9, 2026 16:09

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Warning

Copilot couldn't run its full agentic review because it didn't start before the timeout. Make sure your repository has a runner available, or add a copilot-code-review.yml file specifying one with the runs-on attribute. See the docs for more details.

Pull request overview

Copilot reviewed 8 out of 8 changed files in this pull request and generated 3 comments.

Comment thread .devcontainer/devcontainer.json
Comment thread go.mod
Comment on lines +3 to 4
go 1.26.6

Comment thread .editorconfig Outdated
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
Copilot AI review requested due to automatic review settings September 9, 2026 16:42

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Warning

Copilot couldn't run its full agentic review because it didn't start before the timeout. Make sure your repository has a runner available, or add a copilot-code-review.yml file specifying one with the runs-on attribute. See the docs for more details.

Pull request overview

Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.

Comment thread .editorconfig
Comment thread go.mod
module github.com/fluent/fluent-operator/v3

go 1.26.3
go 1.26.6

@marcofranssen marcofranssen left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

@marcofranssen
marcofranssen merged commit eccf5a4 into fluent:master Sep 9, 2026
10 of 11 checks passed
marcofranssen added a commit to marcofranssen/fluent-operator that referenced this pull request Sep 9, 2026
)

Signed-off-by: Ryan Miller <ryan.miller@relativity.com>
Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
Co-authored-by: Marco Franssen <marco.franssen@gmail.com>
Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

bug: released images ship known-vulnerable Go toolchain / golang.org/x/text (CVE-2026-39821, CVE-2026-46600, CVE-2026-56852)

3 participants