Add master config hook for 3.4 upgrade and fix facts ordering #2989
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
abutcher
force-pushed
the
3.4-master-config-hook
branch
from
23cd4f5 to
5d731d0
Compare
sdodson
approved these changes
Dec 16, 2016
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When the
openshift_master_factsrole runs, it reads inopenshift_master_admission_plugin_configandopenshift_master_kube_admission_plugin_config. A subsequent run ofopenshift_factsmerges these two dictionaries by migrating local facts.So, when the
openshift_master_factsrole was added to the control plane upgrade right before we update the master config, these two facts were getting reset and weren't merged (becauseopenshift_factswasn't ran afterwards). This is extremely brittle but re-ordering roles around upgrade resolves the issue. Also, amaster_config_hookwasn't getting set for the 3.4 upgrade. This has been added.