From 8a0520fb1d540326cea063927610aebd607d58f6 Mon Sep 17 00:00:00 2001 From: Dale Smith Date: Tue, 1 Aug 2023 15:16:29 +1200 Subject: [PATCH] Support k8s 1.27: Remove unsupported kubelet arg This argument has been defined for containerd clusters in Magnum, and is set to the default (and only valid) value of 'remote'. Kubelet warning in 1.26: * Flag --container-runtime has been deprecated, will be removed in 1.27 as the only valid value is 'remote' Kubelet error in 1.27: * E0801 03:10:26.723998 8889 run.go:74] "command failed" err="failed to parse kubelet flag: unknown flag: --container-runtime" Change-Id: I072fab1342593941414b86e28b8a76edf2b19a6f --- .../kubernetes/fragments/configure-kubernetes-master.sh | 1 - .../kubernetes/fragments/configure-kubernetes-minion.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh index b1870dd10f..56d1669375 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh @@ -500,7 +500,6 @@ KUBELET_ARGS="${KUBELET_ARGS} --client-ca-file=${CERT_DIR}/ca.crt --tls-cert-fil KUBELET_ARGS="${KUBELET_ARGS} --cgroup-driver=${CGROUP_DRIVER}" if [ ${CONTAINER_RUNTIME} = "containerd" ] ; then KUBELET_ARGS="${KUBELET_ARGS} --runtime-cgroups=/system.slice/containerd.service" - KUBELET_ARGS="${KUBELET_ARGS} --container-runtime=remote" KUBELET_ARGS="${KUBELET_ARGS} --runtime-request-timeout=15m" KUBELET_ARGS="${KUBELET_ARGS} --container-runtime-endpoint=unix:///run/containerd/containerd.sock" fi diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh index ec7e998e81..44b8e8cb0f 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh @@ -276,7 +276,6 @@ KUBELET_ARGS="${KUBELET_ARGS} --client-ca-file=${CERT_DIR}/ca.crt --tls-cert-fil KUBELET_ARGS="${KUBELET_ARGS} --cgroup-driver=${CGROUP_DRIVER}" if [ ${CONTAINER_RUNTIME} = "containerd" ] ; then KUBELET_ARGS="${KUBELET_ARGS} --runtime-cgroups=/system.slice/containerd.service" - KUBELET_ARGS="${KUBELET_ARGS} --container-runtime=remote" KUBELET_ARGS="${KUBELET_ARGS} --runtime-request-timeout=15m" KUBELET_ARGS="${KUBELET_ARGS} --container-runtime-endpoint=unix:///run/containerd/containerd.sock" fi