Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Traefik v1 migration

Browse Source
This commit is contained in:
Erik Wilson 2021-02-10 17:22:16 -07:00
parent cc96f8140a
commit 54a35505f0
No known key found for this signature in database
GPG Key ID: 28E43BB8BE202CF8
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/server/server.go
View File

@ -215,9 +215,9 @@ func stageFiles(ctx context.Context, sc *Context, controlConfig *config.Control)
} }
skip := controlConfig.Skips skip := controlConfig.Skips
if !checkStageTraefik(sc) { if !skip["traefik"] && isHelmChartTraefikV1(sc) {
logrus.Warn("Skipping Traefik v2 deployment due to existing Traefik v1 installation")
skip["traefik"] = true skip["traefik"] = true
skip["traefik-crd"] = true
} }
if err := deploy.Stage(dataDir, templateVars, skip); err != nil { if err := deploy.Stage(dataDir, templateVars, skip); err != nil {
return err return err
@ -226,19 +226,6 @@ func stageFiles(ctx context.Context, sc *Context, controlConfig *config.Control)
return deploy.WatchFiles(ctx, sc.Apply, sc.K3s.K3s().V1().Addon(), controlConfig.Disables, dataDir) return deploy.WatchFiles(ctx, sc.Apply, sc.K3s.K3s().V1().Addon(), controlConfig.Disables, dataDir)
} }
// 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 checkStageTraefik(sc *Context) bool {
if isHelmChartTraefikV1(sc) && isHelmChartConfigExist(sc, "traefik") {
return false
}
return true
}
// isHelmChartTraefikV1 checks the chart with "traefik-1." prefix. // isHelmChartTraefikV1 checks the chart with "traefik-1." prefix.
func isHelmChartTraefikV1(sc *Context) bool { func isHelmChartTraefikV1(sc *Context) bool {
prefix := "traefik-1." prefix := "traefik-1."
@ -255,17 +242,6 @@ func isHelmChartTraefikV1(sc *Context) bool {
return false return false
} }
func isHelmChartConfigExist(sc *Context, name string) bool {
helmChartConfig := sc.Helm.Helm().V1().HelmChartConfig()
_, err := helmChartConfig.Get(metav1.NamespaceSystem, name, metav1.GetOptions{})
if err != nil {
logrus.WithField("name", name).Info("Not find HelmChartConfig")
return false
}
logrus.WithField("name", name).Info("Found HelmChartConfig ")
return true
}
func HomeKubeConfig(write, rootless bool) (string, error) { func HomeKubeConfig(write, rootless bool) (string, error) {
if write { if write {
if os.Getuid() == 0 && !rootless { if os.Getuid() == 0 && !rootless {