From d1ff1090a3ffc7dca94d941434e60e5828f68a87 Mon Sep 17 00:00:00 2001
From: Ole Markus With <o.with@sportradar.com>
Date: Sat, 25 Sep 2021 09:11:32 +0200
Subject: [PATCH] Update channels before setting labels

This will prevent an old kops-controller pod from being scheduled to the new master.
---
 protokube/pkg/protokube/kube_boot.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/protokube/pkg/protokube/kube_boot.go b/protokube/pkg/protokube/kube_boot.go
index c91d2571cc..93287741fd 100644
--- 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