Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
5a0162d8
Commit
5a0162d8
authored
Feb 28, 2024
by
Brad Davidson
Committed by
Brad Davidson
May 23, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop check for legacy traefik v1 chart
We have been bundling traefik v2 for three years, its time to drop the legacy chart check Signed-off-by:
Brad Davidson
<
brad.davidson@rancher.com
>
parent
37f97b33
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
22 deletions
+0
-22
server.go
pkg/server/server.go
+0
-22
No files found.
pkg/server/server.go
View file @
5a0162d8
...
...
@@ -4,7 +4,6 @@ import (
"context"
"fmt"
"os"
"path"
"path/filepath"
"runtime/debug"
"strconv"
...
...
@@ -282,10 +281,6 @@ func stageFiles(ctx context.Context, sc *Context, controlConfig *config.Control)
}
skip
:=
controlConfig
.
Skips
if
!
skip
[
"traefik"
]
&&
isHelmChartTraefikV1
(
sc
)
{
logrus
.
Warn
(
"Skipping Traefik v2 deployment due to existing Traefik v1 installation"
)
skip
[
"traefik"
]
=
true
}
if
err
:=
deploy
.
Stage
(
dataDir
,
templateVars
,
skip
);
err
!=
nil
{
return
err
}
...
...
@@ -332,23 +327,6 @@ func addrTypesPrioTemplate(flannelExternal bool) string {
return
"InternalIP,ExternalIP,Hostname"
}
// 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
(
"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 existing traefik v1 HelmChart"
)
return
true
}
return
false
}
func
HomeKubeConfig
(
write
,
rootless
bool
)
(
string
,
error
)
{
if
write
{
if
os
.
Getuid
()
==
0
&&
!
rootless
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment