Merge pull request kubernetes-sigs#785 from knabben/pair-windows-paths

Replacing \var\lib\kubelet path to \etc\kubernetes
evanfreed · Feb 28, 2022 · 4f73b99 · 4f73b99
2 parents 0aa3c44 + 385a274
commit 4f73b99
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/images/capi/ansible/windows/roles/kubernetes/tasks/kubelet.yml b/images/capi/ansible/windows/roles/kubernetes/tasks/kubelet.yml
@@ -18,13 +18,10 @@
     state: directory
   loop: 
     - '{{ systemdrive.stdout | trim }}\var\log\kubelet'
-    - '{{ systemdrive.stdout | trim }}\var\lib\kubelet\etc\kubernetes'
-    - '{{ systemdrive.stdout | trim }}\var\lib\kubelet\etc\kubernetes\manifests'
+    - '{{ systemdrive.stdout | trim }}\etc\kubernetes'
+    - '{{ systemdrive.stdout | trim }}\etc\kubernetes\manifests'
     - '{{ systemdrive.stdout | trim }}\etc\kubernetes\pki'
 
-- name: Symlink kubelet pki folder
-  win_shell: New-Item -path $env:SystemDrive\var\lib\kubelet\etc\kubernetes\pki -type SymbolicLink -value  $env:SystemDrive\etc\kubernetes\pki\ -Force
-
 - import_tasks: nssm.yml
   when: windows_service_manager == "nssm"
 

diff --git a/images/capi/packer/goss/goss-command.yaml b/images/capi/packer/goss/goss-command.yaml
@@ -111,12 +111,6 @@ command:
     stdout:
     - {{.Vars.kubernetes_version}}
     timeout: 10000
-  Check Symbolic link to /etc/kubernetes/pki:
-    exit-status: 0
-    exec: powershell -command "(Get-item -path $env:SystemDrive\var\lib\kubelet\etc\kubernetes\pki| select LinkType,Target)"
-    stdout:
-    - SymbolicLink 
-    - C:\etc\kubernetes\pki\
 {{ if eq .Vars.distribution_version "2019" }}
   Windows build version is high enough:
     exit-status: 0

diff --git a/images/capi/packer/goss/goss-vars.yaml b/images/capi/packer/goss/goss-vars.yaml
@@ -316,11 +316,11 @@ windows:
       exists: true
       filetype: directory
       contains:
-    c:/var/lib/kubelet/etc/kubernetes:
+    c:/etc/kubernetes:
       exists: true
       filetype: directory
       contains:
-    c:/var/lib/kubelet/etc/kubernetes/manifests:
+    c:/etc/kubernetes/manifests:
       exists: true
       filetype: directory
       contains: