Skip to content

Commit 15c4ee6

Browse files
pliurhopenshift-cherrypick-robot
authored and
openshift-cherrypick-robot
committed
Update RouteAdvertisements CR to align with the API change
Signed-off-by: Peng Liu <[email protected]>
1 parent df37264 commit 15c4ee6

File tree

1 file changed

+26
-3
lines changed

1 file changed

+26
-3
lines changed

test/extended/networking/route_advertisements.go

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -866,16 +866,39 @@ func newRouteAdvertisementsManifest(name string, podNetwork, egressip bool) stri
866866
if egressip {
867867
advertisements = append(advertisements, "EgressIP")
868868
}
869-
return fmt.Sprintf(`
869+
if name == "default" {
870+
return fmt.Sprintf(`
870871
apiVersion: k8s.ovn.org/v1
871872
kind: RouteAdvertisements
872873
metadata:
873874
name: %s
874875
spec:
876+
nodeSelector: {}
877+
frrConfigurationSelector:
878+
matchLabels:
879+
network: default
875880
advertisements: [%s]
876-
networkSelector:
881+
networkSelectors:
882+
- networkSelectionType: DefaultNetwork
883+
`, name, strings.Join(advertisements, ","))
884+
}
885+
return fmt.Sprintf(`
886+
apiVersion: k8s.ovn.org/v1
887+
kind: RouteAdvertisements
888+
metadata:
889+
name: %s
890+
spec:
891+
nodeSelector: {}
892+
frrConfigurationSelector:
877893
matchLabels:
878-
advertise: "%s"
894+
network: default
895+
advertisements: [%s]
896+
networkSelectors:
897+
- networkSelectionType: ClusterUserDefinedNetworks
898+
clusterUserDefinedNetworkSelector:
899+
networkSelector:
900+
matchLabels:
901+
advertise: "%s"
879902
`, name, strings.Join(advertisements, ","), name)
880903
}
881904

0 commit comments

Comments
 (0)