Use nssm for log rotation

kubernetes-sigs · Dec 14, 2021 · cb63449 · cb63449
1 parent 196c549
commit cb63449
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 6 deletions.
diff --git a/images/capi/ansible/windows/roles/kubernetes/tasks/kubelet.yml b/images/capi/ansible/windows/roles/kubernetes/tasks/kubelet.yml
@@ -36,7 +36,7 @@
   win_service:
     name: kubelet
     dependencies: [ "{{ runtime_service }}" ]
-    start_mode: manual
+    start_mode: auto
   vars:
     dependencies:
       containerd: containerd

diff --git a/images/capi/ansible/windows/roles/kubernetes/tasks/nssm.yml b/images/capi/ansible/windows/roles/kubernetes/tasks/nssm.yml
@@ -29,6 +29,11 @@
 - name: Install kubelet via nssm
   win_nssm:
     name: kubelet
-    start_mode: manual
+    start_mode: auto
+    state: present
     application: '%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe'
     arguments: '-ExecutionPolicy Bypass -NoProfile {{ kubernetes_install_path }}\StartKubelet.ps1'
+    app_rotate_bytes: 10485760
+    stderr_file: '{{ systemdrive.stdout | trim }}\var\log\kubelet\kubelet.err.log'
+    stdout_file: '{{ systemdrive.stdout | trim }}\var\log\kubelet\kubelet.log'
+    app_rotate_online: 1
diff --git a/images/capi/ansible/windows/roles/kubernetes/templates/StartKubelet.ps1 b/images/capi/ansible/windows/roles/kubernetes/templates/StartKubelet.ps1
@@ -33,8 +33,6 @@ $args = "--cert-dir=$env:SYSTEMDRIVE/var/lib/kubelet/pki",
         "--enforce-node-allocatable=`"`"",
         "--network-plugin=cni",
         "--resolv-conf=`"`"",
-        "--log-dir=$env:SYSTEMDRIVE/var/log/kubelet",
-        "--logtostderr=false",
        	"--image-pull-progress-deadline=20m"
 
 $kubeletCommandLine = "{{ kubernetes_install_path }}\kubelet.exe " + ($args -join " ") + " $kubeAdmArgs"

diff --git a/images/capi/packer/ami/packer-windows.json b/images/capi/packer/ami/packer-windows.json
@@ -128,6 +128,10 @@
       },
       "version": "{{user `goss_version`}}"
     },
+    {  
+      "inline": ["rm -Force -Recurse C:\\var\\log\\kubelet\\*"],
+      "type": "powershell"
+    },
     {
       "elevated_password": "{{.WinRMPassword}}",
       "elevated_user": "Administrator",

diff --git a/images/capi/packer/azure/packer-windows.json b/images/capi/packer/azure/packer-windows.json
@@ -161,6 +161,10 @@
       },
       "version": "{{user `goss_version`}}"
     },
+    {  
+      "inline": ["rm -Force -Recurse C:\\var\\log\\kubelet\\*"],
+      "type": "powershell"
+    },
     {
       "elevated_password": "{{.WinRMPassword}}",
       "elevated_user": "packer",

diff --git a/images/capi/packer/goss/goss-vars.yaml b/images/capi/packer/goss/goss-vars.yaml
@@ -320,8 +320,7 @@ windows:
       - Stopped
     kubelet:
       expected: 
-      - Manual 
-      - Stopped
+      - Automatic 
       - "/RequiredServices.+:.+(containerd|docker)/"
     sshd:
       expected:

diff --git a/images/capi/packer/ova/packer-windows.json b/images/capi/packer/ova/packer-windows.json
@@ -231,6 +231,10 @@
         "runtime": "{{user `runtime`}}"
       },
       "version": "{{user `goss_version`}}"
+    },
+    {  
+      "inline": ["rm -Force -Recurse C:\\var\\log\\kubelet\\*"],
+      "type": "powershell"
     }
   ],
   "variables": {