Skip to content

build: apply Go dependency security updates to master - #1159

Merged
ti-chi-bot[bot] merged 4 commits into
pingcap:masterfrom
time-and-fate:260811-monitoring-pr1132
Aug 12, 2026
Merged

build: apply Go dependency security updates to master#1159
ti-chi-bot[bot] merged 4 commits into
pingcap:masterfrom
time-and-fate:260811-monitoring-pr1132

Conversation

@time-and-fate

@time-and-fate time-and-fate commented Aug 11, 2026

Copy link
Copy Markdown
Member

What problem does this solve?

The security dependency update from #1132 was applied to the release branch but is not present on master. The Prometheus dependency update also requires the corresponding rulefmt.Parse API migration fixes.

This PR brings those fixes to master and pins the Go toolchain and golang.org/x/text to the requested secure versions.

What changed?

  • Apply the security dependency updates from build: bump vulnerable Go dependencies on release-8.5 #1132.
  • Update all affected rulefmt.Parse call sites and rule type handling for the newer Prometheus API.
  • Upgrade the module Go version to 1.25.12.
  • Keep the reloader build image on the official floating golang:1.25 tag, which tracks the latest 1.25 patch release.
  • Upgrade golang.org/x/text to v0.39.0 and refresh go.sum.

Tests

  • go test ./pkg/... ./reload/...
  • go test ./cmd/main.go
  • go build -o /tmp/monitoring-cmd ./cmd/main.go
  • go build -o /tmp/monitoring-reload ./reload/main.go
  • go mod verify
  • git diff --check

The repository-wide go test ./... remains unable to build the existing cmd package because CRD.go, main.go, and monitoring.go each define main; the targeted packages and binaries pass.

vtatai and others added 3 commits August 11, 2026 20:04
The prometheus v0.55->v0.312 bump changed the rulefmt.Parse signature and
RuleNode->Rule (plain string fields). cmd/main.go was not updated, causing
the govulncheck/compile failure reported in review. Also fixes a latent
RuleNode cast in pkg/operator/rules.go that would panic at runtime.

(cherry picked from commit 35f777f)
@ti-chi-bot
ti-chi-bot Bot requested a review from liubog2008 August 11, 2026 12:13
@pingcap-cla-assistant

pingcap-cla-assistant Bot commented Aug 11, 2026

Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

@ti-chi-bot ti-chi-bot Bot added the size/XL label Aug 11, 2026
@ti-chi-bot

ti-chi-bot Bot commented Aug 12, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liubog2008

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot

ti-chi-bot Bot commented Aug 12, 2026

Copy link
Copy Markdown

[LGTM Timeline notifier]

Timeline:

  • 2026-08-12 03:31:55.840860015 +0000 UTC m=+3190101.876955421: ☑️ agreed by liubog2008.

@ti-chi-bot
ti-chi-bot Bot merged commit 9342263 into pingcap:master Aug 12, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants