Skip to content

Commit 6097eab

Browse files
committed
Bump github.com/prometheus/prometheus to v0.311.3 to fix CVEs
The bump to v0.311.3 from commit 98e831b ("Fix Grype CVEs: update logrus and prometheus/prometheus") was unintentionally reverted to v0.35.0 by the go.mod conflict resolution in commit f844870 ("Run go mod tidy and adapt to prometheus/common v0.67 API"). Re-apply it to fix CVE-2026-42154 (High), CVE-2026-40179 and CVE-2026-44903 (Medium). prometheus/prometheus v0.311.3 requires k8s.io/client-go v0.35.x, which would drag the k8s.io modules past the v0.34 line this branch must stay on. Pin k8s.io/api, k8s.io/apimachinery and k8s.io/client-go back to v0.34.1 with replace directives in both the root and test modules, so the built binaries keep using v0.34.1 (the replacement is also what gets recorded in the binary build info). The only prometheus/prometheus package linked into the NPD binaries is model/value, so none of the k8s-facing prometheus code is compiled.
1 parent 32cf258 commit 6097eab

75 files changed

Lines changed: 26964 additions & 8191 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.golangci.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,13 @@ linters:
114114
# - wsl 403
115115
# - wsl_v5 58
116116
- zerologlint
117+
settings:
118+
gomoddirectives:
119+
replace-allow-list:
120+
# Keep the k8s.io modules on the v0.34 line, see go.mod.
121+
- k8s.io/api
122+
- k8s.io/apimachinery
123+
- k8s.io/client-go
117124
exclusions:
118125
generated: lax
119126
paths:

go.mod

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
contrib.go.opencensus.io/exporter/stackdriver v0.13.14
99
github.com/acobaugh/osrelease v0.1.0
1010
github.com/avast/retry-go/v4 v4.6.1
11-
github.com/coreos/go-systemd/v22 v22.5.0
11+
github.com/coreos/go-systemd/v22 v22.6.0
1212
github.com/euank/go-kmsg-parser v2.0.0+incompatible
1313
github.com/hpcloud/tail v1.0.0
1414
github.com/prometheus/client_model v0.6.2
@@ -20,19 +20,19 @@ require (
2020
go.opencensus.io v0.24.0
2121
golang.org/x/sys v0.46.0
2222
google.golang.org/api v0.272.0
23-
k8s.io/api v0.34.1
24-
k8s.io/apimachinery v0.34.1
25-
k8s.io/client-go v0.34.1
26-
k8s.io/klog/v2 v2.130.1
27-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
23+
k8s.io/api v0.35.3
24+
k8s.io/apimachinery v0.35.3
25+
k8s.io/client-go v0.35.3
26+
k8s.io/klog/v2 v2.140.0
27+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
2828
)
2929

3030
require (
3131
cloud.google.com/go/auth v0.18.2 // indirect
3232
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
3333
cloud.google.com/go/monitoring v1.24.3 // indirect
3434
cloud.google.com/go/trace v1.11.7 // indirect
35-
github.com/aws/aws-sdk-go v1.44.72 // indirect
35+
github.com/aws/aws-sdk-go v1.55.7 // indirect
3636
github.com/beorn7/perks v1.0.1 // indirect
3737
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
3838
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -77,7 +77,7 @@ require (
7777
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
7878
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
7979
github.com/prometheus/client_golang v1.23.2 // indirect
80-
github.com/prometheus/prometheus v0.35.0 // indirect
80+
github.com/prometheus/prometheus v0.311.3 // indirect
8181
github.com/prometheus/statsd_exporter v0.22.7 // indirect
8282
github.com/tklauser/go-sysconf v0.3.16 // indirect
8383
github.com/tklauser/numcpus v0.11.0 // indirect
@@ -109,9 +109,15 @@ require (
109109
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
110110
gopkg.in/yaml.v2 v2.4.0 // indirect
111111
gopkg.in/yaml.v3 v3.0.1 // indirect
112-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
113-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
112+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
113+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
114114
sigs.k8s.io/randfill v1.0.0 // indirect
115115
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
116116
sigs.k8s.io/yaml v1.6.0 // indirect
117117
)
118+
119+
replace k8s.io/api => k8s.io/api v0.34.1
120+
121+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.34.1
122+
123+
replace k8s.io/client-go => k8s.io/client-go v0.34.1

go.sum

Lines changed: 24 additions & 1251 deletions
Large diffs are not rendered by default.

test/go.mod

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ require (
1313
golang.org/x/crypto v0.53.0
1414
golang.org/x/oauth2 v0.36.0
1515
google.golang.org/api v0.272.0
16-
k8s.io/apimachinery v0.34.1
16+
k8s.io/apimachinery v0.35.3
1717
k8s.io/component-base v0.34.1
18-
k8s.io/klog/v2 v2.130.1
18+
k8s.io/klog/v2 v2.140.0
1919
k8s.io/node-problem-detector v0.8.20
2020
sigs.k8s.io/boskos v0.0.0-20250612085457-e9e53220ffb6
2121
)
@@ -75,8 +75,14 @@ require (
7575
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
7676
gopkg.in/yaml.v2 v2.4.0 // indirect
7777
gopkg.in/yaml.v3 v3.0.1 // indirect
78-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
78+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
7979
sigs.k8s.io/controller-runtime v0.16.5 // indirect
8080
sigs.k8s.io/prow v0.0.0-20240619181241-cfb8754e0459 // indirect
8181
sigs.k8s.io/yaml v1.6.0 // indirect
8282
)
83+
84+
replace k8s.io/api => k8s.io/api v0.34.1
85+
86+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.34.1
87+
88+
replace k8s.io/client-go => k8s.io/client-go v0.34.1

test/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -750,10 +750,10 @@ k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
750750
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
751751
k8s.io/component-base v0.34.1 h1:v7xFgG+ONhytZNFpIz5/kecwD+sUhVE6HU7qQUiRM4A=
752752
k8s.io/component-base v0.34.1/go.mod h1:mknCpLlTSKHzAQJJnnHVKqjxR7gBeHRv0rPXA7gdtQ0=
753-
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
754-
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
755-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
756-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
753+
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
754+
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
755+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=
756+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
757757
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
758758
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
759759
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

vendor/github.com/aws/aws-sdk-go/aws/auth/bearer/token.go

Lines changed: 50 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/aws/aws-sdk-go/aws/config.go

Lines changed: 57 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/aws/aws-sdk-go/aws/corehandlers/awsinternal.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/aws/aws-sdk-go/aws/corehandlers/user_agent.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/aws/aws-sdk-go/aws/credentials/endpointcreds/provider.go

Lines changed: 46 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)