This repository has been archived by the owner on Jul 25, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 63
Persist network plugin name as part of cluster network creation #318
Merged
pravisankar
merged 4 commits into
openshift:master
from
pravisankar:detect-plugin-mismatch
Jun 15, 2016
Merged
Persist network plugin name as part of cluster network creation #318
pravisankar
merged 4 commits into
openshift:master
from
pravisankar:detect-plugin-mismatch
Jun 15, 2016
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@openshift/networking PTAL |
0ab56d3
to
c6be16d
Compare
LGTM |
// Do not return error in this case | ||
log.Warningf("Either there is network plugin mismatch between OpenShift master(%q) and node(%q) or OpenShift master is running older version where we don't persist plugin name") | ||
} else { | ||
return fmt.Errorf("Detected network plugin mismatch between OpenShift master(%q) and node(%q)", ni.PluginName, oc.pluginName) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should we (in another PR) deprecate the node-config networkPluginName argument and just get that value from the master like we do with the rest of the network config?
Needs a rebase onto the updated ClusterNetwork caching cleanup, but overall looks OK to me. |
…n methods These methods will be used to enable openshift network plugin specific REST endpoints in origin.
c6be16d
to
d3194b3
Compare
@openshift/networking updated, PTAL |
LGTM |
1 similar comment
LGTM |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Depends on #317
Trello card: https://trello.com/c/Lr0wa4hr/228-3-detect-master-and-node-sdn-plugin-mismatch-sdn