Migrate test utils to actuator-pkg repository

Makefile

@@ -1,5 +1,5 @@
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.25
+ENVTEST_K9S_VERSION = 1.26
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -23,7 +23,7 @@ GOLANGCI_LINT = go run ${PROJECT_DIR}/vendor/github.com/golangci/golangci-lint/c
 VERSION ?= $(shell git describe --always --abbrev=7)
 MUTABLE_TAG ?= latest
 IMAGE ?= cluster-control-plane-machine-set-operator
-BUILD_IMAGE ?= registry.ci.openshift.org/openshift/release:golang-1.18
+BUILD_IMAGE ?= registry.ci.openshift.org/openshift/release:golang-1.19
 
 ifeq ($(shell command -v podman > /dev/null 2>&1 ; echo $$? ), 0)
  ENGINE=podman

go.mod

@@ -6,42 +6,37 @@ require (
  github.com/go-logr/logr v1.2.3
  github.com/go-test/deep v1.0.8
  github.com/golang/mock v1.6.0
- github.com/golangci/golangci-lint v1.49.0
- github.com/onsi/ginkgo/v2 v2.4.0
- github.com/onsi/gomega v1.23.0
- github.com/openshift/api v0.0.0-20221004120407-c46852673d03
- github.com/openshift/client-go v0.0.0-20221006134153-58ea193f9d20
- github.com/openshift/library-go v0.0.0-20220922140741-7772048e4447
+ github.com/golangci/golangci-lint v1.50.1
+ github.com/onsi/ginkgo/v2 v2.7.0
+ github.com/onsi/gomega v1.26.0
+ github.com/openshift/api v0.0.0-20230120195050-6ba31fa438f2
+ github.com/openshift/client-go v0.0.0-20230120202327-72f107311084
+ github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-00010101000000-000000000000
+ github.com/openshift/library-go v0.0.0-20230120214501-9bc305884fcb
  github.com/spf13/pflag v1.0.5
- k8s.io/api v0.25.1
- k8s.io/apimachinery v0.25.1
- k8s.io/client-go v0.25.1
- k8s.io/component-base v0.25.1
+ k8s.io/api v0.26.1
+ k8s.io/apimachinery v0.26.1
+ k8s.io/client-go v0.26.1
+ k8s.io/component-base v0.26.1
  k8s.io/klog/v2 v2.80.1
- k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
- sigs.k8s.io/controller-runtime v0.13.0
- sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220927155351-7399a3a595bf
+ k8s.io/utils v0.0.0-20230115233650-391b47cb4029
+ sigs.k8s.io/controller-runtime v0.14.1
+ sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230131074648-f5014c077fc3
  sigs.k8s.io/controller-tools v0.10.0
 )
 
