Merge pull request #1827 from sriramandev/topic/ssriraman/optional-kubelet-log-redirect

Make kubelet log redirection optional for windows

Author: k8s-ci-robot

images/capi/ansible/windows/roles/kubernetes/defaults/main.yml

@@ -16,4 +16,4 @@ kubernetes_bins:
   - kubeadm
   - kubectl
   - kubelet
-  - kube-log-runner
+kubernetes_auto_kubelet_service_restart: true

images/capi/ansible/windows/roles/kubernetes/tasks/sc.yml

@@ -15,23 +15,52 @@
 # Install kubelet as a windows service
 # Requires --windows-service flag: https://github.com/kubernetes/kubernetes/blob/7f23a743e8c23ac6489340bbb34fa6f1d392db9d/cmd/kubelet/app/options/osflags_windows.go#L26
 # Does not support kubeadm KUBELET_KUBEADM_ARGS which is used by Cluster API to pass extra user args
-- name: Install kubelet as service
-  ansible.windows.win_service:
-    name: kubelet
-    start_mode: auto
-    path: >
-      "{{ kubernetes_install_path }}\kube-log-runner.exe" --log-file={{ systemdrive.stdout | trim }}/var/log/kubelet/kubelet.log
-      {{kubernetes_install_path }}\kubelet.exe --windows-service
-      --cert-dir={{ systemdrive.stdout | trim }}/var/lib/kubelet/pki
-      --config={{ systemdrive.stdout | trim }}/var/lib/kubelet/config.yaml
-      --bootstrap-kubeconfig={{ systemdrive.stdout | trim }}/etc/kubernetes/bootstrap-kubelet.conf
-      --kubeconfig={{ systemdrive.stdout | trim }}/etc/kubernetes/kubelet.conf
-      --pod-infra-container-image="{{ pause_image }}"
-      --enable-debugging-handlers --cgroups-per-qos=false --enforce-node-allocatable=""
-      --container-runtime-endpoint="npipe:////./pipe/containerd-containerd"
-      --resolv-conf=""
+- name: Install kubelet service - with restart template
+  when: kubernetes_auto_kubelet_service_restart | bool
+  block:
+    - name: Install kube-log-runner
+      ansible.windows.win_get_url:
+        url: "{{ kubernetes_base_url }}/kube-log-runner.exe"
+        dest: "{{ kubernetes_install_path }}\\"
+      retries: 5
+      delay: 3
+      register: kubernetes_download
+      until: kubernetes_download is not failed
+    - name: Install kubelet as service
+      ansible.windows.win_service:
+        name: kubelet
+        start_mode: auto
+        path: >
+          "{{ kubernetes_install_path }}\kube-log-runner.exe" --log-file={{ systemdrive.stdout | trim }}/var/log/kubelet/kubelet.log
+          {{ kubernetes_install_path }}\kubelet.exe --windows-service
+          --cert-dir={{ systemdrive.stdout | trim }}/var/lib/kubelet/pki
+          --config={{ systemdrive.stdout | trim }}/var/lib/kubelet/config.yaml
+          --bootstrap-kubeconfig={{ systemdrive.stdout | trim }}/etc/kubernetes/bootstrap-kubelet.conf
+          --kubeconfig={{ systemdrive.stdout | trim }}/etc/kubernetes/kubelet.conf
+          --pod-infra-container-image="{{ pause_image }}"
+          --enable-debugging-handlers --cgroups-per-qos=false --enforce-node-allocatable=""
+          --container-runtime-endpoint="npipe:////./pipe/containerd-containerd"
+          --resolv-conf=""
 
-- name: Create file to restart kubelet as a windows service
-  ansible.windows.win_template:
-    src: templates/RestartKubelet.ps1
-    dest: "{{ kubernetes_install_path }}\\RestartKubelet.ps1"
+    - name: Create file to restart kubelet as a windows service
+      ansible.windows.win_template:
+        src: templates/RestartKubelet.ps1
+        dest: "{{ kubernetes_install_path }}\\RestartKubelet.ps1"
+
+- name: Install kubelet service - without restart template
+  when: not kubernetes_auto_kubelet_service_restart | bool
+  block:
+    - name: Install kubelet as service
+      ansible.windows.win_service:
+        name: kubelet
+        start_mode: manual
+        path: >
+          {{ kubernetes_install_path }}\kubelet.exe --windows-service
+          --cert-dir={{ systemdrive.stdout | trim }}/var/lib/kubelet/pki
+          --config={{ systemdrive.stdout | trim }}/var/lib/kubelet/config.yaml
+          --bootstrap-kubeconfig={{ systemdrive.stdout | trim }}/etc/kubernetes/bootstrap-kubelet.conf
+          --kubeconfig={{ systemdrive.stdout | trim }}/etc/kubernetes/kubelet.conf
+          --hostname-override=$(hostname) --pod-infra-container-image=`"{{ pause_image }}`"
+          --enable-debugging-handlers --cgroups-per-qos=false --enforce-node-allocatable=`"`"
+          --resolv-conf=`"`" --log-dir={{ systemdrive.stdout | trim }}/var/log/kubelet
+          --logtostderr=false {{ additional_kubelet_args if additional_kubelet_args is defined }}

images/capi/packer/config/windows/ansible-args-windows.json

@@ -1,3 +1,3 @@
 {
-  "ansible_common_vars": "runtime={{user `runtime`}} containerd_url={{user `containerd_url`}} containerd_sha256={{user `containerd_sha256_windows`}} pause_image={{user `pause_image`}} additional_debug_files=\"{{user `additional_debug_files`}}\" containerd_additional_settings={{user `containerd_additional_settings`}} custom_role_names=\"{{user `custom_role_names`}}\" http_proxy={{user `http_proxy`}} https_proxy={{user `https_proxy`}} no_proxy={{user `no_proxy`}} kubernetes_base_url={{user `kubernetes_base_url`}} kubernetes_semver={{user `kubernetes_semver`}} kubernetes_install_path={{user `kubernetes_install_path`}} cloudbase_init_url=\"{{user `cloudbase_init_url`}}\" cloudbase_plugins=\"{{user `cloudbase_plugins`}}\" cloudbase_metadata_services=\"{{user `cloudbase_metadata_services`}}\" cloudbase_plugins_unattend=\"{{user `cloudbase_plugins_unattend`}}\" cloudbase_metadata_services_unattend=\"{{user `cloudbase_metadata_services_unattend`}}\" prepull={{user `prepull`}} windows_updates_kbs=\"{{user `windows_updates_kbs`}}\" windows_updates_categories=\"{{user `windows_updates_categories`}}\" windows_service_manager={{user `windows_service_manager`}} nssm_url={{user `nssm_url`}} distribution_version={{user `distribution_version`}} netbios_host_name_compatibility={{user `netbios_host_name_compatibility`}} disable_hypervisor={{ user `disable_hypervisor` }} cloudbase_logging_serial_port={{ user `cloudbase_logging_serial_port` }} cloudbase_real_time_clock_utc={{ user `cloudbase_real_time_clock_utc` }} load_additional_components={{ user `load_additional_components`}} ecr_credential_provider={{ user `ecr_credential_provider` }} additional_registry_images={{ user `additional_registry_images`}} additional_registry_images_list={{ user `additional_registry_images_list`}} additional_url_images={{ user `additional_url_images`}} additional_url_images_list={{ user `additional_url_images_list`}} additional_executables={{ user `additional_executables`}} additional_executables_list={{ user `additional_executables_list`}} additional_executables_destination_path={{ user `additional_executables_destination_path`}} ssh_source_url={{user `ssh_source_url` }} debug_tools={{user `debug_tools`}}"
+  "ansible_common_vars": "runtime={{user `runtime`}} containerd_url={{user `containerd_url`}} containerd_sha256={{user `containerd_sha256_windows`}} pause_image={{user `pause_image`}} additional_debug_files=\"{{user `additional_debug_files`}}\" containerd_additional_settings={{user `containerd_additional_settings`}} custom_role_names=\"{{user `custom_role_names`}}\" http_proxy={{user `http_proxy`}} https_proxy={{user `https_proxy`}} no_proxy={{user `no_proxy`}} kubernetes_base_url={{user `kubernetes_base_url`}} kubernetes_semver={{user `kubernetes_semver`}} kubernetes_install_path={{user `kubernetes_install_path`}} cloudbase_init_url=\"{{user `cloudbase_init_url`}}\" cloudbase_plugins=\"{{user `cloudbase_plugins`}}\" cloudbase_metadata_services=\"{{user `cloudbase_metadata_services`}}\" cloudbase_plugins_unattend=\"{{user `cloudbase_plugins_unattend`}}\" cloudbase_metadata_services_unattend=\"{{user `cloudbase_metadata_services_unattend`}}\" prepull={{user `prepull`}} windows_updates_kbs=\"{{user `windows_updates_kbs`}}\" windows_updates_categories=\"{{user `windows_updates_categories`}}\" windows_service_manager={{user `windows_service_manager`}} nssm_url={{user `nssm_url`}} distribution_version={{user `distribution_version`}} netbios_host_name_compatibility={{user `netbios_host_name_compatibility`}} disable_hypervisor={{ user `disable_hypervisor` }} cloudbase_logging_serial_port={{ user `cloudbase_logging_serial_port` }} cloudbase_real_time_clock_utc={{ user `cloudbase_real_time_clock_utc` }} load_additional_components={{ user `load_additional_components`}} ecr_credential_provider={{ user `ecr_credential_provider` }} additional_registry_images={{ user `additional_registry_images`}} additional_registry_images_list={{ user `additional_registry_images_list`}} additional_url_images={{ user `additional_url_images`}} additional_url_images_list={{ user `additional_url_images_list`}} additional_executables={{ user `additional_executables`}} additional_executables_list={{ user `additional_executables_list`}} additional_executables_destination_path={{ user `additional_executables_destination_path`}} ssh_source_url={{user `ssh_source_url` }} debug_tools={{user `debug_tools`}} kubernetes_auto_kubelet_service_restart={{ user `enable_auto_kubelet_service_restart` }}"
 }

images/capi/packer/ova/packer-windows.json

@@ -248,6 +248,7 @@
     "containerd_version": null,
     "disable_hypervisor": null,
     "disk_size": "81920",
+    "enable_auto_kubelet_service_restart": "false",
     "firmware": "bios",
     "http_port_max": "",
     "http_port_min": "",