kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4651 from gambol99/protokobe_master 

Protokube Channel and RBAC
This commit is contained in:
k8s-ci-robot 2018-03-10 16:22:09 -08:00 committed by GitHub
parent 64a734fd3a 3c7d9d8691
commit 6e30265ddd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
protokube/pkg/protokube/kube_boot.go
View File

@ -126,19 +126,6 @@ func (k *KubeBoot) syncOnce() error {
glog.V(4).Infof("Not in role master; won't scan for volumes")
}
if k.Master && k.ApplyTaints {
if err := applyMasterTaints(k.Kubernetes); err != nil {
glog.Warningf("error updating master taints: %v", err)
}
}
if k.InitializeRBAC {
// @TODO: Idempotency: good question; not sure this should ever be done on the node though
if err := applyRBAC(k.Kubernetes); err != nil {
glog.Warningf("error initializing rbac: %v", err)
}
}
// Ensure kubelet is running. We avoid doing this automatically so
// that when kubelet comes up the first time, all volume mounts
// and DNS are available, avoiding the scenario where
@ -147,9 +134,21 @@ func (k *KubeBoot) syncOnce() error {
glog.Warningf("error ensuring kubelet started: %v", err)
}
for _, channel := range k.Channels {
if err := applyChannel(channel); err != nil {
glog.Warningf("error applying channel %q: %v", channel, err)
if k.Master {
if k.ApplyTaints {
if err := applyMasterTaints(k.Kubernetes); err != nil {
glog.Warningf("error updating master taints: %v", err)
}
}
if k.InitializeRBAC {
if err := applyRBAC(k.Kubernetes); err != nil {
glog.Warningf("error initializing rbac: %v", err)
}
}
for _, channel := range k.Channels {
if err := applyChannel(channel); err != nil {
glog.Warningf("error applying channel %q: %v", channel, err)
}
}
}