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

Apply suggestions from code review 

Logging cleanup

Co-authored-by: Brad Davidson <brad@oatmail.org>
pull/2910/head
Erik Wilson 2021-02-24 10:31:21 -07:00
parent 4aac6b6bd0
commit 4e5218b62c
No known key found for this signature in database
GPG Key ID: 28E43BB8BE202CF8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/server/server.go
View File

@ -226,17 +226,18 @@ func stageFiles(ctx context.Context, sc *Context, controlConfig *config.Control)
return deploy.WatchFiles(ctx, sc.Apply, sc.K3s.K3s().V1().Addon(), controlConfig.Disables, dataDir)
}
// isHelmChartTraefikV1 checks the chart with "traefik-1." prefix.
// isHelmChartTraefikV1 checks for an existing HelmChart resource with spec.chart containing traefik-1,
// as deployed by the legacy chart (https://%{KUBERNETES_API}%/static/charts/traefik-1.81.0.tgz)
func isHelmChartTraefikV1(sc *Context) bool {
prefix := "traefik-1."
helmChart, err := sc.Helm.Helm().V1().HelmChart().Get(metav1.NamespaceSystem, "traefik", metav1.GetOptions{})
if err != nil {
logrus.WithError(err).Info("Not find traefik")
logrus.WithError(err).Info("Failed to get existing traefik HelmChart")
return false
}
chart := path.Base(helmChart.Spec.Chart)
if strings.HasPrefix(chart, prefix) {
logrus.WithField("chart", chart).Info("Found traefik v1 running")
logrus.WithField("chart", chart).Info("Found existing traefik v1 HelmChart")
return true
}
return false