diff --git a/pkg/server/server.go b/pkg/server/server.go index d7a73c7cee..acd700696a 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -204,8 +204,7 @@ func coreControllers(ctx context.Context, sc *Context, config *Config) error { func stageFiles(ctx context.Context, sc *Context, controlConfig *config.Control) error { dataDir := filepath.Join(controlConfig.DataDir, "static") - stageTraefik := doStageTraefik(sc) - if err := static.Stage(dataDir, stageTraefik); err != nil { + if err := static.Stage(dataDir); err != nil { return err } dataDir = filepath.Join(controlConfig.DataDir, "manifests") @@ -216,7 +215,7 @@ func stageFiles(ctx context.Context, sc *Context, controlConfig *config.Control) } skip := controlConfig.Skips - if !stageTraefik { + if !checkStageTraefik(sc) { skip["traefik"] = true skip["traefik-crd"] = true } @@ -227,13 +226,13 @@ func stageFiles(ctx context.Context, sc *Context, controlConfig *config.Control) return deploy.WatchFiles(ctx, sc.Apply, sc.K3s.K3s().V1().Addon(), controlConfig.Disables, dataDir) } -// doStageTraefik checks on running traefik HelmChart version and traefik +// checkStageTraefik checks on running traefik HelmChart version and traefik // HelmChartConfig. // Traefik should skip stage when it is v1 and have existing customize traefik // HelmChartConfig due to the incompatible configuration from v1 to v2. // It will progress stage on upgrade or restart when no customized traefik // HelmChartConfig exists on the cluster. -func doStageTraefik(sc *Context) bool { +func checkStageTraefik(sc *Context) bool { if isHelmChartTraefikV1(sc) && isHelmChartConfigExist(sc, "traefik") { return false } diff --git a/pkg/static/stage.go b/pkg/static/stage.go index b2c3815c58..6e28aec39d 100644 --- a/pkg/static/stage.go +++ b/pkg/static/stage.go @@ -6,18 +6,13 @@ import ( "io/ioutil" "os" "path/filepath" - "strings" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) -func Stage(dataDir string, isStageTraefik bool) error { +func Stage(dataDir string) error { for _, name := range AssetNames() { - if !isStageTraefik && strings.HasPrefix(name, "charts/traefik-") { - logrus.WithField("name", name).Info("Skip staging") - continue - } content, err := Asset(name) if err != nil { return err