From 62f458861f3bb2632380fc5353b71a0ba8fc14a9 Mon Sep 17 00:00:00 2001 From: Mikael Bergemalm Date: Wed, 4 Mar 2020 09:52:22 +0100 Subject: [PATCH] fix(helm): add BackendConfig to sort order GKE's BackendConfig needs to be installed before ingress as part of service configuration. Signed-off-by: Mikael Bergemalm --- pkg/releaseutil/kind_sorter.go | 2 ++ pkg/releaseutil/kind_sorter_test.go | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/releaseutil/kind_sorter.go b/pkg/releaseutil/kind_sorter.go index 92ffa03f2..6a47e7a33 100644 --- a/pkg/releaseutil/kind_sorter.go +++ b/pkg/releaseutil/kind_sorter.go @@ -46,6 +46,7 @@ var InstallOrder KindSortOrder = []string{ "RoleList", "RoleBinding", "RoleBindingList", + "BackendConfig", "Service", "DaemonSet", "Pod", @@ -67,6 +68,7 @@ var UninstallOrder KindSortOrder = []string{ "APIService", "Ingress", "Service", + "BackendConfig", "CronJob", "Job", "StatefulSet", diff --git a/pkg/releaseutil/kind_sorter_test.go b/pkg/releaseutil/kind_sorter_test.go index 4747e8252..1bdf7392f 100644 --- a/pkg/releaseutil/kind_sorter_test.go +++ b/pkg/releaseutil/kind_sorter_test.go @@ -159,6 +159,10 @@ func TestKindSorter(t *testing.T) { Name: "x", Head: &SimpleHead{Kind: "HorizontalPodAutoscaler"}, }, + { + Name: "y", + Head: &SimpleHead{Kind: "BackendConfig"}, + }, } for _, test := range []struct { @@ -166,8 +170,8 @@ func TestKindSorter(t *testing.T) { order KindSortOrder expected string }{ - {"install", InstallOrder, "aAbcC3def1gh2iIjJkKlLmnopqrxstuvw!"}, - {"uninstall", UninstallOrder, "wvmutsxrqponLlKkJjIi2hg1fed3CcbAa!"}, + {"install", InstallOrder, "aAbcC3def1gh2iIjJkKlLymnopqrxstuvw!"}, + {"uninstall", UninstallOrder, "wvmyutsxrqponLlKkJjIi2hg1fed3CcbAa!"}, } { var buf bytes.Buffer t.Run(test.description, func(t *testing.T) {