Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update masq cidr #59987

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+2 −0
Open

update masq cidr #59987

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
784cd97
update masq cidr
zhaozhanqi Dec 18, 2024
5b78d7f
checking from ovnkube pod
zhaozhanqi Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...ep-registry/cucushift/sdn-live-migration-ovn/cucushift-sdn-live-migration-ovn-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ EOT
# Patch new setting for internalJoinSubnet and internalTransitSwitchSubnet
oc patch network.operator.openshift.io cluster --type='merge' -p='{"spec":{"defaultNetwork":{"ovnKubernetesConfig":{"ipv4":{"internalJoinSubnet": "100.65.0.0/16"}}}}}'
oc patch network.operator.openshift.io cluster --type='merge' -p='{"spec":{"defaultNetwork":{"ovnKubernetesConfig":{"ipv4":{"internalTransitSwitchSubnet": "100.85.0.0/16"}}}}}'
oc patch networks.operator.openshift.io cluster --type='merge' -p='{"spec":{"defaultNetwork":{"ovnKubernetesConfig":{"gatewayConfig":{"ipv4":{"internalMasqueradeSubnet": "100.254.0.0/17"}}}}}}'

# Patch the network configuration for live migration
oc patch Network.config.openshift.io cluster --type='merge' --patch '{"metadata":{"annotations":{"network.openshift.io/network-type-migration":""}},"spec":{"networkType":"OVNKubernetes"}}'
Expand All @@ -57,6 +58,7 @@ until
oc get network -o yaml | grep NetworkTypeMigrationCompleted > /dev/null && \
for NODE in \$(oc get nodes -o custom-columns=NAME:.metadata.name --no-headers); do oc get node \$NODE -o yaml | grep "k8s.ovn.org/node-transit-switch-port-ifaddr:" | grep "100.85"; done > /dev/null && \
for NODE in \$(oc get nodes -o custom-columns=NAME:.metadata.name --no-headers); do oc get node \$NODE -o yaml | grep "k8s.ovn.org/node-gateway-router-lrp-ifaddr:" | grep "100.65"; done > /dev/null && \
for ovnpod in \$(oc get pod -n openshift-ovn-kubernetes --no-headers -l app=ovnkube-node -o custom-columns=NAME:.metadata.name); do oc exec -n openshift-ovn-kubernetes \$ovnpod ip a s br-ex | grep "100.254"; done > /dev/null && \
oc get network.config/cluster -o jsonpath='{.status.networkType}' | grep OVNKubernetes > /dev/null;
do
echo "Live migration is still in progress"
Expand Down