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

SDN-4101: Remove HyperShift API dependency, Bump kubernetes dependencies #2128

Merged
merged 4 commits into from Nov 27, 2023

Conversation

kyrtapz
Copy link
Contributor

@kyrtapz kyrtapz commented Nov 23, 2023

This PR removes the HyperShift API dependency and bumps kubernetes deps to v0.28.4.
Once we remove the SBDB route in HyperShift we could clean up the code by removing the Services field from HostedControlPlane.

@kyrtapz
Copy link
Contributor Author

kyrtapz commented Nov 23, 2023

/test verify

@kyrtapz
Copy link
Contributor Author

kyrtapz commented Nov 23, 2023

Signed-off-by: Patryk Diak <pdiak@redhat.com>
@kyrtapz
Copy link
Contributor Author

kyrtapz commented Nov 23, 2023

/test verify

@kyrtapz
Copy link
Contributor Author

kyrtapz commented Nov 23, 2023

/retest

@kyrtapz
Copy link
Contributor Author

kyrtapz commented Nov 24, 2023

/retest

HyperShift API dependency was causing a lot of dependency issues.
Remove it in favor of using an unstructured objects and some
copied definitions.

Signed-off-by: Patryk Diak <pdiak@redhat.com>
Remove HyperShift related replaces.
Run go mod tidy && go mod vendor.

Signed-off-by: Patryk Diak <pdiak@redhat.com>
Removed remaining replaces that are no longer required.
Commands:
go get k8s.io/api
go get k8s.io/code-generator
go get k8s.io/component-base
go get k8s.io/kube-proxy
go get k8s.io/client-go
go get k8s.io/apiextensions-apiserver
go mod tidy
go mod vendor

Signed-off-by: Patryk Diak <pdiak@redhat.com>
@jcaamano
Copy link
Contributor

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 24, 2023
Copy link
Contributor

openshift-ci bot commented Nov 24, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcaamano, kyrtapz

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

The pull request process is described 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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 24, 2023
@kyrtapz kyrtapz changed the title Remove HyperShift API dependency, Bump kubernetes dependencies SDN-4101: Remove HyperShift API dependency, Bump kubernetes dependencies Nov 24, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 24, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 24, 2023

@kyrtapz: This pull request references SDN-4101 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.15.0" version, but no target version was set.

In response to this:

This PR removes the HyperShift API dependency and bumps kubernetes deps to v0.28.4.
Once we remove the SBDB route in HyperShift we could clean up the code by removing the Services field from HostedControlPlane.

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.

@kyrtapz
Copy link
Contributor Author

kyrtapz commented Nov 24, 2023

/retest

Copy link
Contributor

openshift-ci bot commented Nov 24, 2023

@kyrtapz: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-azure-ovn-dualstack 5b31237 link false /test e2e-azure-ovn-dualstack
ci/prow/e2e-vsphere-ovn-dualstack-primaryv6 5b31237 link false /test e2e-vsphere-ovn-dualstack-primaryv6
ci/prow/4.15-upgrade-from-stable-4.14-e2e-azure-ovn-upgrade 5b31237 link false /test 4.15-upgrade-from-stable-4.14-e2e-azure-ovn-upgrade

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@kyrtapz
Copy link
Contributor Author

kyrtapz commented Nov 27, 2023

/test 4.15-upgrade-from-stable-4.14-e2e-gcp-ovn-upgrade

@kyrtapz
Copy link
Contributor Author

kyrtapz commented Nov 27, 2023

/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Nov 27, 2023
@openshift-merge-bot openshift-merge-bot bot merged commit ce7b11d into openshift:master Nov 27, 2023
37 of 40 checks passed
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build cluster-network-operator-container-v4.15.0-202311271250.p0.gce7b11d.assembly.stream for distgit cluster-network-operator.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants