Skip to content

Commit 9027049

Browse files
committed
local-up-cluster.sh: Use config file instead of flags for kubelet
Because /tmp/kubelet.log shows trailing log. Flag --container-runtime-endpoint has been deprecated, This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information. Signed-off-by: Masashi Honma <[email protected]>
1 parent 6a4e93e commit 9027049

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

hack/local-up-cluster.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -822,10 +822,6 @@ function start_kubelet {
822822
fi
823823

824824
mkdir -p "/var/lib/kubelet" &>/dev/null || sudo mkdir -p "/var/lib/kubelet"
825-
container_runtime_endpoint_args=()
826-
if [[ -n "${CONTAINER_RUNTIME_ENDPOINT}" ]]; then
827-
container_runtime_endpoint_args=("--container-runtime-endpoint=${CONTAINER_RUNTIME_ENDPOINT}")
828-
fi
829825

830826
image_service_endpoint_args=()
831827
if [[ -n "${IMAGE_SERVICE_ENDPOINT}" ]]; then
@@ -840,7 +836,6 @@ function start_kubelet {
840836
"${cloud_config_arg[@]}"
841837
"--bootstrap-kubeconfig=${CERT_DIR}/kubelet.kubeconfig"
842838
"--kubeconfig=${CERT_DIR}/kubelet-rotated.kubeconfig"
843-
${container_runtime_endpoint_args[@]+"${container_runtime_endpoint_args[@]}"}
844839
${image_service_endpoint_args[@]+"${image_service_endpoint_args[@]}"}
845840
${KUBELET_FLAGS}
846841
)
@@ -864,6 +859,7 @@ address: "${KUBELET_HOST}"
864859
cgroupDriver: "${CGROUP_DRIVER}"
865860
cgroupRoot: "${CGROUP_ROOT}"
866861
cgroupsPerQOS: ${CGROUPS_PER_QOS}
862+
containerRuntimeEndpoint: ${CONTAINER_RUNTIME_ENDPOINT}
867863
cpuCFSQuota: ${CPU_CFS_QUOTA}
868864
enableControllerAttachDetach: ${ENABLE_CONTROLLER_ATTACH_DETACH}
869865
localStorageCapacityIsolation: ${LOCAL_STORAGE_CAPACITY_ISOLATION}

0 commit comments

Comments
 (0)