From 57d771c2b9a3a07e74cbb0f8a0b5558b511c5935 Mon Sep 17 00:00:00 2001
From: Mateusz Gozdek <mateusz@kinvolk.io>
Date: Fri, 13 Nov 2020 16:54:19 +0100
Subject: [PATCH] Upgrade bootstrap-secrets before anything else

So if there is a node pending for bootstrapping, it will be allowed to
bootstrap first, before we proceed with other upgrades.

Closes #949

Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io>
---
 pkg/platform/platform.go      | 8 ++++----
 pkg/platform/platform_test.go | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/platform/platform.go b/pkg/platform/platform.go
index 24f870630..e07040ff9 100644
--- a/pkg/platform/platform.go
+++ b/pkg/platform/platform.go
@@ -39,6 +39,10 @@ const (
 // platforms.
 func CommonControlPlaneCharts(includeKubeletChart bool) []helm.LokomotiveChart {
 	charts := []helm.LokomotiveChart{
+		{
+			Name:      "bootstrap-secrets",
+			Namespace: "kube-system",
+		},
 		{
 			Name:      "pod-checkpointer",
 			Namespace: "kube-system",
@@ -59,10 +63,6 @@ func CommonControlPlaneCharts(includeKubeletChart bool) []helm.LokomotiveChart {
 			Name:      "lokomotive",
 			Namespace: "lokomotive-system",
 		},
-		{
-			Name:      "bootstrap-secrets",
-			Namespace: "kube-system",
-		},
 	}
 
 	if includeKubeletChart {
diff --git a/pkg/platform/platform_test.go b/pkg/platform/platform_test.go
index 3ebb49f89..99b24dda2 100644
--- a/pkg/platform/platform_test.go
+++ b/pkg/platform/platform_test.go
@@ -49,12 +49,12 @@ func TestAppendVersionTag(t *testing.T) {
 
 func TestCommonControlPlaneChartsOrder(t *testing.T) {
 	expectedOrder := []string{
+		"bootstrap-secrets",
 		"pod-checkpointer",
 		"kube-apiserver",
 		"kubernetes",
 		"calico",
 		"lokomotive",
-		"bootstrap-secrets",
 		"kubelet",
 	}