Skip to content

Commit 94ad63d

Browse files
authored
SANDBOX-1465: update kube & openshift dependencies to 4.20 (#503)
* SANDBOX-1357: update kube & openshift dependencies to 4.20 * clean ignored-vulnerabilities * fix * update * update * update github.com/codeready-toolchain/api with master
1 parent 9f5a5e1 commit 94ad63d

File tree

5 files changed

+107
-162
lines changed

5 files changed

+107
-162
lines changed

.govulncheck.yaml

Lines changed: 1 addition & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1 @@
1-
ignored-vulnerabilities:
2-
# Panic when validating certificates with DSA public keys in crypto/x509
3-
# Found in: crypto/[email protected]
4-
# Fixed in: crypto/[email protected]
5-
- id: GO-2025-4013
6-
info: https://pkg.go.dev/vuln/GO-2025-4013
7-
silence-until: 2026-01-09
8-
# Lack of limit when parsing cookies can cause memory exhaustion in net/http
9-
# Found in: net/[email protected]
10-
# Fixed in: net/[email protected]
11-
- id: GO-2025-4012
12-
info: https://pkg.go.dev/vuln/GO-2025-4012
13-
silence-until: 2026-01-09
14-
# Parsing DER payload can cause memory exhaustion in encoding/asn1
15-
# Found in: encoding/[email protected]
16-
# Fixed in: encoding/[email protected]
17-
- id: GO-2025-4011
18-
info: https://pkg.go.dev/vuln/GO-2025-4011
19-
silence-until: 2026-01-09
20-
# Insufficient validation of bracketed IPv6 hostnames in net/url
21-
# Found in: net/[email protected]
22-
# Fixed in: net/[email protected]
23-
- id: GO-2025-4010
24-
info: https://pkg.go.dev/vuln/GO-2025-4010
25-
silence-until: 2026-01-09
26-
# Quadratic complexity when parsing some invalid inputs in encoding/pem
27-
# Found in: encoding/[email protected]
28-
# Fixed in: encoding/[email protected]
29-
- id: GO-2025-4009
30-
info: https://pkg.go.dev/vuln/GO-2025-4009
31-
silence-until: 2026-01-09
32-
# ALPN negotiation error contains attacker controlled information in crypto/tls
33-
# Found in: crypto/[email protected]
34-
# Fixed in: crypto/[email protected]
35-
- id: GO-2025-4008
36-
info: https://pkg.go.dev/vuln/GO-2025-4008
37-
silence-until: 2026-01-09
38-
# Quadratic complexity when checking name constraints in crypto/x509
39-
# Found in: crypto/[email protected]
40-
# Fixed in: crypto/[email protected]
41-
- id: GO-2025-4007
42-
info: https://pkg.go.dev/vuln/GO-2025-4007
43-
silence-until: 2026-01-09
44-
# Excessive CPU consumption in ParseAddress in net/mail
45-
# Found in: net/[email protected]
46-
# Fixed in: net/[email protected]
47-
- id: GO-2025-4006
48-
info: https://pkg.go.dev/vuln/GO-2025-4006
49-
silence-until: 2026-01-09
50-
# Excessive resource consumption when printing error string for host certificate validation in crypto/x509
51-
# Found in: crypto/[email protected]
52-
# Fixed in: crypto/[email protected]
53-
- id: GO-2025-4155
54-
info: https://pkg.go.dev/vuln/GO-2025-4155
55-
silence-until: 2026-01-09
56-
# Improper application of excluded DNS name constraints when verifying wildcard names in crypto/x509
57-
# Found in: crypto/[email protected]
58-
# Fixed in: crypto/[email protected]
59-
- id: GO-2025-4175
60-
info: https://pkg.go.dev/vuln/GO-2025-4175
61-
silence-until: 2026-01-09
1+
ignored-vulnerabilities: []

README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This repo is for controllers, libs, scripts, make files, etc to be shared betwee
88

99
== Build
1010

11-
Requires Go version 1.23.x (1.23.12 or higher) - download for your development environment https://golang.org/dl/[here].
11+
Requires Go version 1.24.x (1.24.11 or higher) - download for your development environment https://golang.org/dl/[here].
1212

1313
This repository uses https://github.com/golang/go/wiki/Modules[Go modules].
1414

go.mod

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
module github.com/codeready-toolchain/toolchain-common
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
toolchain go1.23.12
5+
toolchain go1.24.11
66

77
require (
88
github.com/go-logr/logr v1.4.2
99
github.com/golang-jwt/jwt/v5 v5.2.2
1010
github.com/lestrrat-go/jwx v1.2.29
1111
github.com/magiconair/properties v1.8.5
12-
// using latest commit from 'github.com/openshift/api branch release-4.19'
13-
github.com/openshift/api v0.0.0-20250903165707-ce7baf0afbc4
14-
// using latest commit from 'github.com/openshift/library-go branch release-4.19'
15-
github.com/openshift/library-go v0.0.0-20250826065405-6d18d1191f49
12+
// using latest commit from 'github.com/openshift/api branch release-4.20'
13+
github.com/openshift/api v0.0.0-20251202204302-1cb53e34ca33
14+
// using latest commit from 'github.com/openshift/library-go branch release-4.20'
15+
github.com/openshift/library-go v0.0.0-20251110200504-2685cf1242fc
1616
github.com/pkg/errors v0.9.1
1717
github.com/redhat-cop/operator-utils v1.3.8
1818
github.com/stretchr/testify v1.10.0
1919
gopkg.in/go-jose/go-jose.v2 v2.6.3
2020
gopkg.in/h2non/gock.v1 v1.0.14
2121
gotest.tools v2.2.0+incompatible
22-
k8s.io/api v0.32.2
23-
k8s.io/apimachinery v0.32.2
24-
k8s.io/client-go v0.32.2
25-
sigs.k8s.io/controller-runtime v0.20.4
22+
k8s.io/api v0.33.4
23+
k8s.io/apimachinery v0.33.4
24+
k8s.io/client-go v0.33.4
25+
sigs.k8s.io/controller-runtime v0.21.0
2626
)
2727

2828
require (
29-
github.com/codeready-toolchain/api v0.0.0-20251008084914-06282b83d4cd
29+
github.com/codeready-toolchain/api v0.0.0-20260108101803-54d23a1b4f3c
3030
github.com/ghodss/yaml v1.0.0
3131
github.com/google/go-cmp v0.7.0
3232
github.com/google/go-github/v52 v52.0.0
3333
github.com/google/uuid v1.6.0
3434
github.com/migueleliasweb/go-github-mock v0.0.18
35-
github.com/prometheus/client_golang v1.19.1
35+
github.com/prometheus/client_golang v1.22.0
3636
github.com/prometheus/client_model v0.6.1
3737
golang.org/x/oauth2 v0.27.0
3838
gopkg.in/yaml.v2 v2.4.0
39-
k8s.io/kubectl v0.32.2
40-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
39+
k8s.io/kubectl v0.33.4
40+
k8s.io/utils v0.0.0-20241210054802-24370beab758
4141
)
4242

4343
require (
@@ -64,18 +64,17 @@ require (
6464
github.com/go-openapi/swag v0.23.0 // indirect
6565
github.com/goccy/go-json v0.10.2 // indirect
6666
github.com/gogo/protobuf v1.3.2 // indirect
67-
github.com/golang/protobuf v1.5.4 // indirect
6867
github.com/google/btree v1.1.3 // indirect
69-
github.com/google/gnostic-models v0.6.8 // indirect
68+
github.com/google/gnostic-models v0.6.9 // indirect
7069
github.com/google/go-querystring v1.1.0 // indirect
71-
github.com/google/gofuzz v1.2.0 // indirect
7270
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
7371
github.com/gorilla/mux v1.8.1 // indirect
7472
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 // indirect
7573
github.com/huandu/xstrings v1.3.3 // indirect
7674
github.com/imdario/mergo v0.3.12 // indirect
7775
github.com/josharian/intern v1.0.0 // indirect
7876
github.com/json-iterator/go v1.1.12 // indirect
77+
github.com/kylelemons/godebug v1.1.0 // indirect
7978
github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
8079
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
8180
github.com/lestrrat-go/httpcc v1.0.1 // indirect
@@ -88,10 +87,10 @@ require (
8887
github.com/modern-go/reflect2 v1.0.2 // indirect
8988
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
9089
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
91-
github.com/onsi/ginkgo/v2 v2.22.1 // indirect
92-
github.com/onsi/gomega v1.36.2 // indirect
90+
github.com/onsi/ginkgo/v2 v2.23.3 // indirect
91+
github.com/onsi/gomega v1.37.0 // indirect
9392
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
94-
github.com/prometheus/common v0.55.0 // indirect
93+
github.com/prometheus/common v0.62.0 // indirect
9594
github.com/prometheus/procfs v0.15.1 // indirect
9695
github.com/shopspring/decimal v1.2.0 // indirect
9796
github.com/spf13/cast v1.3.1 // indirect
@@ -100,25 +99,26 @@ require (
10099
github.com/xlab/treeprint v1.2.0 // indirect
101100
go.uber.org/multierr v1.11.0 // indirect
102101
go.uber.org/zap v1.27.0 // indirect
103-
golang.org/x/crypto v0.36.0 // indirect
104-
golang.org/x/net v0.38.0 // indirect
105-
golang.org/x/sync v0.12.0 // indirect
106-
golang.org/x/sys v0.31.0 // indirect
107-
golang.org/x/term v0.30.0 // indirect
108-
golang.org/x/text v0.23.0 // indirect
109-
golang.org/x/time v0.7.0 // indirect
102+
golang.org/x/crypto v0.37.0 // indirect
103+
golang.org/x/net v0.39.0 // indirect
104+
golang.org/x/sync v0.13.0 // indirect
105+
golang.org/x/sys v0.32.0 // indirect
106+
golang.org/x/term v0.31.0 // indirect
107+
golang.org/x/text v0.24.0 // indirect
108+
golang.org/x/time v0.9.0 // indirect
110109
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
111-
google.golang.org/protobuf v1.36.1 // indirect
110+
google.golang.org/protobuf v1.36.5 // indirect
112111
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
113112
gopkg.in/inf.v0 v0.9.1 // indirect
114113
gopkg.in/yaml.v3 v3.0.1 // indirect
115-
k8s.io/apiextensions-apiserver v0.32.2 // indirect
116-
k8s.io/cli-runtime v0.32.2 // indirect
114+
k8s.io/apiextensions-apiserver v0.33.2 // indirect
115+
k8s.io/cli-runtime v0.33.4 // indirect
117116
k8s.io/klog/v2 v2.130.1 // indirect
118-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
119-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
120-
sigs.k8s.io/kustomize/api v0.18.0 // indirect
121-
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
122-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
117+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
118+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
119+
sigs.k8s.io/kustomize/api v0.19.0 // indirect
120+
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
121+
sigs.k8s.io/randfill v1.0.0 // indirect
122+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
123123
sigs.k8s.io/yaml v1.4.0 // indirect
124124
)

0 commit comments

Comments
 (0)