github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow download traefik static file and rename 

Allow writing static files regardless of the version.

Signed-off-by: Chin-Ya Huang <chin-ya.huang@suse.com>
pull/2910/head
Chin-Ya Huang 2021-01-11 09:59:37 +08:00 committed by Erik Wilson
parent 10e0328977
commit cc96f8140a
No known key found for this signature in database
GPG Key ID: 28E43BB8BE202CF8
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/server/server.go
View File

@ -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
}

7
pkg/static/stage.go
View File

@ -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