From 5f0ac92f2b46f906db8a4e68770b95b8cb9cc291 Mon Sep 17 00:00:00 2001 From: Knic Knic Date: Mon, 27 Jul 2020 22:06:34 -0700 Subject: [PATCH] make kube_proxy admin hack, work more often --- .gitignore | 4 ++++ pkg/agent/config/config.go | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 46eb58c2e15c..87642ec8315b 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,7 @@ __pycache__ /tests/.vscode /sonobuoy-output *.tmp +t.ps1 +k3s.exe +files.zip + diff --git a/pkg/agent/config/config.go b/pkg/agent/config/config.go index f131fd254bf5..8916e19ba582 100644 --- a/pkg/agent/config/config.go +++ b/pkg/agent/config/config.go @@ -388,7 +388,8 @@ func get(envInfo *cmds.Agent, proxy proxy.Proxy) (*config.Node, error) { // hack due to kube-proxy needing to query nodes to get node ip // C:\Users\Administrator\go\src\github.com\rancher\k3s\vendor\k8s.io\kubernetes\cmd\kube-proxy\app\server_windows.go // line 112 - kubeconfigKubeproxy = "C:\\tmp\\k3s\\server\\cred\\admin.kubeconfig" + // kubeconfigKubeproxy = "C:\\tmp\\k3s\\server\\cred\\admin.kubeconfig" + kubeconfigKubeproxy = filepath.Join(envInfo.DataDir, "..\\server\\cred\\admin.kubeconfig") clientK3sControllerCert := filepath.Join(envInfo.DataDir, "client-k3s-controller.crt") clientK3sControllerKey := filepath.Join(envInfo.DataDir, "client-k3s-controller.key")