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.

Sign up for GitHub

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

Jump to bottom

sdn: use the correct socket path #451

Merged
merged 1 commit into from Jan 21, 2020
Merged

sdn: use the correct socket path #451

merged 1 commit into from Jan 21, 2020

Conversation

rphillips
Copy link
Contributor

@rphillips rphillips commented Jan 20, 2020 •
edited

Fix the socket path for the cni server socket

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 20, 2020
@rphillips
Copy link
Contributor Author

/test e2e-gcp-upgrade

@danwinship
Copy link
Contributor

This fix is correct, but I think that code is useless anyway... as far as I remember, it was originally added (in openshift-ansible) to handle the case of upgrading from openshift-sdn running directly on the node to openshift-sdn running in a container, where it was difficult to synchronize the switchover for some reason. The check got copied over from openshift-ansible to cluster-network-operator in 4.0, but with sdn always running in a pod now, there shouldn't ever be any case where a new openshift-sdn process gets started while the old one is still running...

I was going to say "we should look through CI logs to see if the warning ever gets printed", except of course that since the check was broken, we know it doesn't. So, OK, let's merge this now and then check later...

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 21, 2020
pecameron
pecameron approved these changes Jan 21, 2020
View reviewed changes
Copy link
Contributor

@pecameron pecameron left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danwinship, pecameron, rphillips

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-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 6cb1893 into openshift:master Jan 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pecameron pecameron pecameron approved these changes

@alexanderConstantinescu alexanderConstantinescu Awaiting requested review from alexanderConstantinescu

Assignees

@danwinship danwinship

@pecameron pecameron

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@rphillips @danwinship @openshift-ci-robot @openshift-bot @pecameron @openshift-merge-robot