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 #1416 from erikwilson/device-plugins-path

Browse Source 
Use default kubelet device-plugins path
This commit is contained in:
Erik Wilson 2020-02-14 14:19:51 -07:00 committed by GitHub
commit fe45eb008a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/agent/config/config.go
View File

@ -27,7 +27,6 @@ import (
"github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/util/json"
"k8s.io/apimachinery/pkg/util/net"
"k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
)
func Get(ctx context.Context, agent cmds.Agent) *config.Node {
@ -465,7 +464,6 @@ func get(envInfo *cmds.Agent) (*config.Node, error) {
}
os.Setenv("NODE_NAME", nodeConfig.AgentConfig.NodeName)
v1beta1.KubeletSocket = filepath.Join(envInfo.DataDir, "kubelet/device-plugins/kubelet.sock")
nodeConfig.AgentConfig.ExtraKubeletArgs = envInfo.ExtraKubeletArgs
nodeConfig.AgentConfig.ExtraKubeProxyArgs = envInfo.ExtraKubeProxyArgs