Skip to content

Commit e7c8c30

Browse files
authored
SANDBOX-1465: update kube & openshift dependencies to 4.20 (#1239)
* SANDBOX-1357: update kube & openshift dependencies to 4.20 * requested changes * update * Merge branch 'master' into upgrade_4_20_dependencies_toolchain-e2e * remove replaces * update * update
1 parent b0408ed commit e7c8c30

7 files changed

Lines changed: 159 additions & 202 deletions

File tree

.govulncheck.yaml

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

README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This repo contains e2e tests for https://github.com/codeready-toolchain/host-ope
77

88
== Build
99

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

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

build/devsandbox-dashboard/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ ENV GOPATH=/tmp/go \
88
PATH=$PATH:$GOPATH/bin \
99
GIT_COMMITTER_NAME="Developer Sandbox" \
1010
GIT_COMMITTER_EMAIL=devsandbox@redhat.com \
11-
GOLANG_VERSION=go1.23.12 \
12-
GOLANG_SHA256=d3847fef834e9db11bf64e3fb34db9c04db14e068eeb064f49af747010454f90
11+
GOLANG_VERSION=go1.24.11 \
12+
GOLANG_SHA256=bceca00afaac856bc48b4cc33db7cd9eb383c81811379faed3bdbc80edb0af65
1313

1414
# Install additional tools
1515
# gettext for envsubst

go.mod

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
module github.com/codeready-toolchain/toolchain-e2e
22

33
require (
4-
github.com/codeready-toolchain/api v0.0.0-20251111133521-6e510c9bd2ee
5-
github.com/codeready-toolchain/toolchain-common v0.0.0-20251006132314-2591ebe0bdb1
4+
github.com/codeready-toolchain/api v0.0.0-20260108115150-4c6695ed18de
5+
github.com/codeready-toolchain/toolchain-common v0.0.0-20260108130331-10ca562525fe
66
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
77
github.com/fatih/color v1.18.0
88
github.com/ghodss/yaml v1.0.0
99
github.com/gofrs/uuid v4.4.0+incompatible
1010
github.com/google/go-cmp v0.7.0
11-
github.com/gorilla/websocket v1.5.0
11+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674
1212
github.com/gosuri/uiprogress v0.0.1
1313
github.com/gosuri/uitable v0.0.4
1414
github.com/hashicorp/go-multierror v1.1.1
1515
github.com/manifoldco/promptui v0.9.0
1616
// using latest commit from 'github.com/openshift/api branch release-4.19'
17-
github.com/openshift/api v0.0.0-20250903165707-ce7baf0afbc4
18-
github.com/operator-framework/api v0.31.0
17+
github.com/openshift/api v0.0.0-20260107143020-50517c6f4bfd
18+
github.com/operator-framework/api v0.34.0
1919
github.com/pkg/errors v0.9.1
20-
github.com/prometheus/client_golang v1.19.1
21-
github.com/prometheus/client_model v0.6.1
22-
github.com/prometheus/common v0.55.0
20+
github.com/prometheus/client_golang v1.22.0
21+
github.com/prometheus/client_model v0.6.2
22+
github.com/prometheus/common v0.65.0
2323
github.com/redhat-cop/operator-utils v1.3.8
2424
github.com/spf13/cobra v1.9.1
25-
github.com/stretchr/testify v1.10.0
26-
k8s.io/api v0.32.3
27-
k8s.io/apimachinery v0.32.3
28-
k8s.io/client-go v0.32.3
29-
k8s.io/kubectl v0.32.3
30-
k8s.io/metrics v0.32.3
31-
sigs.k8s.io/controller-runtime v0.20.4
25+
github.com/stretchr/testify v1.11.0
26+
k8s.io/api v0.33.4
27+
k8s.io/apimachinery v0.33.4
28+
k8s.io/client-go v0.33.4
29+
k8s.io/kubectl v0.33.4
30+
k8s.io/metrics v0.33.4
31+
sigs.k8s.io/controller-runtime v0.21.0
3232
)
3333

3434
require (
@@ -54,24 +54,22 @@ require (
5454
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
5555
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
5656
github.com/fsnotify/fsnotify v1.8.0 // indirect
57-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
57+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
5858
github.com/go-errors/errors v1.4.2 // indirect
5959
github.com/go-jose/go-jose/v3 v3.0.4 // indirect
60-
github.com/go-logr/logr v1.4.2 // indirect
61-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
62-
github.com/go-openapi/jsonreference v0.20.4 // indirect
63-
github.com/go-openapi/swag v0.23.0 // indirect
60+
github.com/go-logr/logr v1.4.3 // indirect
61+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
62+
github.com/go-openapi/jsonreference v0.21.0 // indirect
63+
github.com/go-openapi/swag v0.23.1 // indirect
6464
github.com/go-stack/stack v1.8.1 // indirect
6565
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
6666
github.com/goccy/go-json v0.10.2 // indirect
6767
github.com/gogo/protobuf v1.3.2 // indirect
6868
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
69-
github.com/golang/protobuf v1.5.4 // indirect
7069
github.com/google/btree v1.1.3 // indirect
71-
github.com/google/gnostic-models v0.6.8 // indirect
70+
github.com/google/gnostic-models v0.6.9 // indirect
7271
github.com/google/go-github/v52 v52.0.0 // indirect
7372
github.com/google/go-querystring v1.1.0 // indirect
74-
github.com/google/gofuzz v1.2.0 // indirect
7573
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
7674
github.com/gorilla/mux v1.8.1 // indirect
7775
github.com/gosuri/uilive v0.0.4 // indirect
@@ -88,7 +86,7 @@ require (
8886
github.com/lestrrat-go/iter v1.0.2 // indirect
8987
github.com/lestrrat-go/jwx v1.2.29 // indirect
9088
github.com/lestrrat-go/option v1.0.1 // indirect
91-
github.com/mailru/easyjson v0.7.7 // indirect
89+
github.com/mailru/easyjson v0.9.0 // indirect
9290
github.com/mattn/go-colorable v0.1.13 // indirect
9391
github.com/mattn/go-isatty v0.0.20 // indirect
9492
github.com/mattn/go-runewidth v0.0.7 // indirect
@@ -99,10 +97,10 @@ require (
9997
github.com/modern-go/reflect2 v1.0.2 // indirect
10098
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
10199
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
102-
github.com/openshift/library-go v0.0.0-20250826065405-6d18d1191f49 // indirect
100+
github.com/openshift/library-go v0.0.0-20251110200504-2685cf1242fc // indirect
103101
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
104102
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
105-
github.com/prometheus/procfs v0.15.1 // indirect
103+
github.com/prometheus/procfs v0.16.1 // indirect
106104
github.com/sagikazarmark/locafero v0.7.0 // indirect
107105
github.com/shopspring/decimal v1.2.0 // indirect
108106
github.com/sirupsen/logrus v1.9.3 // indirect
@@ -114,33 +112,36 @@ require (
114112
github.com/x448/float16 v0.8.4 // indirect
115113
github.com/xlab/treeprint v1.2.0 // indirect
116114
go.uber.org/multierr v1.11.0 // indirect
117-
golang.org/x/crypto v0.36.0 // indirect
118-
golang.org/x/net v0.38.0 // indirect
119-
golang.org/x/oauth2 v0.27.0 // indirect
120-
golang.org/x/sync v0.12.0 // indirect
121-
golang.org/x/sys v0.31.0 // indirect
122-
golang.org/x/term v0.30.0 // indirect
123-
golang.org/x/text v0.23.0 // indirect
124-
golang.org/x/time v0.8.0 // indirect
115+
go.yaml.in/yaml/v2 v2.4.2 // indirect
116+
go.yaml.in/yaml/v3 v3.0.3 // indirect
117+
golang.org/x/crypto v0.45.0 // indirect
118+
golang.org/x/net v0.47.0 // indirect
119+
golang.org/x/oauth2 v0.30.0 // indirect
120+
golang.org/x/sync v0.18.0 // indirect
121+
golang.org/x/sys v0.38.0 // indirect
122+
golang.org/x/term v0.37.0 // indirect
123+
golang.org/x/text v0.31.0 // indirect
124+
golang.org/x/time v0.12.0 // indirect
125125
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
126-
google.golang.org/protobuf v1.36.5 // indirect
126+
google.golang.org/protobuf v1.36.6 // indirect
127127
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
128128
gopkg.in/h2non/gock.v1 v1.0.14 // indirect
129129
gopkg.in/inf.v0 v0.9.1 // indirect
130130
gopkg.in/yaml.v2 v2.4.0 // indirect
131131
gopkg.in/yaml.v3 v3.0.1 // indirect
132-
k8s.io/apiextensions-apiserver v0.32.3 // indirect
133-
k8s.io/cli-runtime v0.32.3 // indirect
132+
k8s.io/apiextensions-apiserver v0.33.4 // indirect
133+
k8s.io/cli-runtime v0.33.4 // indirect
134134
k8s.io/klog/v2 v2.130.1 // indirect
135-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
136-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
137-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
138-
sigs.k8s.io/kustomize/api v0.18.0 // indirect
139-
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
140-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
141-
sigs.k8s.io/yaml v1.4.0 // indirect
135+
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
136+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
137+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
138+
sigs.k8s.io/kustomize/api v0.19.0 // indirect
139+
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
140+
sigs.k8s.io/randfill v1.0.0 // indirect
141+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
142+
sigs.k8s.io/yaml v1.6.0 // indirect
142143
)
143144

144-
go 1.23.0
145+
go 1.24.4
145146

146-
toolchain go1.23.12
147+
toolchain go1.24.11

0 commit comments

Comments
 (0)