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

Fix mods From bringing in windows userspace #336

Closed
wants to merge 2 commits into from

Conversation

astoycos
Copy link
Member

@astoycos astoycos commented Aug 29, 2022

Fix mods after merging of windows userspace and add a make target for bumping in-tree K8s dependency versions (see kubernetes/kubernetes#90358). Short of it is we need to ensure that dep versions are fixed based on the k8s version since technically k8s/k8s isn't meant to be vendored.

Also add windows userspace to the go workspace and remove many un-necessary replace directives in each backend

Followup from reading through
kubernetes/kubernetes#90358

Signed-off-by: astoycos <astoycos@redhat.com>
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 29, 2022
@astoycos
Copy link
Member Author

cc @jayunit100 and @mcluseau

Add Userspace to go workspace, and ensure
all the dependencies are correct and fixed
for K8s ver 1.24.3

If now want to bump this k8s dep version simply
run `make update-k8s-mod`

Remove all unecessary replace directives.

Signed-off-by: astoycos <astoycos@redhat.com>

tmp
@astoycos
Copy link
Member Author

Now there's a single replace directive in the window kernelspace go.mod and a few in the cmd go.mod but otherwise it should be a lot simpler

We should probably add CI to check if go work sync is happy before merging :)

@knabben
Copy link
Member

knabben commented Aug 29, 2022

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 29, 2022
@knabben
Copy link
Member

knabben commented Aug 29, 2022

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: astoycos, knabben
Once this PR has been reviewed and has the lgtm label, please assign hanamantagoudvk for approval by writing /assign @hanamantagoudvk in a comment. For more information see:The Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@astoycos
Copy link
Member Author

/hold

in favor of #333 :)

Might still try to incorporate this make target

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Aug 30, 2022
@k8s-ci-robot
Copy link
Contributor

@astoycos: PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@astoycos astoycos closed this Aug 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants