Merge pull request #4124 from MarSik/delete-state-on-reboot-only

OCPBUGS-24366: Delete state files on reboot only

Author: openshift-merge-bot[bot]

templates/master/01-master-kubelet/_base/units/kubelet-cleanup.service.yaml

@@ -0,0 +1,14 @@
+name: kubelet-cleanup.service
+enabled: true
+contents: |
+  [Unit]
+  Description=Kubernetes Kubelet After Reboot Cleanup
+  Before=kubelet.service
+
+  [Service]
+  Type=oneshot
+  ExecStart=/bin/rm -f /var/lib/kubelet/cpu_manager_state
+  ExecStart=/bin/rm -f /var/lib/kubelet/memory_manager_state
+
+  [Install]
+  WantedBy=multi-user.target

templates/master/01-master-kubelet/_base/units/kubelet.service.yaml

@@ -10,8 +10,6 @@ contents: |
   [Service]
   Type=notify
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
-  ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
-  ExecStartPre=/bin/rm -f /var/lib/kubelet/memory_manager_state
 {{- if eq .IPFamilies "IPv6"}}
   Environment="KUBELET_NODE_IP=::"
 {{- end}}

templates/master/01-master-kubelet/alibabacloud/units/kubelet.service.yaml

@@ -10,8 +10,6 @@ contents: |
   [Service]
   Type=notify
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
-  ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
-  ExecStartPre=/bin/rm -f /var/lib/kubelet/memory_manager_state
 {{- if eq .IPFamilies "IPv6"}}
   Environment="KUBELET_NODE_IP=::"
 {{- end}}

templates/master/01-master-kubelet/on-prem/units/kubelet.service.yaml

@@ -10,8 +10,6 @@ contents: |
   [Service]
   Type=notify
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
-  ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
-  ExecStartPre=/bin/rm -f /var/lib/kubelet/memory_manager_state
   EnvironmentFile=/etc/os-release
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env

templates/worker/01-worker-kubelet/_base/units/kubelet-cleanup.service.yaml

@@ -0,0 +1,14 @@
+name: kubelet-cleanup.service
+enabled: true
+contents: |
+  [Unit]
+  Description=Kubernetes Kubelet After Reboot Cleanup
+  Before=kubelet.service
+
+  [Service]
+  Type=oneshot
+  ExecStart=/bin/rm -f /var/lib/kubelet/cpu_manager_state
+  ExecStart=/bin/rm -f /var/lib/kubelet/memory_manager_state
+
+  [Install]
+  WantedBy=multi-user.target

templates/worker/01-worker-kubelet/_base/units/kubelet.service.yaml

@@ -10,8 +10,6 @@ contents: |
   [Service]
   Type=notify
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
-  ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
-  ExecStartPre=/bin/rm -f /var/lib/kubelet/memory_manager_state
 {{- if eq .IPFamilies "IPv6"}}
   Environment="KUBELET_NODE_IP=::"
 {{- end}}

templates/worker/01-worker-kubelet/alibabacloud/units/kubelet.service.yaml

@@ -10,8 +10,6 @@ contents: |
   [Service]
   Type=notify
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
-  ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
-  ExecStartPre=/bin/rm -f /var/lib/kubelet/memory_manager_state
 {{- if eq .IPFamilies "IPv6"}}
   Environment="KUBELET_NODE_IP=::"
 {{- end}}

templates/worker/01-worker-kubelet/on-prem/units/kubelet.service.yaml

@@ -10,8 +10,6 @@ contents: |
   [Service]
   Type=notify
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
-  ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
-  ExecStartPre=/bin/rm -f /var/lib/kubelet/memory_manager_state
   EnvironmentFile=/etc/os-release
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env