+replace github.com/openshift/cluster-api-actuator-pkg/testutils => github.com/RadekManak/cluster-api-actuator-pkg/testutils v0.0.0-20230201125136-02f668983c91
+
 require (
  4d63.com/gochecknoglobals v0.1.0 // indirect
- cloud.google.com/go/compute v1.6.1 // indirect
+ github.com/Abirdcfly/dupword v0.0.7 // indirect
  github.com/Antonboom/errname v0.1.7 // indirect
  github.com/Antonboom/nilnil v0.1.1 // indirect
- github.com/Azure/go-autorest v14.2.0+incompatible // indirect
- github.com/Azure/go-autorest/autorest v0.11.27 // indirect
- github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
- github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
- github.com/Azure/go-autorest/logger v0.2.1 // indirect
- github.com/Azure/go-autorest/tracing v0.6.0 // indirect
- github.com/BurntSushi/toml v1.2.0 // indirect
+ github.com/BurntSushi/toml v1.2.1 // indirect
  github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
  github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect
  github.com/Masterminds/semver v1.5.0 // indirect
- github.com/OpenPeeDeeP/depguard v1.1.0 // indirect
- github.com/PuerkitoBio/purell v1.1.1 // indirect
- github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+ github.com/OpenPeeDeeP/depguard v1.1.1 // indirect
  github.com/alexkohler/prealloc v1.0.0 // indirect
  github.com/alingse/asasalint v0.0.11 // indirect
  github.com/ashanbrown/forbidigo v1.3.0 // indirect
@@ -56,28 +51,28 @@ require (
  github.com/cespare/xxhash/v2 v2.1.2 // indirect
  github.com/charithe/durationcheck v0.0.9 // indirect
  github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect
- github.com/curioswitch/go-reassign v0.1.2 // indirect
- github.com/daixiang0/gci v0.6.3 // indirect
+ github.com/curioswitch/go-reassign v0.2.0 // indirect
+ github.com/daixiang0/gci v0.8.1 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/denis-tingaikin/go-header v0.4.3 // indirect
- github.com/emicklei/go-restful/v3 v3.8.0 // indirect
+ github.com/emicklei/go-restful/v3 v3.9.0 // indirect
  github.com/esimonov/ifshort v1.0.4 // indirect
  github.com/ettle/strcase v0.1.1 // indirect
  github.com/evanphx/json-patch/v5 v5.6.0 // indirect
  github.com/fatih/color v1.13.0 // indirect
  github.com/fatih/structtag v1.2.0 // indirect
  github.com/firefart/nonamedreturns v1.0.4 // indirect
- github.com/fsnotify/fsnotify v1.5.4 // indirect
+ github.com/fsnotify/fsnotify v1.6.0 // indirect
  github.com/fzipp/gocyclo v0.6.0 // indirect
- github.com/go-critic/go-critic v0.6.4 // indirect
+ github.com/go-critic/go-critic v0.6.5 // indirect
  github.com/go-logr/zapr v1.2.3 // indirect
  github.com/go-openapi/jsonpointer v0.19.5 // indirect
- github.com/go-openapi/jsonreference v0.19.5 // indirect
+ github.com/go-openapi/jsonreference v0.20.0 // indirect
  github.com/go-openapi/swag v0.19.14 // indirect
  github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
  github.com/go-toolsmith/astcast v1.0.0 // indirect
- github.com/go-toolsmith/astcopy v1.0.1 // indirect
- github.com/go-toolsmith/astequal v1.0.2 // indirect
+ github.com/go-toolsmith/astcopy v1.0.2 // indirect
+ github.com/go-toolsmith/astequal v1.0.3 // indirect
  github.com/go-toolsmith/astfmt v1.0.0 // indirect
  github.com/go-toolsmith/astp v1.0.0 // indirect
  github.com/go-toolsmith/strparse v1.0.0 // indirect
@@ -87,13 +82,12 @@ require (
  github.com/gobwas/glob v0.2.3 // indirect
  github.com/gofrs/flock v0.8.1 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
- github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
  github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
  github.com/golang/protobuf v1.5.2 // indirect
  github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
  github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
  github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect
- github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a // indirect
+ github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 // indirect
  github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
  github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect
  github.com/golangci/misspell v0.3.5 // indirect
@@ -115,7 +109,7 @@ require (
  github.com/hashicorp/hcl v1.0.0 // indirect
  github.com/hexops/gotextdiff v1.0.3 // indirect
  github.com/imdario/mergo v0.3.12 // indirect
- github.com/inconshreveable/mousetrap v1.0.0 // indirect
+ github.com/inconshreveable/mousetrap v1.0.1 // indirect
  github.com/jgautheron/goconst v1.5.1 // indirect
  github.com/jingyugao/rowserrcheck v1.1.1 // indirect
  github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
@@ -124,6 +118,7 @@ require (
  github.com/julz/importas v0.1.0 // indirect
  github.com/kisielk/errcheck v1.6.2 // indirect
  github.com/kisielk/gotool v1.0.0 // indirect
+ github.com/kkHAIKE/contextcheck v1.1.3 // indirect
  github.com/kulti/thelper v0.6.3 // indirect
  github.com/kunwardeep/paralleltest v1.0.6 // indirect
  github.com/kyoh86/exportloopref v0.1.8 // indirect
@@ -133,14 +128,15 @@ require (
  github.com/lufeee/execinquery v1.2.1 // indirect
  github.com/magiconair/properties v1.8.6 // indirect
  github.com/mailru/easyjson v0.7.6 // indirect
+ github.com/maratori/testableexamples v1.0.0 // indirect
  github.com/maratori/testpackage v1.1.0 // indirect
  github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
  github.com/mattn/go-colorable v0.1.13 // indirect
  github.com/mattn/go-isatty v0.0.16 // indirect
  github.com/mattn/go-runewidth v0.0.13 // indirect
- github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
  github.com/mbilski/exhaustivestruct v1.2.0 // indirect
- github.com/mgechev/revive v1.2.3 // indirect
+ github.com/mgechev/revive v1.2.4 // indirect
  github.com/mitchellh/go-homedir v1.1.0 // indirect
  github.com/mitchellh/mapstructure v1.5.0 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -149,29 +145,29 @@ require (
  github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
  github.com/nakabonne/nestif v0.3.1 // indirect
  github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
- github.com/nishanths/exhaustive v0.8.1 // indirect
+ github.com/nishanths/exhaustive v0.8.3 // indirect
  github.com/nishanths/predeclared v0.2.2 // indirect
  github.com/olekukonko/tablewriter v0.0.5 // indirect
  github.com/pelletier/go-toml v1.9.5 // indirect
- github.com/pelletier/go-toml/v2 v2.0.2 // indirect
+ github.com/pelletier/go-toml/v2 v2.0.5 // indirect
  github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
  github.com/pkg/errors v0.9.1 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
- github.com/polyfloyd/go-errorlint v1.0.2 // indirect
- github.com/prometheus/client_golang v1.12.2 // indirect
- github.com/prometheus/client_model v0.2.0 // indirect
+ github.com/polyfloyd/go-errorlint v1.0.5 // indirect
+ github.com/prometheus/client_golang v1.14.0 // indirect
+ github.com/prometheus/client_model v0.3.0 // indirect
  github.com/prometheus/common v0.37.0 // indirect
- github.com/prometheus/procfs v0.7.3 // indirect
- github.com/quasilyte/go-ruleguard v0.3.17 // indirect
- github.com/quasilyte/gogrep v0.0.0-20220429205452-5e2753ee08f9 // indirect
+ github.com/prometheus/procfs v0.8.0 // indirect
+ github.com/quasilyte/go-ruleguard v0.3.18 // indirect
+ github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f // indirect
  github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
  github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
  github.com/rivo/uniseg v0.2.0 // indirect
  github.com/ryancurrah/gomodguard v1.2.4 // indirect
  github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
  github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
  github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
- github.com/sashamelentyev/usestdlibvars v1.13.0 // indirect
+ github.com/sashamelentyev/usestdlibvars v1.20.0 // indirect
  github.com/securego/gosec/v2 v2.13.1 // indirect
  github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
  github.com/sirupsen/logrus v1.9.0 // indirect
@@ -182,21 +178,20 @@ require (
  github.com/sourcegraph/go-diff v0.6.1 // indirect
  github.com/spf13/afero v1.9.2 // indirect
  github.com/spf13/cast v1.5.0 // indirect
- github.com/spf13/cobra v1.5.0 // indirect
+ github.com/spf13/cobra v1.6.0 // indirect
  github.com/spf13/jwalterweatherman v1.1.0 // indirect
  github.com/spf13/viper v1.12.0 // indirect
  github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
  github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
  github.com/stretchr/objx v0.4.0 // indirect
  github.com/stretchr/testify v1.8.0 // indirect
- github.com/subosito/gotenv v1.4.0 // indirect
- github.com/sylvia7788/contextcheck v1.0.6 // indirect
+ github.com/subosito/gotenv v1.4.1 // indirect
  github.com/tdakkota/asciicheck v0.1.1 // indirect
  github.com/tetafro/godot v1.4.11 // indirect
  github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect
- github.com/timonwong/logrlint v0.1.0 // indirect
- github.com/tomarrell/wrapcheck/v2 v2.6.2 // indirect
- github.com/tommy-muehle/go-mnd/v2 v2.5.0 // indirect
+ github.com/timonwong/loggercheck v0.9.3 // indirect
+ github.com/tomarrell/wrapcheck/v2 v2.7.0 // indirect
+ github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
  github.com/ultraware/funlen v0.0.3 // indirect
  github.com/ultraware/whitespace v0.0.5 // indirect
  github.com/uudashr/gocognit v1.0.6 // indirect
@@ -205,30 +200,29 @@ require (
  gitlab.com/bosi/decorder v0.2.3 // indirect
  go.uber.org/atomic v1.9.0 // indirect
  go.uber.org/multierr v1.8.0 // indirect
- go.uber.org/zap v1.21.0 // indirect
- golang.org/x/crypto v0.1.0 // indirect
+ go.uber.org/zap v1.24.0 // indirect
  golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
- golang.org/x/exp/typeparams v0.0.0-20220713135740-79cabaa25d75 // indirect
- golang.org/x/mod v0.6.0 // indirect
- golang.org/x/net v0.1.0 // indirect
+ golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
+ golang.org/x/mod v0.7.0 // indirect
+ golang.org/x/net v0.5.0 // indirect
  golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
- golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
- golang.org/x/sys v0.1.0 // indirect
- golang.org/x/term v0.1.0 // indirect
- golang.org/x/text v0.4.0 // indirect
- golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
- golang.org/x/tools v0.2.0 // indirect
+ golang.org/x/sync v0.1.0 // indirect
+ golang.org/x/sys v0.4.0 // indirect
+ golang.org/x/term v0.4.0 // indirect
+ golang.org/x/text v0.6.0 // indirect
+ golang.org/x/time v0.3.0 // indirect
+ golang.org/x/tools v0.4.0 // indirect
  gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/protobuf v1.28.0 // indirect
+ google.golang.org/protobuf v1.28.1 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
- gopkg.in/ini.v1 v1.66.6 // indirect
+ gopkg.in/ini.v1 v1.67.0 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
  honnef.co/go/tools v0.3.3 // indirect
- k8s.io/apiextensions-apiserver v0.25.0 // indirect
- k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
- mvdan.cc/gofumpt v0.3.1 // indirect
+ k8s.io/apiextensions-apiserver v0.26.1 // indirect
+ k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
+ mvdan.cc/gofumpt v0.4.0 // indirect
  mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
  mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
  mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 // indirect