Merged
Conversation
Due to [0], we can not label nodes with node-role.kubernetes.io/master="". We need to do it with the kubernetes API. [0] kubernetes/kubernetes#75457 story: 2006459 task: 36872 Signed-off-by: Spyros Trigazis <spyridon.trigazi@cern.ch> Conflicts: magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh (cherry picked from commit 6b0fa1805f954c13d64c2905e7e9f3e4ba33c5ae) Change-Id: I2dc2a125c49f9fc33aa02d3d0c99a5bb0eec1156 (cherry picked from commit 3afd376)
For moving to 1.15.x and beyond we need to have PSP for privileged pods. flannel, calico and node-problem-detector need it. PSP story: 2006515 task: 36513 Allow-priv story: 2006252 task: 35867 Change-Id: I306a249afb275fdbd71354ed75043ffc4d466304 Signed-off-by: Spyros Trigazis <spyridon.trigazis@cern.ch> (cherry picked from commit 7267c1e)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Sync with upstream