From ae5b93a2646bc6740dc185f2c609572c79cd0ad3 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Fri, 12 Feb 2021 17:06:23 -0800 Subject: [PATCH] Use HasSuffixI utility function Signed-off-by: Brad Davidson --- pkg/deploy/controller.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkg/deploy/controller.go b/pkg/deploy/controller.go index 17662703b2..d156f033a9 100644 --- a/pkg/deploy/controller.go +++ b/pkg/deploy/controller.go @@ -15,6 +15,7 @@ import ( "time" errors2 "github.com/pkg/errors" + "github.com/rancher/k3s/pkg/agent/util" v12 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1" v1 "github.com/rancher/k3s/pkg/generated/controllers/k3s.cattle.io/v1" "github.com/rancher/wrangler/pkg/apply" @@ -309,11 +310,7 @@ func skipFile(fileName string, skips map[string]bool) bool { return true case skips[fileName]: return true - case strings.HasSuffix(fileName, ".json"): - return false - case strings.HasSuffix(fileName, ".yml"): - return false - case strings.HasSuffix(fileName, ".yaml"): + case util.HasSuffixI(fileName, ".yaml", ".yml", ".json"): return false default: return true @@ -329,11 +326,7 @@ func shouldDisableService(base, fileName string, disables map[string]bool) bool return true } } - switch { - case strings.HasSuffix(fileName, ".json"): - case strings.HasSuffix(fileName, ".yml"): - case strings.HasSuffix(fileName, ".yaml"): - default: + if !util.HasSuffixI(fileName, ".yaml", ".yml", ".json") { return false } baseFile := filepath.Base(fileName)