Move from rancher/rancher to rancher/shepherd and update the module_d…

…ep doc

Signed-off-by: Parthvi <parthvi.vala@gmail.com>

docs/module_dep.md

@@ -4,12 +4,13 @@ This doc walks through general steps to update pkg dependencies of this project.
 ```go
 module github.com/rancher/hosted-providers-e2e
 
-go 1.19
+go 1.20
 
 require (
     github.com/onsi/ginkgo/v2 latest
     github.com/onsi/gomega latest
-    github.com/rancher/rancher fa9e804ff2d7         // release/v2.8.1 HEAD commit
+    github.com/epinio/epinio latest
+    github.com/rancher/shepherd 3690b7e         // release/v2.8.1 HEAD commit
     github.com/stretchr/testify latest
     k8s.io/api v0.28.6
     k8s.io/apimachinery v0.28.6
@@ -20,80 +21,19 @@ replace (
     k8s.io/client-go => github.com/rancher/client-go v1.28.6-rancher1
 )
 ```
-1. `go mod download` - This will resolve all the versions and add appropriate entry to `go.sum`.
 
----Output of go.mod---
-```
-module github.com/rancher/hosted-providers-e2e
-
-go 1.19
-
-require (
-	github.com/onsi/ginkgo/v2 v2.12.1
-	github.com/onsi/gomega v1.27.10
-	github.com/rancher/rancher
-	github.com/stretchr/testify v1.8.4
-	k8s.io/api v0.28.6
-	k8s.io/apimachinery v0.28.6
-)
-
-replace (
-	k8s.io/api => k8s.io/api v0.28.6
-	k8s.io/client-go => github.com/rancher/client-go v1.28.6-rancher1
-)
-```
-
----------
-
-(Optional) 2. `go mod tidy` - this will error out since we have not resolved `rancher/rancher/pkg/apis` and `rancher/rancher/pkg/client` dependencies.
+1. `go mod tidy` - This will resolve all the versions and dependencies, and generate the `go.sum` file.
+2. `go mod vendor` - This will generate vendor files; these are ignored by .gitignore.
 
-```shell
-$ go mod tidy
-github.com/rancher/rancher/pkg/apis/ui.cattle.io/v1: reading github.com/rancher/rancher/pkg/apis/go.mod at revision pkg/apis/v0.0.0: unknown revision pkg/apis/v0.0.0
-```
-
-```shell
-$ go list -m -json -mod=mod all #gosetup
-
-go: github.com/rancher/rancher/pkg/apis@v0.0.0: invalid version: unknown revision pkg/apis/v0.0.0
-go: github.com/rancher/rancher/pkg/client@v0.0.0: invalid version: unknown revision pkg/client/v0.0.0
-```
-
-3. `go mod edit -replace=github.com/rancher/rancher/pkg/apis=github.com/rancher/rancher/pkg/apis@v0.0.0-20240118221102-fa9e804ff2d7`
-4. `go mod edit -replace=github.com/rancher/rancher/pkg/client=github.com/rancher/rancher/pkg/client@v0.0.0-20240118221102-fa9e804ff2d7`
-```go
-module github.com/rancher/hosted-providers-e2e
-
-go 1.19
-
-require (
-    github.com/onsi/ginkgo/v2 v2.12.1
-    github.com/onsi/gomega v1.27.10
-    github.com/rancher/rancher v0.0.0-20240118221102-fa9e804ff2d7
-    github.com/stretchr/testify v1.8.4
-    k8s.io/api v0.28.6
-    k8s.io/apimachinery v0.28.6
-)
-
-replace (
-    k8s.io/api => k8s.io/api v0.28.6
-    k8s.io/client-go => github.com/rancher/client-go v1.28.6-rancher1
-    github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20240118221102-fa9e804ff2d7
-    github.com/rancher/rancher/pkg/client => github.com/rancher/rancher/pkg/client v0.0.0-20240118221102-fa9e804ff2d7
-)
-```
 
-5. `go mod tidy`
-6. `go mod vendor`
+### Updating the dependecies
 
 There are 4 different kind of packages we are concerned about:
 1. Non-kubernetes, non-Rancher pkg: `onsi/ginkgo`, `onsi/gomega`, etc.
    - These pkgs can be updated as usual by either using `latest` or a specific version.
