github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-28 05:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #114017 from calvin0327/cleanup-containerruntime-options

Browse Source 
cleanup container runtime options
This commit is contained in:
Kubernetes Prow Robot
2023-03-09 21:33:06 -08:00
committed by GitHub
parent c58c1efd03 a1def4b9c0
commit a3ad4d7623
7 changed files with 6 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hack/local-up-cluster.sh
View File

@@ -218,7 +218,6 @@ LOG_LEVEL=${LOG_LEVEL:-3}
LOG_SPEC=${LOG_SPEC:-""}
LOG_DIR=${LOG_DIR:-"/tmp"}
TMP_DIR=${TMP_DIR:-$(kube::realpath "$(mktemp -d -t "$(basename "$0").XXXXXX")")}
CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-"remote"}
CONTAINER_RUNTIME_ENDPOINT=${CONTAINER_RUNTIME_ENDPOINT:-"unix:///run/containerd/containerd.sock"}
RUNTIME_REQUEST_TIMEOUT=${RUNTIME_REQUEST_TIMEOUT:-"2m"}
IMAGE_SERVICE_ENDPOINT=${IMAGE_SERVICE_ENDPOINT:-""}
@@ -713,7 +712,6 @@ function start_kubelet {
all_kubelet_flags=(
"--v=${LOG_LEVEL}"
"--vmodule=${LOG_SPEC}"
"--container-runtime=${CONTAINER_RUNTIME}"
"--hostname-override=${HOSTNAME_OVERRIDE}"
"${cloud_config_arg[@]}"
"--bootstrap-kubeconfig=${CERT_DIR}/kubelet.kubeconfig"