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

Conversation

valaparthvi
Copy link
Collaborator

@valaparthvi valaparthvi commented Jan 29, 2024

What does this PR do?

  1. Update to Go 1.20
  2. Update onsi/ginkgo, onsi/gomega, and other non-k8s pkgs to latest.
  3. Update k8s.io/api, k8s.io/apimachinery, rancher/client-go to support k8s 1.28.
  4. Update rancher/rancher to the HEAD commit of branch release/v2.8.1.
  5. Move from rancher/rancher to rancher/shepherd.

This dependency update is targeted towards moving to Go 1.20 and migrating to rancher/shepherd from rancher/rancher.

Which issue(s) this PR fixes (optional, in fixes #(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):

Fixes #44

Checklist:

Special notes for your reviewer:

Steps(simplified) taken to update the dependency:

  1. Update Go version to 1.20.
module github.com/rancher/hosted-providers-e2e

go 1.20

require (
	github.com/Masterminds/semver/v3 latest
	github.com/epinio/epinio latest
	github.com/onsi/ginkgo/v2 latest
	github.com/onsi/gomega latest
	github.com/pkg/errors latest
	github.com/rancher/rancher fa9e804ff2d7 // HEAD commit of release/v2.8.1 branch
	k8s.io/apimachinery v0.28.6    // to add support of k8s 1.28, upgrade all the related pkgs to 0.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 // to add support of k8s 1.28, upgrade this to 1.28.6-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
  1. go1.20.3 mod download
module github.com/rancher/hosted-providers-e2e

go 1.20

require (
	github.com/Masterminds/semver/v3 v3.2.1
	github.com/epinio/epinio v1.11.0
	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
	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
)

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
  1. Update rancher/rancher/apis and rancher/rancher/client pkgs.
$ go1.20.13 mod edit -replace=github.com/rancher/rancher/pkg/apis=github.com/rancher/rancher/pkg/apis@v0.0.0-20240118221102-fa9e804ff2d7

$ go1.20.13 mod edit -replace=github.com/rancher/rancher/pkg/client=github.com/rancher/rancher/pkg/client@v0.0.0-20240118221102-fa9e804ff2d7

module github.com/rancher/hosted-providers-e2e

go 1.20

require (
	github.com/Masterminds/semver/v3 v3.2.1
	github.com/epinio/epinio v1.11.0
	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
	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
)

replace github.com/rancher/rancher/pkg/client => github.com/rancher/rancher/pkg/client v0.0.0-20240118221102-fa9e804ff2d7

replace github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20240118221102-fa9e804ff2d7

  1. go1.20.13 mod tidy
  2. go1.20.13 mod vendor

Steps taken to update the dependencies:

  1. Update Go version to 1.20.
module github.com/rancher/hosted-providers-e2e

go 1.20

require (
    github.com/onsi/ginkgo/v2 latest
    github.com/onsi/gomega latest
    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.27.9
    k8s.io/apimachinery v0.27.9
)

replace (
    k8s.io/api => k8s.io/api v0.27.9
    k8s.io/client-go => github.com/rancher/client-go v1.27.4-rancher1
)
  1. go mod tidy
  2. go mod vendor

@valaparthvi valaparthvi changed the title Update dependencies for Go and GH Actions Update Go dependencies Jan 30, 2024
@valaparthvi valaparthvi changed the title Update Go dependencies Bump Go version and update dependencies Jan 31, 2024
go.mod Outdated Show resolved Hide resolved
docs/module_dep.md Outdated Show resolved Hide resolved
…pherd

Signed-off-by: Parthvi <parthvi.vala@gmail.com>
Co-authored-by: Chandan Pinjani <chandan.pinjani@suse.com>
Signed-off-by: Parthvi Vala <parthvi.vala@gmail.com>
@valaparthvi
Copy link
Collaborator Author

@cpinjani I have rebased the branch on top of main and also reverted some changes related to upgrading k8s related pkgs. rancher/shepherd is still on k8s.io/api and k8s.io/apimachinery and k8s.io/client-go v0.27.9, they will upgrade once rancher/rancher does, so we will do it once they do.

@cpinjani
Copy link
Collaborator

cpinjani commented Feb 5, 2024

@cpinjani I have rebased the branch on top of main and also reverted some changes related to upgrading k8s related pkgs. rancher/shepherd is still on k8s.io/api and k8s.io/apimachinery and k8s.io/client-go v0.27.9, they will upgrade once rancher/rancher does, so we will do it once they do.

Sure, are the tests run and passing on these latest changes ?

@valaparthvi
Copy link
Collaborator Author

@cpinjani I have rebased the branch on top of main and also reverted some changes related to upgrading k8s related pkgs. rancher/shepherd is still on k8s.io/api and k8s.io/apimachinery and k8s.io/client-go v0.27.9, they will upgrade once rancher/rancher does, so we will do it once they do.

Sure, are the tests run and passing on these latest changes ?

Yes, check the PR description, the 4th runs have passed.

Copy link
Collaborator

@cpinjani cpinjani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@valaparthvi valaparthvi merged commit 80fea0d into main Feb 5, 2024
11 checks passed
@valaparthvi valaparthvi deleted the update-dependencies branch February 5, 2024 09:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update Go dependecies
2 participants