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

Drop CRI/CNI configurability from openshift-sdn #23043

Merged
merged 2 commits into from Jun 11, 2019

Conversation

danwinship
Copy link
Contributor

We only support CRI-O now, so drop the HostPort stuff that was needed with dockershim

@danwinship danwinship requested review from squeed and dcbw June 5, 2019 19:12
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 5, 2019
@dcbw
Copy link
Member

dcbw commented Jun 5, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 5, 2019
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jun 5, 2019
@danwinship danwinship changed the title Drop dockershim support from openshift-sdn Drop CRI/CNI configurability from openshift-sdn Jun 5, 2019
@danwinship
Copy link
Contributor Author

@dcbw: updated; We are currently hardcoding the container-runtime-endpoint in the config generated by cluster-network-operator to a constant value. It would simplify things to hardcode it in openshift-sdn instead. (Even if we did want to be able to support other runtimes, the configuration for that would need to be applied to the kubelet as well, so cluster-network-operator is still the wrong place to be getting that information from.)

Similarly, cluster-network-operator doesn't override the CNI-related values, so there's no reason to worry about getting overrides from there.

@danwinship
Copy link
Contributor Author

/retest

@dcbw
Copy link
Member

dcbw commented Jun 11, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 11, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danwinship, dcbw

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-merge-robot openshift-merge-robot merged commit 5fc5c2a into openshift:master Jun 11, 2019
@danwinship danwinship deleted the drop-dockershim branch June 11, 2019 13:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. component/networking lgtm Indicates that a PR is ready to be merged. sig/networking size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants