Skip to content

Commit d716584

Browse files
authored
Merge pull request #141 from stackhpc/yoga_k8s_1.27
Support k8s 1.27: Remove unsupported kubelet arg
2 parents 0d194b2 + 8a0520f commit d716584

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,6 @@ KUBELET_ARGS="${KUBELET_ARGS} --client-ca-file=${CERT_DIR}/ca.crt --tls-cert-fil
500500
KUBELET_ARGS="${KUBELET_ARGS} --cgroup-driver=${CGROUP_DRIVER}"
501501
if [ ${CONTAINER_RUNTIME} = "containerd" ] ; then
502502
KUBELET_ARGS="${KUBELET_ARGS} --runtime-cgroups=/system.slice/containerd.service"
503-
KUBELET_ARGS="${KUBELET_ARGS} --container-runtime=remote"
504503
KUBELET_ARGS="${KUBELET_ARGS} --runtime-request-timeout=15m"
505504
KUBELET_ARGS="${KUBELET_ARGS} --container-runtime-endpoint=unix:///run/containerd/containerd.sock"
506505
fi

magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ KUBELET_ARGS="${KUBELET_ARGS} --client-ca-file=${CERT_DIR}/ca.crt --tls-cert-fil
276276
KUBELET_ARGS="${KUBELET_ARGS} --cgroup-driver=${CGROUP_DRIVER}"
277277
if [ ${CONTAINER_RUNTIME} = "containerd" ] ; then
278278
KUBELET_ARGS="${KUBELET_ARGS} --runtime-cgroups=/system.slice/containerd.service"
279-
KUBELET_ARGS="${KUBELET_ARGS} --container-runtime=remote"
280279
KUBELET_ARGS="${KUBELET_ARGS} --runtime-request-timeout=15m"
281280
KUBELET_ARGS="${KUBELET_ARGS} --container-runtime-endpoint=unix:///run/containerd/containerd.sock"
282281
fi

0 commit comments

Comments
 (0)