Merge pull request #141 from stackhpc/yoga_k8s_1.27

Support k8s 1.27: Remove unsupported kubelet arg
stackhpc · Oct 4, 2023 · d716584 · d716584
2 parents 0d194b2 + 8a0520f
commit d716584
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 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
@@ -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
@@ -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