diff --git a/docs/modules/ROOT/pages/how-tos/network/migrate-to-cilium.adoc b/docs/modules/ROOT/pages/how-tos/network/migrate-to-cilium.adoc index 5c313032..e14c40d9 100644 --- a/docs/modules/ROOT/pages/how-tos/network/migrate-to-cilium.adoc +++ b/docs/modules/ROOT/pages/how-tos/network/migrate-to-cilium.adoc @@ -174,7 +174,7 @@ HOST_PREFIX=$(kubectl get network.config cluster \ yq -i '.parameters.cilium.cilium_helm_values.ipam.operator.clusterPoolIPv4MaskSize = "'"${HOST_PREFIX}"'"' \ "${CLUSTER_ID}.yml" -yq -i '.parameters.cilium.cilium_helm_values.ipam.operator.clusterPoolIPv4PodCIDR = "'"${POD_CIDR}"'"' \ +yq -i '.parameters.cilium.cilium_helm_values.ipam.operator.~clusterPoolIPv4PodCIDRList = "'"${POD_CIDR}"'"' \ "${CLUSTER_ID}.yml" ---- @@ -196,6 +196,12 @@ commodore catalog compile "${CLUSTER_ID}" . Patch cluster network config + +[IMPORTANT] +==== +Only execute this step after you've paused all machine config pools. +Otherwise, nodes may reboot into a state where they're stuck in `NotReady`. +==== ++ [source,bash] ---- kubectl --as=cluster-admin patch network.config cluster \ @@ -259,6 +265,16 @@ You may need to grab the cluster-admin credentials to complete this step since t + [TIP] ==== +You may want to restart the multus daemonset once the old CNI pods are removed. + +[source,bash] +---- +kubectl --as=cluster-admin -n openshift-multus rollout restart ds/multus +---- +==== ++ +[TIP] +==== It may be necessary to force drain nodes manually to allow the machine-config-operator to reboot the nodes. Use `kubectl --as=cluster-admin drain --ignore-daemonsets --delete-emptydir-data --force --disable-eviction` to circumvent PDB violations if necessary.