Skip to content
This repository has been archived by the owner on Jul 25, 2019. It is now read-only.

Persist network plugin name as part of cluster network creation #318

Merged
merged 4 commits into from
Jun 15, 2016

Conversation

pravisankar
Copy link

@pravisankar
Copy link
Author

@openshift/networking PTAL

@pravisankar pravisankar force-pushed the detect-plugin-mismatch branch from 0ab56d3 to c6be16d Compare June 3, 2016 20:50
@pravisankar pravisankar changed the title Detect network plugin mismatch between openshift master and node [DO_NOT_MERGE] Detect network plugin mismatch between openshift master and node Jun 4, 2016
@danwinship
Copy link
Contributor

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

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?

@dcbw
Copy link
Contributor

dcbw commented Jun 7, 2016

Needs a rebase onto the updated ClusterNetwork caching cleanup, but overall looks OK to me.

@pravisankar pravisankar force-pushed the detect-plugin-mismatch branch from c6be16d to d3194b3 Compare June 10, 2016 02:06
@pravisankar pravisankar changed the title [DO_NOT_MERGE] Detect network plugin mismatch between openshift master and node Persist network plugin name as part of cluster network creation Jun 10, 2016
@pravisankar
Copy link
Author

@openshift/networking updated, PTAL

@danwinship
Copy link
Contributor

LGTM

1 similar comment
@dcbw
Copy link
Contributor

dcbw commented Jun 10, 2016

LGTM

@pravisankar pravisankar merged commit 8aa23a3 into openshift:master Jun 15, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants