diff --git a/templates/worker/01-worker-kubelet/baremetal/units/kubelet.service.yaml b/templates/worker/01-worker-kubelet/baremetal/units/kubelet.service.yaml index 0a1d5271d3..00375bc825 100644 --- a/templates/worker/01-worker-kubelet/baremetal/units/kubelet.service.yaml +++ b/templates/worker/01-worker-kubelet/baremetal/units/kubelet.service.yaml @@ -10,7 +10,7 @@ contents: | Type=notify ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state - Environment="KUBELET_LOG_LEVEL=3" + Environment="KUBELET_LOG_LEVEL=4" EnvironmentFile=/etc/os-release EnvironmentFile=-/etc/kubernetes/kubelet-workaround EnvironmentFile=-/etc/kubernetes/kubelet-env @@ -22,6 +22,7 @@ contents: | --kubeconfig=/var/lib/kubelet/kubeconfig \ --container-runtime=remote \ --container-runtime-endpoint=/var/run/crio/crio.sock \ + --runtime-cgroups=/system.slice/crio.service \ --node-labels=node-role.kubernetes.io/worker,node.openshift.io/os_id=${ID} \ --node-ip=${KUBELET_NODE_IP} \ --address=${KUBELET_NODE_IP} \ @@ -29,6 +30,7 @@ contents: | --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \ --cloud-provider={{cloudProvider .}} \ {{cloudConfigFlag . }} \ + --pod-infra-container-image={{.Images.infraImageKey}} \ --v=${KUBELET_LOG_LEVEL} Restart=always diff --git a/templates/worker/01-worker-kubelet/openstack/units/kubelet.service.yaml b/templates/worker/01-worker-kubelet/openstack/units/kubelet.service.yaml index 0a1d5271d3..00375bc825 100644 --- a/templates/worker/01-worker-kubelet/openstack/units/kubelet.service.yaml +++ b/templates/worker/01-worker-kubelet/openstack/units/kubelet.service.yaml @@ -10,7 +10,7 @@ contents: | Type=notify ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state - Environment="KUBELET_LOG_LEVEL=3" + Environment="KUBELET_LOG_LEVEL=4" EnvironmentFile=/etc/os-release EnvironmentFile=-/etc/kubernetes/kubelet-workaround EnvironmentFile=-/etc/kubernetes/kubelet-env @@ -22,6 +22,7 @@ contents: | --kubeconfig=/var/lib/kubelet/kubeconfig \ --container-runtime=remote \ --container-runtime-endpoint=/var/run/crio/crio.sock \ + --runtime-cgroups=/system.slice/crio.service \ --node-labels=node-role.kubernetes.io/worker,node.openshift.io/os_id=${ID} \ --node-ip=${KUBELET_NODE_IP} \ --address=${KUBELET_NODE_IP} \ @@ -29,6 +30,7 @@ contents: | --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \ --cloud-provider={{cloudProvider .}} \ {{cloudConfigFlag . }} \ + --pod-infra-container-image={{.Images.infraImageKey}} \ --v=${KUBELET_LOG_LEVEL} Restart=always diff --git a/templates/worker/01-worker-kubelet/vsphere/units/kubelet.service.yaml b/templates/worker/01-worker-kubelet/vsphere/units/kubelet.service.yaml index ce82c728eb..281a0183c7 100644 --- a/templates/worker/01-worker-kubelet/vsphere/units/kubelet.service.yaml +++ b/templates/worker/01-worker-kubelet/vsphere/units/kubelet.service.yaml @@ -10,7 +10,7 @@ contents: | Type=notify ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state - Environment="KUBELET_LOG_LEVEL=3" + Environment="KUBELET_LOG_LEVEL=4" EnvironmentFile=/etc/os-release EnvironmentFile=-/etc/kubernetes/kubelet-workaround EnvironmentFile=-/etc/kubernetes/kubelet-env @@ -40,6 +40,7 @@ contents: | --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \ --cloud-provider={{cloudProvider .}} \ {{cloudConfigFlag . }} \ + --pod-infra-container-image={{.Images.infraImageKey}} \ --v=${KUBELET_LOG_LEVEL} Restart=always