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
07dc375c
Commit
07dc375c
authored
Nov 14, 2022
by
Manuel Buil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove stuff which belongs in the windows executor implementation
Signed-off-by:
Manuel Buil
<
mbuil@suse.com
>
parent
c62b03fb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
24 deletions
+0
-24
go.mod
go.mod
+0
-1
agent_windows.go
pkg/daemons/agent/agent_windows.go
+0
-23
No files found.
go.mod
View file @
07dc375c
...
@@ -71,7 +71,6 @@ replace (
...
@@ -71,7 +71,6 @@ replace (
)
)
require (
require (
github.com/Microsoft/hcsshim v0.9.2
github.com/cloudnativelabs/kube-router v1.3.2
github.com/cloudnativelabs/kube-router v1.3.2
github.com/containerd/cgroups v1.0.3
github.com/containerd/cgroups v1.0.3
github.com/containerd/containerd v1.6.2
github.com/containerd/containerd v1.6.2
...
...
pkg/daemons/agent/agent_windows.go
View file @
07dc375c
...
@@ -7,9 +7,7 @@ import (
...
@@ -7,9 +7,7 @@ import (
"os"
"os"
"path/filepath"
"path/filepath"
"strings"
"strings"
"time"
"github.com/Microsoft/hcsshim"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/util"
"github.com/k3s-io/k3s/pkg/util"
"github.com/sirupsen/logrus"
"github.com/sirupsen/logrus"
...
@@ -17,8 +15,6 @@ import (
...
@@ -17,8 +15,6 @@ import (
"k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes"
"k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes"
)
)
var
NetworkName
=
"vxlan0"
func
checkRuntimeEndpoint
(
cfg
*
config
.
Agent
,
argsMap
map
[
string
]
string
)
{
func
checkRuntimeEndpoint
(
cfg
*
config
.
Agent
,
argsMap
map
[
string
]
string
)
{
if
strings
.
HasPrefix
(
cfg
.
RuntimeSocket
,
windowsPrefix
)
{
if
strings
.
HasPrefix
(
cfg
.
RuntimeSocket
,
windowsPrefix
)
{
argsMap
[
"container-runtime-endpoint"
]
=
cfg
.
RuntimeSocket
argsMap
[
"container-runtime-endpoint"
]
=
cfg
.
RuntimeSocket
...
@@ -43,10 +39,6 @@ func kubeProxyArgs(cfg *config.Agent) map[string]string {
...
@@ -43,10 +39,6 @@ func kubeProxyArgs(cfg *config.Agent) map[string]string {
argsMap
[
"hostname-override"
]
=
cfg
.
NodeName
argsMap
[
"hostname-override"
]
=
cfg
.
NodeName
}
}
if
sourceVip
:=
waitForManagementIP
(
NetworkName
);
sourceVip
!=
""
{
argsMap
[
"source-vip"
]
=
sourceVip
}
return
argsMap
return
argsMap
}
}
...
@@ -139,18 +131,3 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
...
@@ -139,18 +131,3 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
}
}
return
argsMap
return
argsMap
}
}
func
waitForManagementIP
(
networkName
string
)
string
{
for
range
time
.
Tick
(
time
.
Second
*
5
)
{
network
,
err
:=
hcsshim
.
GetHNSNetworkByName
(
networkName
)
if
err
!=
nil
{
logrus
.
WithError
(
err
)
.
Warning
(
"can't find HNS network, retrying"
,
networkName
)
continue
}
if
network
.
ManagementIP
==
""
{
continue
}
return
network
.
ManagementIP
}
return
""
}
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