make kube_proxy admin hack, work more often

KnicKnic · Jul 28, 2020 · 5f0ac92 · 5f0ac92
1 parent 09dce8c
commit 5f0ac92
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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")