Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Go version and update dependencies #43

Merged
merged 2 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 59 additions & 59 deletions docs/module_dep.md
Original file line number Diff line number Diff line change
@@ -1,84 +1,84 @@
This doc walks through general steps to update pkg dependencies of this project.

0. Write the following to go.mod
```go
module github.com/valaparthvi/rancher

go 1.19

require (
github.com/onsi/ginkgo/v2 latest
github.com/onsi/gomega latest
github.com/rancher/rancher 9129a7b0496c
github.com/stretchr/testify latest
k8s.io/api v0.27.5
k8s.io/apimachinery v0.27.5
)

replace (
k8s.io/api => k8s.io/api v0.27.5
k8s.io/client-go => github.com/rancher/client-go v1.27.4-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/valaparthvi/rancher
module github.com/rancher/hosted-providers-e2e

go 1.19
go 1.20

require (
github.com/onsi/ginkgo/v2 v2.12.1
github.com/onsi/gomega v1.27.10
github.com/rancher/rancher v0.0.0-20230921211342-9129a7b0496c
github.com/stretchr/testify v1.8.4
k8s.io/api v0.27.5
k8s.io/apimachinery v0.27.5
github.com/onsi/ginkgo/v2 latest
github.com/onsi/gomega latest
github.com/epinio/epinio latest
github.com/rancher/shepherd fb9a4f1 // rancher/shepherd HEAD commit
github.com/stretchr/testify latest
k8s.io/api v0.27.9
k8s.io/apimachinery v0.27.9
)

replace (
k8s.io/api => k8s.io/api v0.27.4
k8s.io/client-go => github.com/rancher/client-go v1.27.4-rancher1
k8s.io/api => k8s.io/api v0.27.9
k8s.io/client-go => github.com/rancher/client-go v1.27.4-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
### Updating the dependecies

go: github.com/rancher/rancher/pkg/[email protected]: invalid version: unknown revision pkg/apis/v0.0.0
go: github.com/rancher/rancher/pkg/[email protected]: invalid version: unknown revision pkg/client/v0.0.0
```
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/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)
4. Kubernetes, Rancher pkg: rancher/client-go.
- `rancher/client-go` must always be in sync with Kubernetes related pkgs since it is always released in sync with the Kubernetes pkgs and tags are named aptly too, for a `k8s.io/api:v0.27.9`, there will be a `rancher/client-go:v1.27.4`.
- Ref: [rancher/client-go/tags](https://github.com/rancher/client-go/tags)This doc walks through general steps to update pkg dependencies of this project.

3. `go mod edit -replace=github.com/rancher/rancher/pkg/apis=github.com/rancher/rancher/pkg/[email protected]`
4. `go mod edit -replace=github.com/rancher/rancher/pkg/client=github.com/rancher/rancher/pkg/[email protected]`
0. Write the following to go.mod
```go
module github.com/valaparthvi/rancher
module github.com/rancher/hosted-providers-e2e

go 1.19
go 1.20

require (
github.com/onsi/ginkgo/v2 v2.12.1
github.com/onsi/gomega v1.27.10
github.com/rancher/rancher v0.0.0-20230921211342-9129a7b0496c
github.com/stretchr/testify v1.8.4
k8s.io/api v0.27.5
k8s.io/apimachinery v0.27.5
github.com/onsi/ginkgo/v2 latest
github.com/onsi/gomega latest
github.com/epinio/epinio latest
github.com/rancher/shepherd 3690b7e // shepherd main HEAD commit
github.com/stretchr/testify latest
k8s.io/api v0.27.9
k8s.io/apimachinery v0.27.9
)

replace (
k8s.io/api => k8s.io/api v0.27.4
k8s.io/client-go => github.com/rancher/client-go v1.27.4-rancher1
github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20230921211342-9129a7b0496c
github.com/rancher/rancher/pkg/client => github.com/rancher/rancher/pkg/client v0.0.0-20230921211342-9129a7b0496c
k8s.io/api => k8s.io/api v0.27.9
k8s.io/client-go => github.com/rancher/client-go v1.27.4-rancher1
)
```

5. `go mod tidy`
6. `go mod vendor`
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.


### 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/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.
- `rancher/shepherd` is the main automation framework we use. It relies on `rancher/rancher` to decide when to upgrade to a newer k8s pkg.
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)
4. Kubernetes, Rancher pkg: rancher/client-go.
- `rancher/client-go` must always be in sync with Kubernetes related pkgs since it is always released in sync with the Kubernetes pkgs and tags are named aptly too, for a `k8s.io/api:v0.27.9`, there will be a `rancher/client-go:v1.27.4-rancher1`.
- Ref: [rancher/client-go/tags](https://github.com/rancher/client-go/tags)
26 changes: 10 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
module github.com/rancher/hosted-providers-e2e

go 1.19
go 1.20

require (
github.com/Masterminds/semver/v3 v3.2.1
github.com/epinio/epinio v1.10.0
github.com/onsi/ginkgo/v2 v2.13.1
github.com/onsi/gomega v1.30.0
github.com/pkg/errors v0.9.1
github.com/rancher/rancher v0.0.0-20231121113554-764f891cfa95
k8s.io/apimachinery v0.27.6
github.com/rancher/shepherd v0.0.0-20240202182823-fb9a4f11fa91
k8s.io/apimachinery v0.27.9
k8s.io/utils v0.0.0-20230505201702-9f6742963106
)

Expand Down Expand Up @@ -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 v1.0.4 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
Expand All @@ -63,14 +62,14 @@ 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.0-rc9 // 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/mod v0.13.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/sys v0.14.0 // indirect
Expand All @@ -84,12 +83,11 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.27.6 // indirect
k8s.io/apiextensions-apiserver v0.27.5 // indirect
k8s.io/apiserver v0.27.6 // indirect
k8s.io/api v0.27.9 // indirect
k8s.io/apiextensions-apiserver v0.27.9 // indirect
k8s.io/apiserver v0.27.9 // indirect
k8s.io/client-go v12.0.0+incompatible // indirect
k8s.io/component-base v0.27.6 // indirect
k8s.io/gengo v0.0.0-20230306165830-ab3349d207d4 // indirect
k8s.io/component-base v0.27.9 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-aggregator v0.27.4 // indirect
k8s.io/kube-openapi v0.0.0-20230530175149-33f04d5d6b58 // indirect
Expand All @@ -106,7 +104,3 @@ replace (
k8s.io/api => k8s.io/api v0.27.5
k8s.io/client-go => github.com/rancher/client-go v1.27.4-rancher1
)

replace github.com/rancher/rancher/pkg/client => github.com/rancher/rancher/pkg/client v0.0.0-20231121113554-764f891cfa95

replace github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20231121113554-764f891cfa95
38 changes: 16 additions & 22 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -453,8 +453,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=
Expand Down Expand Up @@ -596,14 +594,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-20231121113554-764f891cfa95 h1:0ymwrg+lQWQ+Bb2bZOcfvmDmC2Dzq4KZ6Wnd8a4GWhI=
github.com/rancher/rancher v0.0.0-20231121113554-764f891cfa95/go.mod h1:ZqNojQnng2lD2N3H4939mecgjDKjSoIDgBDgdtoJPOM=
github.com/rancher/rancher/pkg/apis v0.0.0-20231121113554-764f891cfa95 h1:KgOG/mYCojh9nv59F2eqOc3glC/lQj7bjZjwscwVn4E=
github.com/rancher/rancher/pkg/apis v0.0.0-20231121113554-764f891cfa95/go.mod h1:NVTx5M0/hU0kdLN4PdL6oONMCtxKiMNOr7d8cAccSgs=
github.com/rancher/rancher/pkg/client v0.0.0-20231121113554-764f891cfa95 h1:9Vdz83Bbjdsp5kgSPzl196jQXcw+K9kjUhdoRpEJkhU=
github.com/rancher/rancher/pkg/client v0.0.0-20231121113554-764f891cfa95/go.mod h1:ZWHdsCadoM6faG4trhK+Bk4rzIphUO+21MlrEnQkRkU=
github.com/rancher/rke v1.5.0-rc9 h1:mtnpYGrTTGsMaZHmvp9dsy28fR9QpsQGSGDcJCw7gqg=
github.com/rancher/rke v1.5.0-rc9/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-20240202182823-fb9a4f11fa91 h1:aWmF6tErfl3GfUkvmnJIQDtrZZ1f8SAnBB2WNAfjrOg=
github.com/rancher/shepherd v0.0.0-20240202182823-fb9a4f11fa91/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=
Expand Down Expand Up @@ -733,11 +729,13 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
Expand Down Expand Up @@ -801,7 +799,6 @@ golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
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.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
golang.org/x/mod v0.13.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=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand Down Expand Up @@ -897,7 +894,6 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
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.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
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=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand Down Expand Up @@ -1260,33 +1256,31 @@ k8s.io/api v0.27.5 h1:49hIzqJNSuOQpA53MMihgAS4YDcQitTy58B9PMFthLc=
k8s.io/api v0.27.5/go.mod h1:zjBZB+c0KDU55Wxb9Bob9WZGxu9zdKHitzHxBtaIVoA=
k8s.io/apiextensions-apiserver v0.18.0/go.mod h1:18Cwn1Xws4xnWQNC00FLq1E350b9lUF+aOdIWDOZxgo=
k8s.io/apiextensions-apiserver v0.22.2/go.mod h1:2E0Ve/isxNl7tWLSUDgi6+cmwHi5fQRdwGVCxbC+KFA=
k8s.io/apiextensions-apiserver v0.27.5 h1:YiDDsH8irDOsFiGoezJAU7pqq4avoFcCIQ2/DghZgsY=
k8s.io/apiextensions-apiserver v0.27.5/go.mod h1:ihpozWiLbNytEGiHQbgrEkkyTKWhIhchy0SHX+aY1eU=
k8s.io/apiextensions-apiserver v0.27.9 h1:z7f95DVIrNkscuV2f/JdZNpjOxpUYeeRYcmrn0Wixas=
k8s.io/apiextensions-apiserver v0.27.9/go.mod h1:0/FD0h+vIInWSBUFv3sFgAkU5Zfd74Mwz0dOHWxr7/k=
k8s.io/apimachinery v0.18.0/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
k8s.io/apimachinery v0.22.2/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
k8s.io/apimachinery v0.27.4/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
k8s.io/apimachinery v0.27.5/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
k8s.io/apimachinery v0.27.6 h1:mGU8jmBq5o8mWBov+mLjdTBcU+etTE19waies4AQ6NE=
k8s.io/apimachinery v0.27.6/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
k8s.io/apimachinery v0.27.9 h1:IOGjTX8IiPVpl7qOVOvXiiTQ+0G4k68/t5OMTWZkdas=
k8s.io/apimachinery v0.27.9/go.mod h1:EIXLxLt/b1muPITiF5zlrcm7I+YnXsIgM+0GdnPTQvA=
k8s.io/apiserver v0.18.0/go.mod h1:3S2O6FeBBd6XTo0njUrLxiqk8GNy6wWOftjhJcXYnjw=
k8s.io/apiserver v0.22.2/go.mod h1:vrpMmbyjWrgdyOvZTSpsusQq5iigKNWv9o9KlDAbBHI=
k8s.io/apiserver v0.27.6 h1:r/eHN8r3lG2buggHrVMy++kKhHlHn1HWSX1dqDtes54=
k8s.io/apiserver v0.27.6/go.mod h1:Xeo9OEXn2kDLK5pqspjdXQx7YKgDyKSpwIB4p0BmpAQ=
k8s.io/apiserver v0.27.9 h1:OUo8JxwKuxAE1rBxQ2oZasqXUnuMZigfOPF7F1OYOx4=
k8s.io/apiserver v0.27.9/go.mod h1:ZjKT0yZRxuazWQ80wR9SS5dkLEQOGFn4w4y6vrFA3SA=
k8s.io/cli-runtime v0.22.2/go.mod h1:tkm2YeORFpbgQHEK/igqttvPTRIHFRz5kATlw53zlMI=
k8s.io/code-generator v0.18.0/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
k8s.io/code-generator v0.22.2/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o=
k8s.io/component-base v0.18.0/go.mod h1:u3BCg0z1uskkzrnAKFzulmYaEpZF7XC9Pf/uFyb1v2c=
k8s.io/component-base v0.22.2/go.mod h1:5Br2QhI9OTe79p+TzPe9JKNQYvEKbq9rTJDWllunGug=
k8s.io/component-base v0.27.6 h1:hF5WxX7Tpi9/dXAbLjPVkIA6CA6Pi6r9JOHyo0uCDYI=
k8s.io/component-base v0.27.6/go.mod h1:NvjLtaneUeb0GgMPpCBF+4LNB9GuhDHi16uUTjBhQfU=
k8s.io/component-base v0.27.9 h1:2WGfRevgs/06+lVnXZCcLEf1XE7Cdts96zRdvkQjl8k=
k8s.io/component-base v0.27.9/go.mod h1:XGpxAlwW8CdfTCogVqmHPu6ZSGlGEMsvpOcWSveWRzY=
k8s.io/component-helpers v0.22.2/go.mod h1:+N61JAR9aKYSWbnLA88YcFr9K/6ISYvRNybX7QW7Rs8=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
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-20230306165830-ab3349d207d4 h1:aClvVG6GbX10ISHcc24J+tqbr0S7fEe1MWkFJ7cWWCI=
k8s.io/gengo v0.0.0-20230306165830-ab3349d207d4/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=
Expand Down
14 changes: 8 additions & 6 deletions hosted/aks/helper/helper_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@ package helper

import (
"fmt"

"github.com/rancher/shepherd/extensions/clusters/aks"

"github.com/rancher/hosted-providers-e2e/hosted/helpers"
"github.com/rancher/rancher/tests/framework/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"
Expand Down
Loading
Loading