Skip to content

Commit fa0d6e2

Browse files
rsoaresdmfrancisc
rsoaresd
and
mfrancisc
authored
SANDBOX-808: update kube & openshift dependencies to 4.17 (codeready-toolchain#1125)
* SANDBOX-808: update kube & openshift dependencies to 4.17 * fix * update * update * update * add govulncheck gh action * remove replace * improve * clean * get latest of toolchain-common --------- Co-authored-by: Francisc Munteanu <fmuntean@redhat.com>
1 parent 9b223e2 commit fa0d6e2

File tree

6 files changed

+138
-954
lines changed

6 files changed

+138
-954
lines changed

‎.github/workflows/govulncheck.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: govulncheck
2+
on:
3+
pull_request:
4+
branches:
5+
- master
6+
7+
jobs:
8+
govulncheck:
9+
name: govulncheck
10+
runs-on: ubuntu-24.04
11+
12+
steps:
13+
- name: Checkout code
14+
uses: actions/checkout@v4
15+
16+
- name: Run govulncheck
17+
uses: golang/govulncheck-action@v1
18+
with:
19+
go-version-file: go.mod
20+
go-package: ./...
21+
repo-checkout: false

‎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.21.x (1.21.13 or higher) - download for your development environment https://golang.org/dl/[here].
10+
Requires Go version 1.22.x (1.22.12 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

‎go.mod‎

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

33
require (
4-
github.com/codeready-toolchain/api v0.0.0-20250227073728-5999971adb48
5-
github.com/codeready-toolchain/toolchain-common v0.0.0-20250227105612-03e9ebab49c7
4+
github.com/codeready-toolchain/api v0.0.0-20250313170542-4e3c4147cb80
5+
github.com/codeready-toolchain/toolchain-common v0.0.0-20250313203311-0bce6563576f
66
github.com/davecgh/go-spew v1.1.1
7-
github.com/fatih/color v1.15.0
7+
github.com/fatih/color v1.16.0
88
github.com/ghodss/yaml v1.0.0
99
github.com/gofrs/uuid v3.3.0+incompatible
1010
github.com/google/go-cmp v0.6.0
@@ -13,22 +13,22 @@ require (
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
16-
// using latest commit from 'github.com/openshift/api branch release-4.16'
17-
github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094
18-
github.com/operator-framework/api v0.13.0
16+
// using latest commit from 'github.com/openshift/api branch release-4.17'
17+
github.com/openshift/api v0.0.0-20250214103856-0cfc958f642b
18+
github.com/operator-framework/api v0.24.0
1919
github.com/pkg/errors v0.9.1
2020
github.com/prometheus/client_golang v1.18.0
21-
github.com/prometheus/client_model v0.5.0
22-
github.com/prometheus/common v0.45.0
21+
github.com/prometheus/client_model v0.6.0
22+
github.com/prometheus/common v0.47.0
2323
github.com/redhat-cop/operator-utils v1.3.8
24-
github.com/spf13/cobra v1.7.0
24+
github.com/spf13/cobra v1.8.0
2525
github.com/stretchr/testify v1.10.0
26-
k8s.io/api v0.29.2
27-
k8s.io/apimachinery v0.29.2
28-
k8s.io/client-go v0.29.2
29-
k8s.io/kubectl v0.29.2
30-
k8s.io/metrics v0.29.2
31-
sigs.k8s.io/controller-runtime v0.17.3
26+
k8s.io/api v0.30.1
27+
k8s.io/apimachinery v0.30.1
28+
k8s.io/client-go v0.30.1
29+
k8s.io/kubectl v0.30.1
30+
k8s.io/metrics v0.30.1
31+
sigs.k8s.io/controller-runtime v0.18.4
3232
)
3333

3434
require github.com/google/uuid v1.6.0
@@ -45,21 +45,21 @@ require (
4545
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
4646
github.com/cloudflare/circl v1.3.7 // indirect
4747
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
48-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
48+
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
4949
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
50-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
50+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
5151
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
5252
github.com/fsnotify/fsnotify v1.7.0 // indirect
5353
github.com/go-errors/errors v1.4.2 // indirect
5454
github.com/go-logr/logr v1.4.1 // indirect
55-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
56-
github.com/go-openapi/jsonreference v0.20.2 // indirect
57-
github.com/go-openapi/swag v0.22.3 // indirect
55+
github.com/go-openapi/jsonpointer v0.20.2 // indirect
56+
github.com/go-openapi/jsonreference v0.20.4 // indirect
57+
github.com/go-openapi/swag v0.22.9 // indirect
5858
github.com/goccy/go-json v0.10.2 // indirect
5959
github.com/gogo/protobuf v1.3.2 // indirect
6060
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
6161
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
62-
github.com/golang/protobuf v1.5.3 // indirect
62+
github.com/golang/protobuf v1.5.4 // indirect
6363
github.com/google/gnostic-models v0.6.8 // indirect
6464
github.com/google/go-github/v52 v52.0.0 // indirect
6565
github.com/google/go-querystring v1.1.0 // indirect
@@ -70,7 +70,7 @@ require (
7070
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 // indirect
7171
github.com/hashicorp/errwrap v1.0.0 // indirect
7272
github.com/huandu/xstrings v1.3.3 // indirect
73-
github.com/imdario/mergo v0.3.12 // indirect
73+
github.com/imdario/mergo v0.3.16 // indirect
7474
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7575
github.com/josharian/intern v1.0.0 // indirect
7676
github.com/json-iterator/go v1.1.12 // indirect
@@ -82,52 +82,52 @@ require (
8282
github.com/lestrrat-go/option v1.0.1 // indirect
8383
github.com/mailru/easyjson v0.7.7 // indirect
8484
github.com/mattn/go-colorable v0.1.13 // indirect
85-
github.com/mattn/go-isatty v0.0.17 // indirect
85+
github.com/mattn/go-isatty v0.0.20 // indirect
8686
github.com/mattn/go-runewidth v0.0.7 // indirect
87-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
8887
github.com/migueleliasweb/go-github-mock v0.0.18 // indirect
8988
github.com/mitchellh/copystructure v1.0.0 // indirect
9089
github.com/mitchellh/reflectwalk v1.0.0 // indirect
9190
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9291
github.com/modern-go/reflect2 v1.0.2 // indirect
9392
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
9493
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
95-
github.com/openshift/library-go v0.0.0-20240711192904-190fec8c3f09 // indirect
94+
github.com/openshift/library-go v0.0.0-20241118144106-bfd968d8eef4 // indirect
9695
github.com/pmezard/go-difflib v1.0.0 // indirect
9796
github.com/prometheus/procfs v0.12.0 // indirect
9897
github.com/shopspring/decimal v1.2.0 // indirect
99-
github.com/sirupsen/logrus v1.9.0 // indirect
98+
github.com/sirupsen/logrus v1.9.2 // indirect
10099
github.com/spf13/cast v1.3.1 // indirect
101100
github.com/spf13/pflag v1.0.5 // indirect
102101
github.com/xlab/treeprint v1.2.0 // indirect
103102
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
104103
golang.org/x/crypto v0.31.0 // indirect
105-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
104+
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
106105
golang.org/x/net v0.33.0 // indirect
107-
golang.org/x/oauth2 v0.12.0 // indirect
106+
golang.org/x/oauth2 v0.17.0 // indirect
108107
golang.org/x/sync v0.10.0 // indirect
109108
golang.org/x/sys v0.28.0 // indirect
110109
golang.org/x/term v0.27.0 // indirect
111110
golang.org/x/text v0.21.0 // indirect
112-
golang.org/x/time v0.3.0 // indirect
111+
golang.org/x/time v0.5.0 // indirect
113112
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
114-
google.golang.org/appengine v1.6.7 // indirect
113+
google.golang.org/appengine v1.6.8 // indirect
115114
google.golang.org/protobuf v1.33.0 // indirect
116115
gopkg.in/h2non/gock.v1 v1.0.14 // indirect
117116
gopkg.in/inf.v0 v0.9.1 // indirect
118117
gopkg.in/yaml.v2 v2.4.0 // indirect
119118
gopkg.in/yaml.v3 v3.0.1 // indirect
120-
k8s.io/apiextensions-apiserver v0.29.2 // indirect
121-
k8s.io/cli-runtime v0.29.2 // indirect
122-
k8s.io/component-base v0.29.2 // indirect
123-
k8s.io/klog/v2 v2.110.1 // indirect
124-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
125-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
119+
k8s.io/apiextensions-apiserver v0.30.1 // indirect
120+
k8s.io/cli-runtime v0.30.1 // indirect
121+
k8s.io/klog/v2 v2.120.1 // indirect
122+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
123+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
126124
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
127125
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
128126
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
129127
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
130128
sigs.k8s.io/yaml v1.4.0 // indirect
131129
)
132130

133-
go 1.21
131+
go 1.22.0
132+
133+
toolchain go1.22.12

0 commit comments

Comments
 (0)