Merge pull request #937 from kinvolk/knrt10/update-controlplane-compo…

…nents-order

Fix controlplane components order

pkg/platform/platform.go

@@ -31,7 +31,7 @@ import (
 func CommonControlPlaneCharts() []helm.LokomotiveChart {
 	return []helm.LokomotiveChart{
 		{
-			Name:      "calico",
+			Name:      "pod-checkpointer",
 			Namespace: "kube-system",
 		},
 		{
@@ -43,7 +43,7 @@ func CommonControlPlaneCharts() []helm.LokomotiveChart {
 			Namespace: "kube-system",
 		},
 		{
-			Name:      "pod-checkpointer",
+			Name:      "calico",
 			Namespace: "kube-system",
 		},
 		{

pkg/platform/platform_test.go

@@ -15,6 +15,7 @@
 package platform_test
 
 import (
+	"reflect"
 	"testing"
 
 	"github.com/kinvolk/lokomotive/pkg/platform"
@@ -45,3 +46,19 @@ func TestAppendVersionTag(t *testing.T) {
 		t.Fatalf("should append version tag to existing map")
 	}
 }
+
+func TestCommonControlPlaneChartsOrder(t *testing.T) {
+	expectedOrder := []string{"pod-checkpointer", "kube-apiserver", "kubernetes", "calico", "lokomotive", "bootstrap-secrets"} //nolint:lll
+
+	commonControlPlaneCharts := platform.CommonControlPlaneCharts()
+
+	actualOrder := []string{}
+
+	for _, v := range commonControlPlaneCharts {
+		actualOrder = append(actualOrder, v.Name)
+	}
+
+	if !reflect.DeepEqual(actualOrder, expectedOrder) {
+		t.Fatalf("expected order: %s, got: %s", expectedOrder, actualOrder)
+	}
+}