Update channels before setting labels

This will prevent an old kops-controller pod from being scheduled to the new master.
jrabbit · Sep 30, 2021 · d1ff109 · d1ff109
1 parent e7a5437
commit d1ff109
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/protokube/pkg/protokube/kube_boot.go b/protokube/pkg/protokube/kube_boot.go
@@ -88,16 +88,16 @@ func (k *KubeBoot) RunSyncLoop() {
 
 func (k *KubeBoot) syncOnce(ctx context.Context) error {
 	if k.Master {
-		if k.BootstrapMasterNodeLabels {
-			if err := bootstrapMasterNodeLabels(ctx, k.Kubernetes, k.NodeName); err != nil {
-				klog.Warningf("error bootstrapping master node labels: %v", err)
-			}
-		}
 		for _, channel := range k.Channels {
 			if err := applyChannel(channel); err != nil {
 				klog.Warningf("error applying channel %q: %v", channel, err)
 			}
 		}
+		if k.BootstrapMasterNodeLabels {
+			if err := bootstrapMasterNodeLabels(ctx, k.Kubernetes, k.NodeName); err != nil {
+				klog.Warningf("error bootstrapping master node labels: %v", err)
+			}
+		}
 	}
 
 	return nil