Skip to content

Commit f93b3fc

Browse files
committed
OCPBUGS-78731: Move enable-multicast from config maps to CLI flags
Remove enable-multicast=true from ovnkube config maps and pass it directly as --enable-multicast on the ovnkube CLI for node and control plane processes (both self-hosted and managed). Made-with: Cursor
1 parent d97745f commit f93b3fc

File tree

6 files changed

+3
-17
lines changed

6 files changed

+3
-17
lines changed

bindata/network/ovn-kubernetes/common/008-script-lib.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,7 @@ data:
732732
${network_observability_enabled_flag} \
733733
--zone ${K8S_NODE} \
734734
--enable-interconnect \
735+
--enable-multicast \
735736
--acl-logging-rate-limit "{{.OVNPolicyAuditRateLimit}}" \
736737
${gw_interface_flag} \
737738
${ip_forwarding_flag} \

bindata/network/ovn-kubernetes/managed/004-config.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ data:
4949
{{- end }}
5050
enable-admin-network-policy=true
5151
enable-multi-external-gateway=true
52-
enable-multicast=true
5352
{{- if .DNS_NAME_RESOLVER_ENABLE }}
5453
enable-dns-name-resolver=true
5554
{{- end }}
@@ -137,7 +136,6 @@ data:
137136
{{- end }}
138137
enable-admin-network-policy=true
139138
enable-multi-external-gateway=true
140-
enable-multicast=true
141139
{{- if .DNS_NAME_RESOLVER_ENABLE }}
142140
enable-dns-name-resolver=true
143141
{{- end }}

bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ spec:
198198
echo "I$(date "+%m%d %H:%M:%S.%N") - ovnkube-control-plane - start ovnkube --init-cluster-manager ${K8S_NODE}"
199199
exec /usr/bin/ovnkube \
200200
--enable-interconnect \
201+
--enable-multicast \
201202
--init-cluster-manager "${K8S_NODE}" \
202203
--config-file=/run/ovnkube-config/ovnkube.conf \
203204
--k8s-token-file=/var/run/secrets/hosted_cluster/token \

bindata/network/ovn-kubernetes/self-hosted/004-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ data:
5454
{{- end }}
5555
enable-admin-network-policy=true
5656
enable-multi-external-gateway=true
57-
enable-multicast=true
5857
{{- if .DNS_NAME_RESOLVER_ENABLE }}
5958
enable-dns-name-resolver=true
6059
{{- end }}

bindata/network/ovn-kubernetes/self-hosted/ovnkube-control-plane.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ spec:
154154
echo "I$(date "+%m%d %H:%M:%S.%N") - ovnkube-control-plane - start ovnkube --init-cluster-manager ${K8S_NODE}"
155155
exec /usr/bin/ovnkube \
156156
--enable-interconnect \
157+
--enable-multicast \
157158
--init-cluster-manager "${K8S_NODE}" \
158159
--config-file=/run/ovnkube-config/ovnkube.conf \
159160
--loglevel "${OVN_KUBE_LOG_LEVEL}" \

pkg/network/ovn_kubernetes_test.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@ enable-network-segmentation=true
306306
enable-preconfigured-udn-addresses=true
307307
enable-admin-network-policy=true
308308
enable-multi-external-gateway=true
309-
enable-multicast=true
310309
311310
[gateway]
312311
mode=shared
@@ -353,7 +352,6 @@ enable-network-segmentation=true
353352
enable-preconfigured-udn-addresses=true
354353
enable-admin-network-policy=true
355354
enable-multi-external-gateway=true
356-
enable-multicast=true
357355
358356
[gateway]
359357
mode=local
@@ -414,7 +412,6 @@ enable-network-segmentation=true
414412
enable-preconfigured-udn-addresses=true
415413
enable-admin-network-policy=true
416414
enable-multi-external-gateway=true
417-
enable-multicast=true
418415
419416
[gateway]
420417
mode=local
@@ -477,7 +474,6 @@ enable-network-segmentation=true
477474
enable-preconfigured-udn-addresses=true
478475
enable-admin-network-policy=true
479476
enable-multi-external-gateway=true
480-
enable-multicast=true
481477
482478
[gateway]
483479
mode=local
@@ -539,7 +535,6 @@ enable-network-segmentation=true
539535
enable-preconfigured-udn-addresses=true
540536
enable-admin-network-policy=true
541537
enable-multi-external-gateway=true
542-
enable-multicast=true
543538
544539
[gateway]
545540
mode=local
@@ -601,7 +596,6 @@ enable-network-segmentation=true
601596
enable-preconfigured-udn-addresses=true
602597
enable-admin-network-policy=true
603598
enable-multi-external-gateway=true
604-
enable-multicast=true
605599
606600
[gateway]
607601
mode=shared
@@ -652,7 +646,6 @@ enable-network-segmentation=true
652646
enable-preconfigured-udn-addresses=true
653647
enable-admin-network-policy=true
654648
enable-multi-external-gateway=true
655-
enable-multicast=true
656649
657650
[gateway]
658651
mode=shared
@@ -706,7 +699,6 @@ enable-network-segmentation=true
706699
enable-preconfigured-udn-addresses=true
707700
enable-admin-network-policy=true
708701
enable-multi-external-gateway=true
709-
enable-multicast=true
710702
711703
[gateway]
712704
mode=shared
@@ -753,7 +745,6 @@ enable-network-segmentation=true
753745
enable-preconfigured-udn-addresses=true
754746
enable-admin-network-policy=true
755747
enable-multi-external-gateway=true
756-
enable-multicast=true
757748
758749
[gateway]
759750
mode=shared
@@ -802,7 +793,6 @@ enable-preconfigured-udn-addresses=true
802793
enable-multi-networkpolicy=true
803794
enable-admin-network-policy=true
804795
enable-multi-external-gateway=true
805-
enable-multicast=true
806796
807797
[gateway]
808798
mode=shared
@@ -851,7 +841,6 @@ enable-network-segmentation=true
851841
enable-preconfigured-udn-addresses=true
852842
enable-admin-network-policy=true
853843
enable-multi-external-gateway=true
854-
enable-multicast=true
855844
856845
[gateway]
857846
mode=shared
@@ -898,7 +887,6 @@ enable-network-segmentation=true
898887
enable-preconfigured-udn-addresses=true
899888
enable-admin-network-policy=true
900889
enable-multi-external-gateway=true
901-
enable-multicast=true
902890
903891
[gateway]
904892
mode=shared
@@ -947,7 +935,6 @@ enable-network-segmentation=true
947935
enable-preconfigured-udn-addresses=true
948936
enable-admin-network-policy=true
949937
enable-multi-external-gateway=true
950-
enable-multicast=true
951938
enable-dns-name-resolver=true
952939
953940
[gateway]
@@ -995,7 +982,6 @@ enable-network-segmentation=true
995982
enable-preconfigured-udn-addresses=true
996983
enable-admin-network-policy=true
997984
enable-multi-external-gateway=true
998-
enable-multicast=true
999985
1000986
[gateway]
1001987
mode=shared

0 commit comments

Comments
 (0)