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

Merge pull request #6492 from manuelbuil/removeWinStuff

Browse Source 
Remove stuff which belongs in the windows executor implementation
This commit is contained in:
Manuel Buil 2022-11-15 12:07:17 +01:00 committed by GitHub
commit 9419b1a936
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -66,7 +66,6 @@ replace (
) )
require ( require (
github.com/Microsoft/hcsshim v0.9.2
github.com/Mirantis/cri-dockerd v0.0.0-00010101000000-000000000000 github.com/Mirantis/cri-dockerd v0.0.0-00010101000000-000000000000
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
@ -160,6 +159,7 @@ require (
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/Microsoft/hcsshim v0.9.2 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect

24
pkg/daemons/agent/agent_windows.go
View File

@ -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,9 +15,6 @@ import (
"k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes" "k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes"
) )
// NetworkName may be overridden at runtime in downstream projects
var NetworkName = "vxlan0"
const ( const (
socketPrefix = "npipe://" socketPrefix = "npipe://"
) )
@ -40,10 +35,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
} }
@ -133,18 +124,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 ""
}