-2. Non-kubernetes, Rancher pkg: `rancher/rancher`, `rancher/rancher/apis`, `rancher/rancher/client`. 
-    - `rancher/rancher` is the main package and the other 2 are dependants.
-    - `rancher/rancher` is always updated by using commit HEAD and then resolving using `go mod download`. Once the version is resolved, `rancher/rancher/client` and `rancher/rancher/apis` must be updated with the same version.
-    - `github.com/rancher/rancher` has many branches, 3 actively worked on at any given time, we are currently using `release/v2.8.1` where k8s 1.28 is the highest supported version. When we decide to test k8s 1.29, we need to update all the Kubernetes related pkgs and move to branch `release/v2.9`.
-    - Kubernetes pkg and `rancher/rancher` must be in sync to avoid any unnecessary conflicts.
+2. Non-kubernetes, Rancher pkg: `rancher/shepherd.
+    - `rancher/shepherd` is always updated by using commit HEAD and then resolving using `go mod download`.
+    - `github.com/rancher/shepherd` has many branches, currently we are using the `main` branch.
 3. Kubernetes, non-Rancher pkg: k8s.io/api, k8s.io/apimachinery.
     - Kubernetes related packages are bumped to support a newer k8s version and must always be in sync to avoid unnecessary conflicts.
     - Ref: [k8s.io/api/tags](https://github.com/kubernetes/api/tags), [k8s.io/apimachinary/tags](https://github.com/kubernetes/apimachinery/tags)

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.15.0
 	github.com/onsi/gomega v1.31.1
 	github.com/pkg/errors v0.9.1
-	github.com/rancher/rancher v0.0.0-20240118221102-fa9e804ff2d7
+	github.com/rancher/shepherd v0.0.0-20240130172509-3690b7e7016b
 	k8s.io/apimachinery v0.28.6
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 )
@@ -44,7 +44,6 @@ require (
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matryer/moq v0.3.2 // indirect
 	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -63,15 +62,13 @@ require (
 	github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29 // indirect
 	github.com/rancher/norman v0.0.0-20230831160711-5de27f66385d // indirect
 	github.com/rancher/rancher/pkg/apis v0.0.0-20230915232223-a9ea4ce4a5ba // indirect
-	github.com/rancher/rancher/pkg/client v0.0.0 // indirect
-	github.com/rancher/rke v1.5.2 // indirect
+	github.com/rancher/rke v1.5.0 // indirect
 	github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20210727200656-10b094e30007 // indirect
 	github.com/rancher/wrangler v1.1.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/testify v1.8.4 // indirect
 	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
-	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/net v0.19.0 // indirect
 	golang.org/x/oauth2 v0.14.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect
@@ -90,7 +87,6 @@ require (
 	k8s.io/apiserver v0.28.3 // indirect
 	k8s.io/client-go v12.0.0+incompatible // indirect
 	k8s.io/component-base v0.28.3 // indirect
-	k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
 	k8s.io/klog/v2 v2.110.1 // indirect
 	k8s.io/kube-aggregator v0.27.4 // indirect
 	k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e // indirect
@@ -107,7 +103,3 @@ replace (
 	k8s.io/api => k8s.io/api v0.28.6
 	k8s.io/client-go => github.com/rancher/client-go v1.28.6-rancher1
 )
-
-replace github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20240118221102-fa9e804ff2d7
-
-replace github.com/rancher/rancher/pkg/client => github.com/rancher/rancher/pkg/client v0.0.0-20240118221102-fa9e804ff2d7

go.sum

@@ -456,8 +456,6 @@ github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/matryer/moq v0.3.2 h1:z7oltmpTxiQ9nKNg0Jc7z45TM+eO7OhCVohxRxwaudM=
-github.com/matryer/moq v0.3.2/go.mod h1:RJ75ZZZD71hejp39j4crZLsEDszGk6iH4v4YsWFKH4s=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
@@ -603,14 +601,12 @@ github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29 h1:+kige/h8/LnzWgPjB
 github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29/go.mod h1:kgk9kJVMj9FIrrXU0iyM6u/9Je4bEjPImqswkTVaKsQ=
 github.com/rancher/norman v0.0.0-20230831160711-5de27f66385d h1:Ft/iTH91TlE2oBGmpkdO4I8o8cvUmCnytdwu52a/tN4=
 github.com/rancher/norman v0.0.0-20230831160711-5de27f66385d/go.mod h1:Sm2Xqai+aecgmJ86ygyEe+TdPMLkauEpykSstBAu4Ko=
-github.com/rancher/rancher v0.0.0-20240118221102-fa9e804ff2d7 h1:amUKmw/BylvcW+Lcvl3U2odGuZc5U+KSU7LsSvPIqoc=
-github.com/rancher/rancher v0.0.0-20240118221102-fa9e804ff2d7/go.mod h1:7IPVp9e9iK7uVTpTeeCa83zFHsd5kfdmUEnjorPBGGk=
-github.com/rancher/rancher/pkg/apis v0.0.0-20240118221102-fa9e804ff2d7 h1:iNNygGd90tPIkOepx7RGpLzosODHnmymmxZbfftJfQA=
-github.com/rancher/rancher/pkg/apis v0.0.0-20240118221102-fa9e804ff2d7/go.mod h1:PEG3/vvgShRNFg/Z+an1cnHnpUrM1cVwFkxyzKvc4PM=
-github.com/rancher/rancher/pkg/client v0.0.0-20240118221102-fa9e804ff2d7 h1:Cyq3NEa2o7qxbQn8kvfNq2Y7mYyY7ZrnN+lmWB1dQqU=
-github.com/rancher/rancher/pkg/client v0.0.0-20240118221102-fa9e804ff2d7/go.mod h1:ZWHdsCadoM6faG4trhK+Bk4rzIphUO+21MlrEnQkRkU=
-github.com/rancher/rke v1.5.2 h1:e//fEtK2QIZ8Ok3d8oOrCPSQ2hVfJH46P46cvbfuS8U=
-github.com/rancher/rke v1.5.2/go.mod h1:wZaVWzW46OTuGvyxgRHXGUyJ/QP0zOkKESO9hBOwTaY=
+github.com/rancher/rancher/pkg/apis v0.0.0-20230915232223-a9ea4ce4a5ba h1:GTSOFeKvAsgm21b6ko+XcuH3skZzuYTYyfIbFx/QNQ8=
+github.com/rancher/rancher/pkg/apis v0.0.0-20230915232223-a9ea4ce4a5ba/go.mod h1:CygL4GxLAJpxMRpqImc8+wH4zW+0kNVYW+nb0IsJ04A=
+github.com/rancher/rke v1.5.0 h1:M/YryKnBs7IwzMGA2kh1EiypVQkme6o9KSg0hlllQa4=
+github.com/rancher/rke v1.5.0/go.mod h1:wZaVWzW46OTuGvyxgRHXGUyJ/QP0zOkKESO9hBOwTaY=
+github.com/rancher/shepherd v0.0.0-20240130172509-3690b7e7016b h1:QvwCGG/xaX0+EH+6osT62t92EJOV0fvNNw4k3Mv18J4=
+github.com/rancher/shepherd v0.0.0-20240130172509-3690b7e7016b/go.mod h1:pggo0NvlbxaplK5cwiTSp7AixbGrGWbz6CC710biulI=
 github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20210727200656-10b094e30007 h1:ru+mqGnxMmKeU0Q3XIDxkARvInDIqT1hH2amTcsjxI4=
 github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20210727200656-10b094e30007/go.mod h1:Ja346o44aTPWADc/5Jm93+KgctT6KtftuOosgz0F2AM=
 github.com/rancher/wrangler v0.6.1/go.mod h1:L4HtjPeX8iqLgsxfJgz+JjKMcX2q3qbRXSeTlC/CSd4=
@@ -810,7 +806,6 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
 golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -908,7 +903,6 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
 golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1303,8 +1297,6 @@ k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 h1:pWEwq4Asjm4vjW7vcsmijwBhOr1/shsbSYiWXmNGlks=
-k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=

hosted/aks/helper/helper_cluster.go

@@ -3,14 +3,14 @@ package helper
 import (
 	"fmt"
 	"github.com/rancher/hosted-providers-e2e/hosted/helpers"
-	"github.com/rancher/rancher/tests/framework/extensions/clusters/aks"
+	"github.com/rancher/shepherd/extensions/clusters/aks"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/rancher/rancher/tests/framework/clients/rancher"
-	management "github.com/rancher/rancher/tests/framework/clients/rancher/generated/management/v3"
-	"github.com/rancher/rancher/tests/framework/extensions/clusters/kubernetesversions"
-	"github.com/rancher/rancher/tests/framework/pkg/config"
-	namegen "github.com/rancher/rancher/tests/framework/pkg/namegenerator"
+	"github.com/rancher/shepherd/clients/rancher"
+	management "github.com/rancher/shepherd/clients/rancher/generated/management/v3"
+	"github.com/rancher/shepherd/extensions/clusters/kubernetesversions"
+	"github.com/rancher/shepherd/pkg/config"
+	namegen "github.com/rancher/shepherd/pkg/namegenerator"
 	"k8s.io/utils/pointer"
 
 	"github.com/epinio/epinio/acceptance/helpers/proc"

hosted/aks/p0/p0_importing_test.go

@@ -4,12 +4,12 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	management "github.com/rancher/rancher/tests/framework/clients/rancher/generated/management/v3"
-	"github.com/rancher/rancher/tests/framework/extensions/clusters"
-	"github.com/rancher/rancher/tests/framework/extensions/clusters/aks"
-	nodestat "github.com/rancher/rancher/tests/framework/extensions/nodes"
-	"github.com/rancher/rancher/tests/framework/extensions/workloads/pods"
-	"github.com/rancher/rancher/tests/framework/pkg/config"
+	management "github.com/rancher/shepherd/clients/rancher/generated/management/v3"
+	"github.com/rancher/shepherd/extensions/clusters"
+	"github.com/rancher/shepherd/extensions/clusters/aks"
+	nodestat "github.com/rancher/shepherd/extensions/nodes"
+	"github.com/rancher/shepherd/extensions/workloads/pods"
+	"github.com/rancher/shepherd/pkg/config"
 
 	"github.com/rancher/hosted-providers-e2e/hosted/aks/helper"
 	"github.com/rancher/hosted-providers-e2e/hosted/helpers"

hosted/aks/p0/p0_provisioning_test.go

@@ -4,13 +4,13 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	management "github.com/rancher/rancher/tests/framework/clients/rancher/generated/management/v3"
-	nodestat "github.com/rancher/rancher/tests/framework/extensions/nodes"
-	"github.com/rancher/rancher/tests/framework/extensions/workloads/pods"
-	"github.com/rancher/rancher/tests/framework/pkg/config"
+	management "github.com/rancher/shepherd/clients/rancher/generated/management/v3"
+	nodestat "github.com/rancher/shepherd/extensions/nodes"
+	"github.com/rancher/shepherd/extensions/workloads/pods"
+	"github.com/rancher/shepherd/pkg/config"
 
-	"github.com/rancher/rancher/tests/framework/extensions/clusters"
-	"github.com/rancher/rancher/tests/framework/extensions/clusters/aks"
+	"github.com/rancher/shepherd/extensions/clusters"
+	"github.com/rancher/shepherd/extensions/clusters/aks"
 
 	"github.com/rancher/hosted-providers-e2e/hosted/aks/helper"
 	"github.com/rancher/hosted-providers-e2e/hosted/helpers"

hosted/aks/p0/p0_suite_test.go

@@ -6,7 +6,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/rancher/hosted-providers-e2e/hosted/helpers"
-	namegen "github.com/rancher/rancher/tests/framework/pkg/namegenerator"
+	namegen "github.com/rancher/shepherd/pkg/namegenerator"
 )
 
 const (

hosted/aks/support_matrix/support_matrix_importing_test.go

@@ -6,13 +6,13 @@ import (
 
 	"fmt"
 
-	management "github.com/rancher/rancher/tests/framework/clients/rancher/generated/management/v3"
-	"github.com/rancher/rancher/tests/framework/extensions/clusters"
-	"github.com/rancher/rancher/tests/framework/extensions/clusters/aks"
-	nodestat "github.com/rancher/rancher/tests/framework/extensions/nodes"
-	"github.com/rancher/rancher/tests/framework/extensions/workloads/pods"
-	"github.com/rancher/rancher/tests/framework/pkg/config"
-	namegen "github.com/rancher/rancher/tests/framework/pkg/namegenerator"
+	management "github.com/rancher/shepherd/clients/rancher/generated/management/v3"
+	"github.com/rancher/shepherd/extensions/clusters"
+	"github.com/rancher/shepherd/extensions/clusters/aks"
+	nodestat "github.com/rancher/shepherd/extensions/nodes"
+	"github.com/rancher/shepherd/extensions/workloads/pods"
+	"github.com/rancher/shepherd/pkg/config"
+	namegen "github.com/rancher/shepherd/pkg/namegenerator"
 
 	"github.com/rancher/hosted-providers-e2e/hosted/aks/helper"
 	"github.com/rancher/hosted-providers-e2e/hosted/helpers"

hosted/aks/support_matrix/support_matrix_provisioning_test.go

@@ -6,13 +6,13 @@ import (
 
 	"fmt"
 
-	management "github.com/rancher/rancher/tests/framework/clients/rancher/generated/management/v3"
-	"github.com/rancher/rancher/tests/framework/extensions/clusters"
-	"github.com/rancher/rancher/tests/framework/extensions/clusters/aks"
-	nodestat "github.com/rancher/rancher/tests/framework/extensions/nodes"
-	"github.com/rancher/rancher/tests/framework/extensions/workloads/pods"
-	"github.com/rancher/rancher/tests/framework/pkg/config"
-	namegen "github.com/rancher/rancher/tests/framework/pkg/namegenerator"
+	management "github.com/rancher/shepherd/clients/rancher/generated/management/v3"
+	"github.com/rancher/shepherd/extensions/clusters"
+	"github.com/rancher/shepherd/extensions/clusters/aks"
+	nodestat "github.com/rancher/shepherd/extensions/nodes"
+	"github.com/rancher/shepherd/extensions/workloads/pods"
+	"github.com/rancher/shepherd/pkg/config"
+	namegen "github.com/rancher/shepherd/pkg/namegenerator"
 
 	"github.com/rancher/hosted-providers-e2e/hosted/aks/helper"
 	"github.com/rancher/hosted-providers-e2e/hosted/helpers"

hosted/eks/helper/helper_cluster.go

@@ -3,15 +3,15 @@ package helper
 import (
 	"fmt"
 	"github.com/rancher/hosted-providers-e2e/hosted/helpers"
-	"github.com/rancher/rancher/tests/framework/extensions/clusters/eks"
+	"github.com/rancher/shepherd/extensions/clusters/eks"
 
 	"github.com/epinio/epinio/acceptance/helpers/proc"
 	"github.com/pkg/errors"
-	"github.com/rancher/rancher/tests/framework/clients/rancher"
-	management "github.com/rancher/rancher/tests/framework/clients/rancher/generated/management/v3"
-	"github.com/rancher/rancher/tests/framework/extensions/clusters/kubernetesversions"
-	"github.com/rancher/rancher/tests/framework/pkg/config"
-	namegen "github.com/rancher/rancher/tests/framework/pkg/namegenerator"
+	"github.com/rancher/shepherd/clients/rancher"
+	management "github.com/rancher/shepherd/clients/rancher/generated/management/v3"
+	"github.com/rancher/shepherd/extensions/clusters/kubernetesversions"
+	"github.com/rancher/shepherd/pkg/config"
+	namegen "github.com/rancher/shepherd/pkg/namegenerator"
 	k8slabels "k8s.io/apimachinery/pkg/labels"
 	"k8s.io/utils/pointer"
 )

hosted/eks/p0/p0_importing_test.go

@@ -3,13 +3,13 @@ package p0_test
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/rancher/rancher/tests/framework/extensions/clusters/eks"
-	"github.com/rancher/rancher/tests/framework/pkg/config"
+	"github.com/rancher/shepherd/extensions/clusters/eks"
+	"github.com/rancher/shepherd/pkg/config"
 
-	management "github.com/rancher/rancher/tests/framework/clients/rancher/generated/management/v3"
-	"github.com/rancher/rancher/tests/framework/extensions/clusters"
-	nodestat "github.com/rancher/rancher/tests/framework/extensions/nodes"
-	"github.com/rancher/rancher/tests/framework/extensions/workloads/pods"
+	management "github.com/rancher/shepherd/clients/rancher/generated/management/v3"
+	"github.com/rancher/shepherd/extensions/clusters"
+	nodestat "github.com/rancher/shepherd/extensions/nodes"
+	"github.com/rancher/shepherd/extensions/workloads/pods"
 
 	"github.com/rancher/hosted-providers-e2e/hosted/eks/helper"
 	"github.com/rancher/hosted-providers-e2e/hosted/helpers"