public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-07-28 22:29:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow download traefik static file and rename

Browse Source 
Allow writing static files regardless of the version.

Signed-off-by: Chin-Ya Huang <chin-ya.huang@suse.com>
This commit is contained in:
Chin-Ya Huang
2021-01-11 09:59:37 +08:00
committed by Erik Wilson
parent 10e0328977
commit cc96f8140a
2 changed files with 5 additions and 11 deletions
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
}