File tree Expand file tree Collapse file tree 2 files changed +13
-0
lines changed
magnum/drivers/common/templates/kubernetes/fragments Expand file tree Collapse file tree 2 files changed +13
-0
lines changed Original file line number Diff line number Diff line change @@ -499,7 +499,14 @@ KUBELET_ARGS="${KUBELET_ARGS} --client-ca-file=${CERT_DIR}/ca.crt --tls-cert-fil
499
499
500
500
# specified cgroup driver
501
501
KUBELET_ARGS=" ${KUBELET_ARGS} --cgroup-driver=${CGROUP_DRIVER} "
502
+
502
503
if [ ${CONTAINER_RUNTIME} = " containerd" ] ; then
504
+ # check kubelet version, 1.27.0 dropped docker shim and --container-runtime command line option
505
+ KUBELET_VERSION=$( podman run ${CONTAINER_INFRA_PREFIX:- ${HYPERKUBE_PREFIX} } hyperkube:${KUBE_TAG} kubelet --version | awk ' {print $2}' )
506
+ CONTAINER_RUNTIME_REMOTE_DROPPED=" v1.27.0"
507
+ if [[ " ${CONTAINER_RUNTIME_REMOTE_DROPPED} " != $( echo -e " ${CONTAINER_RUNTIME_REMOTE_DROPPED} \n${KUBELET_VERSION} " | sort -V | head -n1) && " ${KUBELET_VERSION} " != " devel" ]]; then
508
+ KUBELET_ARGS=" ${KUBELET_ARGS} --container-runtime=remote"
509
+ fi
503
510
KUBELET_ARGS=" ${KUBELET_ARGS} --runtime-cgroups=/system.slice/containerd.service"
504
511
KUBELET_ARGS=" ${KUBELET_ARGS} --runtime-request-timeout=15m"
505
512
KUBELET_ARGS=" ${KUBELET_ARGS} --container-runtime-endpoint=unix:///run/containerd/containerd.sock"
Original file line number Diff line number Diff line change @@ -278,6 +278,12 @@ KUBELET_ARGS="${KUBELET_ARGS} --client-ca-file=${CERT_DIR}/ca.crt --tls-cert-fil
278
278
# specified cgroup driver
279
279
KUBELET_ARGS=" ${KUBELET_ARGS} --cgroup-driver=${CGROUP_DRIVER} "
280
280
if [ ${CONTAINER_RUNTIME} = " containerd" ] ; then
281
+ # check kubelet version, 1.27.0 dropped docker shim and --container-runtime command line option
282
+ KUBELET_VERSION=$( podman run ${CONTAINER_INFRA_PREFIX:- ${HYPERKUBE_PREFIX} } hyperkube:${KUBE_TAG} kubelet --version | awk ' {print $2}' )
283
+ CONTAINER_RUNTIME_REMOTE_DROPPED=" v1.27.0"
284
+ if [[ " ${CONTAINER_RUNTIME_REMOTE_DROPPED} " != $( echo -e " ${CONTAINER_RUNTIME_REMOTE_DROPPED} \n${KUBELET_VERSION} " | sort -V | head -n1) && " ${KUBELET_VERSION} " != " devel" ]]; then
285
+ KUBELET_ARGS=" ${KUBELET_ARGS} --container-runtime=remote"
286
+ fi
281
287
KUBELET_ARGS=" ${KUBELET_ARGS} --runtime-cgroups=/system.slice/containerd.service"
282
288
KUBELET_ARGS=" ${KUBELET_ARGS} --runtime-request-timeout=15m"
283
289
KUBELET_ARGS=" ${KUBELET_ARGS} --container-runtime-endpoint=unix:///run/containerd/containerd.sock"
You can’t perform that action at this time.
0 commit comments