diff --git a/controllers/nodekeeper/ignoremaster_predicate_test.go b/controllers/nodekeeper/ignoremaster_predicate_test.go index f3b166ec..3c37a6b9 100644 --- a/controllers/nodekeeper/ignoremaster_predicate_test.go +++ b/controllers/nodekeeper/ignoremaster_predicate_test.go @@ -6,7 +6,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/event" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/controllers/nodekeeper/nodekeeper_controller_test.go b/controllers/nodekeeper/nodekeeper_controller_test.go index fdd8a380..27390d0d 100644 --- a/controllers/nodekeeper/nodekeeper_controller_test.go +++ b/controllers/nodekeeper/nodekeeper_controller_test.go @@ -24,7 +24,7 @@ import ( testStructs "github.com/openshift/managed-upgrade-operator/util/mocks/structs" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/controllers/nodekeeper/nodekeeper_suite_test.go b/controllers/nodekeeper/nodekeeper_suite_test.go index b2acb2ea..f42af3dd 100644 --- a/controllers/nodekeeper/nodekeeper_suite_test.go +++ b/controllers/nodekeeper/nodekeeper_suite_test.go @@ -3,7 +3,7 @@ package nodekeeper import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/controllers/upgradeconfig/statuschanged_predicate_test.go b/controllers/upgradeconfig/statuschanged_predicate_test.go index 19123f06..987e9f95 100644 --- a/controllers/upgradeconfig/statuschanged_predicate_test.go +++ b/controllers/upgradeconfig/statuschanged_predicate_test.go @@ -6,7 +6,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/event" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/controllers/upgradeconfig/upgradeconfig_controller_test.go b/controllers/upgradeconfig/upgradeconfig_controller_test.go index dfd97e2d..8c636e3b 100644 --- a/controllers/upgradeconfig/upgradeconfig_controller_test.go +++ b/controllers/upgradeconfig/upgradeconfig_controller_test.go @@ -33,7 +33,7 @@ import ( k8serrs "k8s.io/apimachinery/pkg/api/errors" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gstruct" ) diff --git a/controllers/upgradeconfig/upgradeconfig_suite_test.go b/controllers/upgradeconfig/upgradeconfig_suite_test.go index 8c4c0fee..7c9ddb20 100644 --- a/controllers/upgradeconfig/upgradeconfig_suite_test.go +++ b/controllers/upgradeconfig/upgradeconfig_suite_test.go @@ -3,7 +3,7 @@ package upgradeconfig import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/go.mod b/go.mod index 8b14f42e..c0f1638f 100644 --- a/go.mod +++ b/go.mod @@ -13,9 +13,8 @@ require ( github.com/google/uuid v1.6.0 github.com/hashicorp/go-multierror v1.1.1 github.com/jpillora/backoff v1.0.0 - github.com/onsi/ginkgo v1.16.5 - github.com/onsi/ginkgo/v2 v2.27.2 - github.com/onsi/gomega v1.38.3 + github.com/onsi/ginkgo/v2 v2.32.0 + github.com/onsi/gomega v1.40.0 github.com/openshift-online/ocm-api-model/clientapi v0.0.449 github.com/openshift-online/ocm-sdk-go v0.1.494 github.com/openshift/api v0.0.0-20260619095050-5346161d1bf2 @@ -81,7 +80,7 @@ require ( github.com/google/btree v1.1.3 // indirect github.com/google/gnostic-models v0.7.0 // indirect github.com/google/go-cmp v0.7.0 // indirect - github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect + github.com/google/pprof v0.0.0-20260402051712-545e8a4df936 // indirect github.com/gorilla/css v1.0.1 // indirect github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect @@ -130,7 +129,6 @@ require ( google.golang.org/protobuf v1.36.8 // indirect gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.35.1 // indirect k8s.io/code-generator v0.35.1 // indirect diff --git a/go.sum b/go.sum index e076322e..744d4bfc 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,6 @@ github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= @@ -102,7 +100,6 @@ github.com/go-openapi/testify/v2 v2.0.2 h1:X999g3jeLcoY8qctY/c/Z8iBHTbwLz7R2WXd6 github.com/go-openapi/testify/v2 v2.0.2/go.mod h1:HCPmvFFnheKK2BuwSA0TbbdxJ3I16pjwMkYkP4Ywn54= github.com/go-openapi/validate v0.22.6 h1:+NhuwcEYpWdO5Nm4bmvhGLW0rt1Fcc532Mu3wpypXfo= github.com/go-openapi/validate v0.22.6/go.mod h1:eaddXSqKeTg5XpSmj1dYyFTK/95n/XHwcOY+BMxKMyM= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gobuffalo/flect v1.0.3 h1:xeWBM2nui+qnVvNM4S3foBhCAL2XgPU+a7FdpelbTq4= @@ -115,13 +112,6 @@ github.com/golang/glog v1.2.4 h1:CNNw5U8lSiiBk7druxtSHHTsRWcxKoac6kZKm2peBBc= github.com/golang/glog v1.2.4/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= @@ -129,17 +119,14 @@ github.com/google/cel-go v0.26.0 h1:DPGjXackMpJWH680oGY4lZhYjIameYmR+/6RBdDGmaI= github.com/google/cel-go v0.26.0/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM= github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo= github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8= -github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA= +github.com/google/pprof v0.0.0-20260402051712-545e8a4df936 h1:EwtI+Al+DeppwYX2oXJCETMO23COyaKGP6fHVpkpWpg= +github.com/google/pprof v0.0.0-20260402051712-545e8a4df936/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -154,7 +141,6 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/itchyny/gojq v0.12.7 h1:hYPTpeWfrJ1OT+2j6cvBScbhl0TkdwGM4bc66onUSOQ= @@ -224,22 +210,16 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY= github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc= github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.27.2 h1:LzwLj0b89qtIy6SSASkzlNvX6WktqurSHwkk2ipF/Ns= -github.com/onsi/ginkgo/v2 v2.27.2/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.38.3 h1:eTX+W6dobAYfFeGC2PV6RwXRu/MyT+cQguijutvkpSM= -github.com/onsi/gomega v1.38.3/go.mod h1:ZCU1pkQcXDO5Sl9/VVEGlDyp+zm0m1cmeG5TOzLgdh4= +github.com/onsi/ginkgo/v2 v2.32.0 h1:Hw7s2pVrQo/8Yz5N77qdnpHaoc+c6cC9WIV1Jce+J6E= +github.com/onsi/ginkgo/v2 v2.32.0/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44= +github.com/onsi/gomega v1.40.0 h1:Vtol0e1MghCD2ZVIilPDIg44XSL9l2QAn8ZNaljWcJc= +github.com/onsi/gomega v1.40.0/go.mod h1:M/Uqpu/8qTjtzCLUA2zJHX9Iilrau25x1PdoSRbWh5A= github.com/openshift-online/ocm-api-model/clientapi v0.0.449 h1:cmBoJymohkBxStWGlM1Y3EZMPRAtfc3h+PrdIoozfy0= github.com/openshift-online/ocm-api-model/clientapi v0.0.449/go.mod h1:fZwy5HY2URG9nrExvQeXrDU/08TGqZ16f8oymVEN5lo= github.com/openshift-online/ocm-api-model/model v0.0.449 h1:fc/0wGwSMIeMZlJyPvFkeOuZFeNkuDJE1B8c17ZYoX4= @@ -300,7 +280,6 @@ github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= @@ -324,7 +303,6 @@ github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.mongodb.org/mongo-driver v1.13.1 h1:YIc7HTYsKndGK4RFzJ3covLz1byri52x0IoMB0Pt/vk= @@ -366,7 +344,6 @@ go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988= @@ -375,17 +352,13 @@ golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM= golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -394,23 +367,14 @@ golang.org/x/net v0.55.1-0.20260602153038-42abb857022c h1:hzdRVvjwthcq46T3ybsDtJ golang.org/x/net v0.55.1-0.20260602153038-42abb857022c/go.mod h1:Mo4aFsyVPXieTwCJ1g83a3xU8RY7PkHFQqQ7pkWnuM0= golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -442,7 +406,6 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= @@ -463,12 +426,6 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= google.golang.org/grpc v1.72.2 h1:TdbGzwb82ty4OusHWepvFWGLgIbNo1/SUynEN0ssqv8= google.golang.org/grpc v1.72.2/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc= google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -478,14 +435,11 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EV gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/evanphx/json-patch.v4 v4.13.0 h1:czT3CmqEaQ1aanPc5SdlgQrrEIb8w/wwCvWWnfEbYzo= gopkg.in/evanphx/json-patch.v4 v4.13.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkg/clusterversion/clusterversion_suite_test.go b/pkg/clusterversion/clusterversion_suite_test.go index e7cab4d0..6d06de39 100644 --- a/pkg/clusterversion/clusterversion_suite_test.go +++ b/pkg/clusterversion/clusterversion_suite_test.go @@ -3,7 +3,7 @@ package clusterversion import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/clusterversion/clusterversion_test.go b/pkg/clusterversion/clusterversion_test.go index d8a09f6d..7fff2ada 100644 --- a/pkg/clusterversion/clusterversion_test.go +++ b/pkg/clusterversion/clusterversion_test.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" configv1 "github.com/openshift/api/config/v1" "github.com/openshift/managed-upgrade-operator/util/mocks" diff --git a/pkg/collector/collector_suite_test.go b/pkg/collector/collector_suite_test.go index 4e352f76..6675656a 100644 --- a/pkg/collector/collector_suite_test.go +++ b/pkg/collector/collector_suite_test.go @@ -3,7 +3,7 @@ package collector import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/collector/collector_test.go b/pkg/collector/collector_test.go index 367d1997..6b37b4a7 100644 --- a/pkg/collector/collector_test.go +++ b/pkg/collector/collector_test.go @@ -4,7 +4,7 @@ import ( "os" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.uber.org/mock/gomock" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/drain/drain_suite_test.go b/pkg/drain/drain_suite_test.go index 465ea739..e0bd6bd3 100644 --- a/pkg/drain/drain_suite_test.go +++ b/pkg/drain/drain_suite_test.go @@ -3,7 +3,7 @@ package drain import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/drain/osd_drain_strategy_test.go b/pkg/drain/osd_drain_strategy_test.go index aac3455f..98b04518 100644 --- a/pkg/drain/osd_drain_strategy_test.go +++ b/pkg/drain/osd_drain_strategy_test.go @@ -20,7 +20,7 @@ import ( "github.com/openshift/managed-upgrade-operator/pkg/pod" "github.com/openshift/managed-upgrade-operator/util/mocks" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/drain/podDeleteStrategy_test.go b/pkg/drain/podDeleteStrategy_test.go index 4077c889..753a22ba 100644 --- a/pkg/drain/podDeleteStrategy_test.go +++ b/pkg/drain/podDeleteStrategy_test.go @@ -14,7 +14,7 @@ import ( "github.com/openshift/managed-upgrade-operator/pkg/pod" "github.com/openshift/managed-upgrade-operator/util/mocks" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/drain/pod_predicates_test.go b/pkg/drain/pod_predicates_test.go index f46b3737..8a35c3d4 100644 --- a/pkg/drain/pod_predicates_test.go +++ b/pkg/drain/pod_predicates_test.go @@ -4,7 +4,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/drain/removeFinalizersStrategy_test.go b/pkg/drain/removeFinalizersStrategy_test.go index 3dbd6710..2ba79817 100644 --- a/pkg/drain/removeFinalizersStrategy_test.go +++ b/pkg/drain/removeFinalizersStrategy_test.go @@ -15,7 +15,7 @@ import ( "github.com/openshift/managed-upgrade-operator/pkg/pod" "github.com/openshift/managed-upgrade-operator/util/mocks" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/drain/stuckTerminatingStrategy_test.go b/pkg/drain/stuckTerminatingStrategy_test.go index f59fadcb..48749db5 100644 --- a/pkg/drain/stuckTerminatingStrategy_test.go +++ b/pkg/drain/stuckTerminatingStrategy_test.go @@ -14,7 +14,7 @@ import ( "github.com/openshift/managed-upgrade-operator/pkg/pod" "github.com/openshift/managed-upgrade-operator/util/mocks" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/eventmanager/eventmanager_suite_test.go b/pkg/eventmanager/eventmanager_suite_test.go index 321a0f27..46dead2e 100644 --- a/pkg/eventmanager/eventmanager_suite_test.go +++ b/pkg/eventmanager/eventmanager_suite_test.go @@ -3,7 +3,7 @@ package eventmanager import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/eventmanager/eventmanager_test.go b/pkg/eventmanager/eventmanager_test.go index 0ec9a3e3..a2f5c61a 100644 --- a/pkg/eventmanager/eventmanager_test.go +++ b/pkg/eventmanager/eventmanager_test.go @@ -16,7 +16,7 @@ import ( testStructs "github.com/openshift/managed-upgrade-operator/util/mocks/structs" "go.uber.org/mock/gomock" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/localprovider/localprovider_suite_test.go b/pkg/localprovider/localprovider_suite_test.go index c1adb18b..08cfd4c3 100644 --- a/pkg/localprovider/localprovider_suite_test.go +++ b/pkg/localprovider/localprovider_suite_test.go @@ -3,7 +3,7 @@ package localprovider import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/localprovider/localprovider_test.go b/pkg/localprovider/localprovider_test.go index 4fb9ff79..34b3b4cd 100644 --- a/pkg/localprovider/localprovider_test.go +++ b/pkg/localprovider/localprovider_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.uber.org/mock/gomock" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/machinery/machinery_suite_test.go b/pkg/machinery/machinery_suite_test.go index fdf071bb..a1c34d8d 100644 --- a/pkg/machinery/machinery_suite_test.go +++ b/pkg/machinery/machinery_suite_test.go @@ -3,7 +3,7 @@ package machinery import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/machinery/machinery_test.go b/pkg/machinery/machinery_test.go index ed30de27..2808af82 100644 --- a/pkg/machinery/machinery_test.go +++ b/pkg/machinery/machinery_test.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/openshift/managed-upgrade-operator/util/mocks" diff --git a/pkg/maintenance/maintenance_suite_test.go b/pkg/maintenance/maintenance_suite_test.go index d86fb511..b0862751 100644 --- a/pkg/maintenance/maintenance_suite_test.go +++ b/pkg/maintenance/maintenance_suite_test.go @@ -3,7 +3,7 @@ package maintenance import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/maintenance/maintenance_test.go b/pkg/maintenance/maintenance_test.go index 2d57e768..e0182119 100644 --- a/pkg/maintenance/maintenance_test.go +++ b/pkg/maintenance/maintenance_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/notifier/config_test.go b/pkg/notifier/config_test.go index cac379d0..6ac7019f 100644 --- a/pkg/notifier/config_test.go +++ b/pkg/notifier/config_test.go @@ -1,7 +1,7 @@ package notifier import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.uber.org/mock/gomock" ) diff --git a/pkg/notifier/lognotifier_test.go b/pkg/notifier/lognotifier_test.go index 26424e5c..154cd007 100644 --- a/pkg/notifier/lognotifier_test.go +++ b/pkg/notifier/lognotifier_test.go @@ -1,7 +1,7 @@ package notifier import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.uber.org/mock/gomock" ) diff --git a/pkg/notifier/notifier_suite_test.go b/pkg/notifier/notifier_suite_test.go index 9711f055..8eb3e58a 100644 --- a/pkg/notifier/notifier_suite_test.go +++ b/pkg/notifier/notifier_suite_test.go @@ -3,7 +3,7 @@ package notifier import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/notifier/ocmconfig_test.go b/pkg/notifier/ocmconfig_test.go index 51a35c73..4f88bd13 100644 --- a/pkg/notifier/ocmconfig_test.go +++ b/pkg/notifier/ocmconfig_test.go @@ -1,7 +1,7 @@ package notifier import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.uber.org/mock/gomock" ) diff --git a/pkg/notifier/ocmnotifier_test.go b/pkg/notifier/ocmnotifier_test.go index 312baa50..b69c9ea4 100644 --- a/pkg/notifier/ocmnotifier_test.go +++ b/pkg/notifier/ocmnotifier_test.go @@ -1,7 +1,7 @@ package notifier import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/ocm/builder_test.go b/pkg/ocm/builder_test.go index 91ee6f74..85a6100f 100644 --- a/pkg/ocm/builder_test.go +++ b/pkg/ocm/builder_test.go @@ -14,7 +14,7 @@ import ( "github.com/openshift/managed-upgrade-operator/util/mocks" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.uber.org/mock/gomock" ) diff --git a/pkg/ocm/client_test.go b/pkg/ocm/client_test.go index 52f0e508..c9a353da 100644 --- a/pkg/ocm/client_test.go +++ b/pkg/ocm/client_test.go @@ -15,7 +15,7 @@ import ( "github.com/openshift/managed-upgrade-operator/util/mocks" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.uber.org/mock/gomock" ) @@ -146,8 +146,8 @@ var _ = Describe("OCM Client with SDK", func() { conn, err = sdk.NewConnectionBuilder(). URL(testServer.URL). TokenURL(testServer.URL + "/token"). // Point to test server for token refresh - Tokens("test-token"). // Add test token for authentication - Insecure(true). // Skip TLS verification for test server + Tokens("test-token"). // Add test token for authentication + Insecure(true). // Skip TLS verification for test server Build() Expect(err).To(BeNil()) diff --git a/pkg/ocm/config_test.go b/pkg/ocm/config_test.go index 59a158da..9fa9c294 100644 --- a/pkg/ocm/config_test.go +++ b/pkg/ocm/config_test.go @@ -1,7 +1,7 @@ package ocm import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.uber.org/mock/gomock" ) diff --git a/pkg/ocm/ocm_suite_test.go b/pkg/ocm/ocm_suite_test.go index 471c0c8b..43b21070 100644 --- a/pkg/ocm/ocm_suite_test.go +++ b/pkg/ocm/ocm_suite_test.go @@ -3,7 +3,7 @@ package ocm import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/ocmagent/client_test.go b/pkg/ocmagent/client_test.go index 475bf3b2..301005a9 100644 --- a/pkg/ocmagent/client_test.go +++ b/pkg/ocmagent/client_test.go @@ -9,7 +9,7 @@ import ( sdk "github.com/openshift-online/ocm-sdk-go" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.uber.org/mock/gomock" ) @@ -125,8 +125,8 @@ var _ = Describe("OCM Agent Client with SDK", func() { conn, err = sdk.NewConnectionBuilder(). URL(testServer.URL). TokenURL(testServer.URL + "/token"). // Point to test server for token refresh - Tokens("test-token"). // Add test token for authentication - Insecure(true). // Skip TLS verification for test server + Tokens("test-token"). // Add test token for authentication + Insecure(true). // Skip TLS verification for test server Build() Expect(err).To(BeNil()) diff --git a/pkg/ocmagent/ocmagent_suite_test.go b/pkg/ocmagent/ocmagent_suite_test.go index 31486cd9..bcfb5dc5 100644 --- a/pkg/ocmagent/ocmagent_suite_test.go +++ b/pkg/ocmagent/ocmagent_suite_test.go @@ -3,7 +3,7 @@ package ocmagent import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/ocmprovider/config_test.go b/pkg/ocmprovider/config_test.go index 7cc075f4..4f319220 100644 --- a/pkg/ocmprovider/config_test.go +++ b/pkg/ocmprovider/config_test.go @@ -1,7 +1,7 @@ package ocmprovider import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.uber.org/mock/gomock" ) diff --git a/pkg/ocmprovider/ocmprovider_suite_test.go b/pkg/ocmprovider/ocmprovider_suite_test.go index 0096d453..3feb8928 100644 --- a/pkg/ocmprovider/ocmprovider_suite_test.go +++ b/pkg/ocmprovider/ocmprovider_suite_test.go @@ -3,7 +3,7 @@ package ocmprovider import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/ocmprovider/ocmprovider_test.go b/pkg/ocmprovider/ocmprovider_test.go index 3d2836bd..27c232dc 100644 --- a/pkg/ocmprovider/ocmprovider_test.go +++ b/pkg/ocmprovider/ocmprovider_test.go @@ -8,7 +8,7 @@ import ( mockOcm "github.com/openshift/managed-upgrade-operator/pkg/ocm/mocks" "github.com/openshift/managed-upgrade-operator/util/mocks" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.uber.org/mock/gomock" ) diff --git a/pkg/pod/pod_suite_test.go b/pkg/pod/pod_suite_test.go index 1fc6a33d..8668e523 100644 --- a/pkg/pod/pod_suite_test.go +++ b/pkg/pod/pod_suite_test.go @@ -3,7 +3,7 @@ package pod import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/pod/pod_test.go b/pkg/pod/pod_test.go index 0d3d747b..19b1d68d 100644 --- a/pkg/pod/pod_test.go +++ b/pkg/pod/pod_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/go-logr/logr" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.uber.org/mock/gomock" corev1 "k8s.io/api/core/v1" diff --git a/pkg/scaler/scaler_suite_test.go b/pkg/scaler/scaler_suite_test.go index 60b3e64c..be8dc9b2 100644 --- a/pkg/scaler/scaler_suite_test.go +++ b/pkg/scaler/scaler_suite_test.go @@ -3,7 +3,7 @@ package scaler import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/scaler/scaling_test.go b/pkg/scaler/scaling_test.go index 3aa9ff44..051f2d2e 100644 --- a/pkg/scaler/scaling_test.go +++ b/pkg/scaler/scaling_test.go @@ -8,7 +8,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/go-logr/logr" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" machineapi "github.com/openshift/api/machine/v1beta1" "github.com/openshift/managed-upgrade-operator/pkg/drain" diff --git a/pkg/scheduler/scheduler_suite_test.go b/pkg/scheduler/scheduler_suite_test.go index 1ec5912e..cb359c6c 100644 --- a/pkg/scheduler/scheduler_suite_test.go +++ b/pkg/scheduler/scheduler_suite_test.go @@ -3,7 +3,7 @@ package scheduler import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/scheduler/scheduler_test.go b/pkg/scheduler/scheduler_test.go index 22a236c6..369c40f5 100644 --- a/pkg/scheduler/scheduler_test.go +++ b/pkg/scheduler/scheduler_test.go @@ -3,7 +3,7 @@ package scheduler import ( "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/upgradeconfigmanager/upgradeconfigmanager_suite_test.go b/pkg/upgradeconfigmanager/upgradeconfigmanager_suite_test.go index aa1b0f9b..7427d485 100644 --- a/pkg/upgradeconfigmanager/upgradeconfigmanager_suite_test.go +++ b/pkg/upgradeconfigmanager/upgradeconfigmanager_suite_test.go @@ -3,7 +3,7 @@ package upgradeconfigmanager import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/upgradeconfigmanager/upgradeconfigmanager_test.go b/pkg/upgradeconfigmanager/upgradeconfigmanager_test.go index fe303362..5aca3806 100644 --- a/pkg/upgradeconfigmanager/upgradeconfigmanager_test.go +++ b/pkg/upgradeconfigmanager/upgradeconfigmanager_test.go @@ -19,7 +19,7 @@ import ( ppMocks "github.com/openshift/managed-upgrade-operator/pkg/specprovider/mocks" "github.com/openshift/managed-upgrade-operator/util/mocks" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/upgraders/availabilitycheckstep_test.go b/pkg/upgraders/availabilitycheckstep_test.go index 71ba777c..a9050096 100644 --- a/pkg/upgraders/availabilitycheckstep_test.go +++ b/pkg/upgraders/availabilitycheckstep_test.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/go-logr/logr" diff --git a/pkg/upgraders/config_test.go b/pkg/upgraders/config_test.go index bf84f70f..7482907f 100644 --- a/pkg/upgraders/config_test.go +++ b/pkg/upgraders/config_test.go @@ -1,7 +1,7 @@ package upgraders import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/upgraders/controlplanestep_test.go b/pkg/upgraders/controlplanestep_test.go index 5bc3ef5f..9a3a6115 100644 --- a/pkg/upgraders/controlplanestep_test.go +++ b/pkg/upgraders/controlplanestep_test.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/go-logr/logr" diff --git a/pkg/upgraders/delaystep_test.go b/pkg/upgraders/delaystep_test.go index 3a70f00e..a26b9e7e 100644 --- a/pkg/upgraders/delaystep_test.go +++ b/pkg/upgraders/delaystep_test.go @@ -7,7 +7,7 @@ import ( "github.com/openshift/managed-upgrade-operator/pkg/notifier" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/go-logr/logr" diff --git a/pkg/upgraders/healthcheck_alerts_test.go b/pkg/upgraders/healthcheck_alerts_test.go index 22f3813d..7d58162e 100644 --- a/pkg/upgraders/healthcheck_alerts_test.go +++ b/pkg/upgraders/healthcheck_alerts_test.go @@ -3,7 +3,7 @@ package upgraders import ( "fmt" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/go-logr/logr" diff --git a/pkg/upgraders/healthcheck_clusteroperators_test.go b/pkg/upgraders/healthcheck_clusteroperators_test.go index 57713406..3423a691 100644 --- a/pkg/upgraders/healthcheck_clusteroperators_test.go +++ b/pkg/upgraders/healthcheck_clusteroperators_test.go @@ -3,7 +3,7 @@ package upgraders import ( "fmt" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/go-logr/logr" diff --git a/pkg/upgraders/healthcheck_nodes_test.go b/pkg/upgraders/healthcheck_nodes_test.go index cc024bad..6e8e29ba 100644 --- a/pkg/upgraders/healthcheck_nodes_test.go +++ b/pkg/upgraders/healthcheck_nodes_test.go @@ -3,7 +3,7 @@ package upgraders import ( "fmt" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/go-logr/logr" diff --git a/pkg/upgraders/healthcheck_pdb_test.go b/pkg/upgraders/healthcheck_pdb_test.go index c51f7eb9..8d811026 100644 --- a/pkg/upgraders/healthcheck_pdb_test.go +++ b/pkg/upgraders/healthcheck_pdb_test.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/go-logr/logr" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" upgradev1alpha1 "github.com/openshift/managed-upgrade-operator/api/v1alpha1" dvoMocks "github.com/openshift/managed-upgrade-operator/pkg/dvo/mocks" diff --git a/pkg/upgraders/healthcheckstep_test.go b/pkg/upgraders/healthcheckstep_test.go index eb0b575a..a664a7ea 100644 --- a/pkg/upgraders/healthcheckstep_test.go +++ b/pkg/upgraders/healthcheckstep_test.go @@ -6,7 +6,7 @@ import ( "strings" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/go-logr/logr" diff --git a/pkg/upgraders/maintenancestep_test.go b/pkg/upgraders/maintenancestep_test.go index 0fc55022..07494059 100644 --- a/pkg/upgraders/maintenancestep_test.go +++ b/pkg/upgraders/maintenancestep_test.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/go-logr/logr" diff --git a/pkg/upgraders/notifierstep_test.go b/pkg/upgraders/notifierstep_test.go index 3559850c..ec3a6bdf 100644 --- a/pkg/upgraders/notifierstep_test.go +++ b/pkg/upgraders/notifierstep_test.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/go-logr/logr" diff --git a/pkg/upgraders/postupgradestep_test.go b/pkg/upgraders/postupgradestep_test.go index d9a0291e..0833a5fb 100644 --- a/pkg/upgraders/postupgradestep_test.go +++ b/pkg/upgraders/postupgradestep_test.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-logr/logr" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/upgraders/scalerstep_test.go b/pkg/upgraders/scalerstep_test.go index 8950f4c3..cfa2f9d7 100644 --- a/pkg/upgraders/scalerstep_test.go +++ b/pkg/upgraders/scalerstep_test.go @@ -6,7 +6,7 @@ import ( "github.com/openshift/managed-upgrade-operator/pkg/notifier" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/go-logr/logr" diff --git a/pkg/upgraders/upgradeable_test.go b/pkg/upgraders/upgradeable_test.go index 37ba3619..205e81b9 100644 --- a/pkg/upgraders/upgradeable_test.go +++ b/pkg/upgraders/upgradeable_test.go @@ -4,8 +4,8 @@ import ( "context" "time" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/ginkgo/v2/extensions/table" . "github.com/onsi/gomega" "github.com/go-logr/logr" diff --git a/pkg/upgraders/upgraders_suite_test.go b/pkg/upgraders/upgraders_suite_test.go index 254e99f5..329fae5d 100644 --- a/pkg/upgraders/upgraders_suite_test.go +++ b/pkg/upgraders/upgraders_suite_test.go @@ -5,7 +5,7 @@ import ( "github.com/openshift/managed-upgrade-operator/pkg/drain" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/upgraders/workerstep_test.go b/pkg/upgraders/workerstep_test.go index 552ab35b..4ccef8da 100644 --- a/pkg/upgraders/workerstep_test.go +++ b/pkg/upgraders/workerstep_test.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/go-logr/logr" diff --git a/pkg/upgradesteps/runner_test.go b/pkg/upgradesteps/runner_test.go index 270b2f77..030372d8 100644 --- a/pkg/upgradesteps/runner_test.go +++ b/pkg/upgradesteps/runner_test.go @@ -7,7 +7,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/go-logr/logr" @@ -42,8 +42,8 @@ var _ = Describe("HealthCheckStep", func() { } upgradeConfig = testStructs.NewUpgradeConfigBuilder().WithNamespacedName(upgradeConfigName).GetUpgradeConfig() upgradeConfig.Status.History.SetHistory(upgradev1alpha1.UpgradeHistory{ - Version: upgradeConfig.Spec.Desired.Version, - Phase: upgradev1alpha1.UpgradePhaseNew, + Version: upgradeConfig.Spec.Desired.Version, + Phase: upgradev1alpha1.UpgradePhaseNew, }) }) diff --git a/pkg/upgradesteps/upgradesteps_suite_test.go b/pkg/upgradesteps/upgradesteps_suite_test.go index 21abad2f..b7c3b220 100644 --- a/pkg/upgradesteps/upgradesteps_suite_test.go +++ b/pkg/upgradesteps/upgradesteps_suite_test.go @@ -3,7 +3,7 @@ package upgradesteps import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/validation/validation_suite_test.go b/pkg/validation/validation_suite_test.go index 61e385d7..dd6a2398 100644 --- a/pkg/validation/validation_suite_test.go +++ b/pkg/validation/validation_suite_test.go @@ -3,7 +3,7 @@ package validation import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/validation/validation_test.go b/pkg/validation/validation_test.go index 7a2d77c8..0136dc8c 100644 --- a/pkg/validation/validation_test.go +++ b/pkg/validation/validation_test.go @@ -6,7 +6,7 @@ import ( "github.com/blang/semver/v4" "github.com/go-logr/logr" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/tools.go b/tools.go index 82cbbe10..c9021e9d 100644 --- a/tools.go +++ b/tools.go @@ -1,3 +1,4 @@ +//go:build tools // +build tools // Place any runtime dependencies as imports in this file. @@ -5,6 +6,6 @@ package tools import ( - _ "github.com/onsi/ginkgo" + _ "github.com/onsi/ginkgo/v2" _ "sigs.k8s.io/controller-tools/cmd/controller-gen" ) diff --git a/util/access_token_test.go b/util/access_token_test.go index c55c92a3..fb0de80f 100644 --- a/util/access_token_test.go +++ b/util/access_token_test.go @@ -7,7 +7,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/openshift/managed-upgrade-operator/util/mocks" ) diff --git a/util/util_suite_test.go b/util/util_suite_test.go index 044838e1..4c6eb3f2 100644 --- a/util/util_suite_test.go +++ b/util/util_suite_test.go @@ -3,7 +3,7 @@ package util import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" )