Skip to content

Commit 9cb7eba

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2568 from tssurya/revert-2557-revert-2550-ds-merge-7th-may-2025
Revert "OCPBUGS-55824: Revert "OCPBUGS-44285, OCPBUGS-37733, OCPBUGS-55824, OCPBUGS-54375: Downstream Merge 7th May 2025""
2 parents f9ab1db + 456f6dc commit 9cb7eba

File tree

134 files changed

+10770
-710
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+10770
-710
lines changed

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ jobs:
489489
OVN_DISABLE_FORWARDING: "${{ matrix.forwarding == 'disable-forwarding' }}"
490490
USE_HELM: "${{ matrix.target == 'control-plane-helm' || matrix.target == 'multi-homing-helm' }}"
491491
OVN_ENABLE_DNSNAMERESOLVER: "${{ matrix.dns-name-resolver == 'enable-dns-name-resolver' }}"
492+
OVN_NETWORK_QOS_ENABLE: "${{ matrix.target == 'control-plane' || matrix.target == 'control-plane-helm' }}"
492493
TRAFFIC_FLOW_TESTS: "${{ matrix.traffic-flow-tests }}"
493494
ENABLE_ROUTE_ADVERTISEMENTS: "${{ matrix.routeadvertisements != '' }}"
494495
ADVERTISE_DEFAULT_NETWORK: "${{ matrix.routeadvertisements == 'advertise-default' }}"
@@ -629,7 +630,9 @@ jobs:
629630
make -C test control-plane WHAT="Kubevirt Virtual Machines"
630631
elif [ "${{ matrix.target }}" == "control-plane-helm" ]; then
631632
make -C test control-plane
632-
make -C test conformance
633+
if [ "${{ matrix.ipfamily }}" != "ipv6" ]; then
634+
make -C test conformance
635+
fi
633636
elif [ "${{ matrix.target }}" == "network-segmentation" ]; then
634637
make -C test control-plane WHAT="Network Segmentation"
635638
elif [ "${{ matrix.target }}" == "bgp" ]; then

‎MAINTAINERS.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,17 @@ The current Maintainers Group for the ovn-kubernetes Project consists of:
22

33
| Name | Employer | Responsibilities |
44
| ---- | -------- | ---------------- |
5-
| [Dan Williams](https://github.com/dcbw) | Red Hat | All things ovnkube |
65
| [Girish Moodalbail](https://github.com/girishmg) | NVIDIA | All things ovnkube |
76
| [Jaime Caamaño Ruiz](https://github.com/jcaamano) | Red Hat | All things ovnkube |
7+
| [Nadia Pinaeva](https://github.com/npinaeva) | Red Hat | All things ovnkube |
88
| [Surya Seetharaman](https://github.com/tssurya) | Red Hat | All things ovnkube |
99
| [Tim Rozet](https://github.com/trozet) | Red Hat | All things ovnkube |
1010

1111
See [CONTRIBUTING.md](./CONTRIBUTING.md) for general contribution guidelines.
1212
See [GOVERNANCE.md](./GOVERNANCE.md) for governance guidelines and maintainer responsibilities.
13+
14+
Emeritus Maintainers
15+
16+
| Name | Employer | Responsibilities |
17+
| ---- | -------- | ---------------- |
18+
| [Dan Williams](https://github.com/dcbw) | Independent | All things ovnkube |

‎contrib/kind-helm.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ set_default_params() {
2727
export KIND_REMOVE_TAINT=${KIND_REMOVE_TAINT:-true}
2828
export ENABLE_MULTI_NET=${ENABLE_MULTI_NET:-false}
2929
export ENABLE_NETWORK_SEGMENTATION=${ENABLE_NETWORK_SEGMENTATION:-false}
30+
export OVN_NETWORK_QOS_ENABLE=${OVN_NETWORK_QOS_ENABLE:-false}
3031
export KIND_NUM_WORKER=${KIND_NUM_WORKER:-2}
3132
export KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME:-ovn}
3233
export OVN_IMAGE=${OVN_IMAGE:-'ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-ubuntu:helm'}
@@ -98,6 +99,7 @@ usage() {
9899
echo " [ -ikv | --install-kubevirt ]"
99100
echo " [ -mne | --multi-network-enable ]"
100101
echo " [ -nse | --network-segmentation-enable ]"
102+
echo " [ -nqe | --network-qos-enable ]"
101103
echo " [ -wk | --num-workers <num> ]"
102104
echo " [ -ic | --enable-interconnect]"
103105
echo " [ -npz | --node-per-zone ]"
@@ -119,6 +121,7 @@ usage() {
119121
echo "-ikv | --install-kubevirt Install kubevirt"
120122
echo "-mne | --multi-network-enable Enable multi networks. DEFAULT: Disabled"
121123
echo "-nse | --network-segmentation-enable Enable network segmentation. DEFAULT: Disabled"
124+
echo "-nqe | --network-qos-enable Enable network QoS. DEFAULT: Disabled"
122125
echo "-ha | --ha-enabled Enable high availability. DEFAULT: HA Disabled"
123126
echo "-wk | --num-workers Number of worker nodes. DEFAULT: 2 workers"
124127
echo "-cn | --cluster-name Configure the kind cluster's name"
@@ -165,6 +168,8 @@ parse_args() {
165168
;;
166169
-nse | --network-segmentation-enable) ENABLE_NETWORK_SEGMENTATION=true
167170
;;
171+
-nqe | --network-qos-enable ) OVN_NETWORK_QOS_ENABLE=true
172+
;;
168173
-ha | --ha-enabled ) OVN_HA=true
169174
KIND_NUM_MASTER=3
170175
;;
@@ -218,6 +223,7 @@ print_params() {
218223
echo "KIND_REMOVE_TAINT = $KIND_REMOVE_TAINT"
219224
echo "ENABLE_MULTI_NET = $ENABLE_MULTI_NET"
220225
echo "ENABLE_NETWORK_SEGMENTATION = $ENABLE_NETWORK_SEGMENTATION"
226+
echo "OVN_NETWORK_QOS_ENABLE = $OVN_NETWORK_QOS_ENABLE"
221227
echo "OVN_IMAGE = $OVN_IMAGE"
222228
echo "KIND_NUM_MASTER = $KIND_NUM_MASTER"
223229
echo "KIND_NUM_WORKER = $KIND_NUM_WORKER"
@@ -414,6 +420,7 @@ helm install ovn-kubernetes . -f "${value_file}" \
414420
--set global.enableObservability=$(if [ "${OVN_OBSERV_ENABLE}" == "true" ]; then echo "true"; else echo "false"; fi) \
415421
--set global.emptyLbEvents=$(if [ "${OVN_EMPTY_LB_EVENTS}" == "true" ]; then echo "true"; else echo "false"; fi) \
416422
--set global.enableDNSNameResolver=$(if [ "${OVN_ENABLE_DNSNAMERESOLVER}" == "true" ]; then echo "true"; else echo "false"; fi) \
423+
--set global.enableNetworkQos=$(if [ "${OVN_NETWORK_QOS_ENABLE}" == "true" ]; then echo "true"; else echo "false"; fi) \
417424
${ovnkube_db_options}
418425
EOF
419426
)

‎contrib/kind.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ usage() {
8282
echo " [-ic | --enable-interconnect]"
8383
echo " [-rae | --enable-route-advertisements]"
8484
echo " [-adv | --advertise-default-network]"
85+
echo " [-nqe | --network-qos-enable]"
8586
echo " [--isolated]"
8687
echo " [-dns | --enable-dnsnameresolver]"
8788
echo " [-obs | --observability]"
@@ -141,6 +142,7 @@ usage() {
141142
echo "-sm | --scale-metrics Enable scale metrics"
142143
echo "-cm | --compact-mode Enable compact mode, ovnkube master and node run in the same process."
143144
echo "-ic | --enable-interconnect Enable interconnect with each node as a zone (only valid if OVN_HA is false)"
145+
echo "-nqe | --network-qos-enable Enable network QoS. DEFAULT: Disabled."
144146
echo "--disable-ovnkube-identity Disable per-node cert and ovnkube-identity webhook"
145147
echo "-npz | --nodes-per-zone If interconnect is enabled, number of nodes per zone (Default 1). If this value > 1, then (total k8s nodes (workers + 1) / num of nodes per zone) should be zero."
146148
echo "-mtu Define the overlay mtu"
@@ -346,6 +348,8 @@ parse_args() {
346348
-mtu ) shift
347349
OVN_MTU=$1
348350
;;
351+
-nqe | --network-qos-enable ) OVN_NETWORK_QOS_ENABLE=true
352+
;;
349353
--delete ) delete
350354
exit
351355
;;
@@ -439,6 +443,7 @@ print_params() {
439443
fi
440444
fi
441445
echo "OVN_ENABLE_OVNKUBE_IDENTITY = $OVN_ENABLE_OVNKUBE_IDENTITY"
446+
echo "OVN_NETWORK_QOS_ENABLE = $OVN_NETWORK_QOS_ENABLE"
442447
echo "KIND_NUM_WORKER = $KIND_NUM_WORKER"
443448
echo "OVN_MTU= $OVN_MTU"
444449
echo "OVN_ENABLE_DNSNAMERESOLVER= $OVN_ENABLE_DNSNAMERESOLVER"
@@ -603,6 +608,7 @@ set_default_params() {
603608
KIND_NUM_MASTER=1
604609
OVN_ENABLE_INTERCONNECT=${OVN_ENABLE_INTERCONNECT:-false}
605610
OVN_ENABLE_OVNKUBE_IDENTITY=${OVN_ENABLE_OVNKUBE_IDENTITY:-true}
611+
OVN_NETWORK_QOS_ENABLE=${OVN_NETWORK_QOS_ENABLE:-false}
606612

607613

608614
if [ "$OVN_COMPACT_MODE" == true ] && [ "$OVN_ENABLE_INTERCONNECT" != false ]; then
@@ -901,6 +907,7 @@ create_ovn_kube_manifests() {
901907
--enable-multi-external-gateway=true \
902908
--enable-ovnkube-identity="${OVN_ENABLE_OVNKUBE_IDENTITY}" \
903909
--enable-persistent-ips=true \
910+
--network-qos-enable="${OVN_NETWORK_QOS_ENABLE}" \
904911
--mtu="${OVN_MTU}" \
905912
--enable-dnsnameresolver="${OVN_ENABLE_DNSNAMERESOLVER}" \
906913
--mtu="${OVN_MTU}" \
@@ -985,6 +992,7 @@ install_ovn() {
985992
run_kubectl apply -f k8s.ovn.org_egressqoses.yaml
986993
run_kubectl apply -f k8s.ovn.org_egressservices.yaml
987994
run_kubectl apply -f k8s.ovn.org_adminpolicybasedexternalroutes.yaml
995+
run_kubectl apply -f k8s.ovn.org_networkqoses.yaml
988996
run_kubectl apply -f k8s.ovn.org_userdefinednetworks.yaml
989997
run_kubectl apply -f k8s.ovn.org_clusteruserdefinednetworks.yaml
990998
run_kubectl apply -f k8s.ovn.org_routeadvertisements.yaml

‎dist/images/daemonset.sh‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ OVN_ENABLE_INTERCONNECT=
9595
OVN_ENABLE_OVNKUBE_IDENTITY="true"
9696
OVN_ENABLE_PERSISTENT_IPS=
9797
OVN_ENABLE_SVC_TEMPLATE_SUPPORT="true"
98+
OVN_NETWORK_QOS_ENABLE=
9899
OVN_ENABLE_DNSNAMERESOLVER="false"
99100
OVN_NOHOSTSUBNET_LABEL=""
100101
OVN_DISABLE_REQUESTEDCHASSIS="false"
@@ -362,6 +363,9 @@ while [ "$1" != "" ]; do
362363
--enable-svc-template-support)
363364
OVN_ENABLE_SVC_TEMPLATE_SUPPORT=$VALUE
364365
;;
366+
--network-qos-enable)
367+
OVN_NETWORK_QOS_ENABLE=$VALUE
368+
;;
365369
--enable-dnsnameresolver)
366370
OVN_ENABLE_DNSNAMERESOLVER=$VALUE
367371
;;
@@ -565,6 +569,9 @@ echo "ovn_enable_persistent_ips: ${ovn_enable_persistent_ips}"
565569
ovn_enable_svc_template_support=${OVN_ENABLE_SVC_TEMPLATE_SUPPORT}
566570
echo "ovn_enable_svc_template_support: ${ovn_enable_svc_template_support}"
567571

572+
ovn_network_qos_enable=${OVN_NETWORK_QOS_ENABLE}
573+
echo "ovn_network_qos_enable: ${ovn_network_qos_enable}"
574+
568575
ovn_enable_dnsnameresolver=${OVN_ENABLE_DNSNAMERESOLVER}
569576
echo "ovn_enable_dnsnameresolver: ${ovn_enable_dnsnameresolver}"
570577

@@ -627,6 +634,7 @@ ovn_image=${ovnkube_image} \
627634
ovn_enable_multi_external_gateway=${ovn_enable_multi_external_gateway} \
628635
ovn_enable_ovnkube_identity=${ovn_enable_ovnkube_identity} \
629636
ovn_observ_enable=${ovn_observ_enable} \
637+
ovn_network_qos_enable=${ovn_network_qos_enable} \
630638
ovnkube_app_name=ovnkube-node \
631639
jinjanate ../templates/ovnkube-node.yaml.j2 -o ${output_dir}/ovnkube-node.yaml
632640

@@ -680,6 +688,7 @@ ovn_image=${ovnkube_image} \
680688
ovn_enable_multi_external_gateway=${ovn_enable_multi_external_gateway} \
681689
ovn_enable_ovnkube_identity=${ovn_enable_ovnkube_identity} \
682690
ovn_observ_enable=${ovn_observ_enable} \
691+
ovn_network_qos_enable=${ovn_network_qos_enable} \
683692
ovnkube_app_name=ovnkube-node-dpu \
684693
jinjanate ../templates/ovnkube-node.yaml.j2 -o ${output_dir}/ovnkube-node-dpu.yaml
685694

@@ -722,6 +731,7 @@ ovn_image=${image} \
722731
ovn_ex_gw_networking_interface=${ovn_ex_gw_networking_interface} \
723732
ovnkube_node_mgmt_port_netdev=${ovnkube_node_mgmt_port_netdev} \
724733
ovn_enable_ovnkube_identity=${ovn_enable_ovnkube_identity} \
734+
ovn_network_qos_enable=${ovn_network_qos_enable} \
725735
ovnkube_app_name=ovnkube-node-dpu-host \
726736
jinjanate ../templates/ovnkube-node.yaml.j2 -o ${output_dir}/ovnkube-node-dpu-host.yaml
727737

@@ -768,6 +778,7 @@ ovn_image=${ovnkube_image} \
768778
ovn_unprivileged_mode=${ovn_unprivileged_mode} \
769779
ovn_enable_multi_external_gateway=${ovn_enable_multi_external_gateway} \
770780
ovn_enable_ovnkube_identity=${ovn_enable_ovnkube_identity} \
781+
ovn_network_qos_enable=${ovn_network_qos_enable} \
771782
ovn_enable_persistent_ips=${ovn_enable_persistent_ips} \
772783
ovn_enable_svc_template_support=${ovn_enable_svc_template_support} \
773784
ovn_enable_dnsnameresolver=${ovn_enable_dnsnameresolver} \
@@ -812,6 +823,7 @@ ovn_image=${ovnkube_image} \
812823
ovn_enable_interconnect=${ovn_enable_interconnect} \
813824
ovn_enable_multi_external_gateway=${ovn_enable_multi_external_gateway} \
814825
ovn_enable_ovnkube_identity=${ovn_enable_ovnkube_identity} \
826+
ovn_network_qos_enable=${ovn_network_qos_enable} \
815827
ovn_v4_transit_switch_subnet=${ovn_v4_transit_switch_subnet} \
816828
ovn_v6_transit_switch_subnet=${ovn_v6_transit_switch_subnet} \
817829
ovn_enable_persistent_ips=${ovn_enable_persistent_ips} \
@@ -909,6 +921,7 @@ ovn_image=${ovnkube_image} \
909921
ovn_enable_interconnect=${ovn_enable_interconnect} \
910922
ovn_enable_multi_external_gateway=${ovn_enable_multi_external_gateway} \
911923
ovn_enable_ovnkube_identity=${ovn_enable_ovnkube_identity} \
924+
ovn_network_qos_enable=${ovn_network_qos_enable} \
912925
ovn_northd_backoff_interval=${ovn_northd_backoff_interval} \
913926
ovn_enable_persistent_ips=${ovn_enable_persistent_ips} \
914927
ovn_enable_svc_template_support=${ovn_enable_svc_template_support} \
@@ -974,6 +987,7 @@ ovn_image=${ovnkube_image} \
974987
ovn_enable_interconnect=${ovn_enable_interconnect} \
975988
ovn_enable_multi_external_gateway=${ovn_enable_multi_external_gateway} \
976989
ovn_enable_ovnkube_identity=${ovn_enable_ovnkube_identity} \
990+
ovn_network_qos_enable=${ovn_network_qos_enable} \
977991
ovn_northd_backoff_interval=${ovn_enable_backoff_interval} \
978992
ovn_enable_persistent_ips=${ovn_enable_persistent_ips} \
979993
ovn_enable_svc_template_support=${ovn_enable_svc_template_support} \
@@ -1060,6 +1074,7 @@ cp ../templates/k8s.ovn.org_egressips.yaml.j2 ${output_dir}/k8s.ovn.org_egressip
10601074
cp ../templates/k8s.ovn.org_egressqoses.yaml.j2 ${output_dir}/k8s.ovn.org_egressqoses.yaml
10611075
cp ../templates/k8s.ovn.org_egressservices.yaml.j2 ${output_dir}/k8s.ovn.org_egressservices.yaml
10621076
cp ../templates/k8s.ovn.org_adminpolicybasedexternalroutes.yaml.j2 ${output_dir}/k8s.ovn.org_adminpolicybasedexternalroutes.yaml
1077+
cp ../templates/k8s.ovn.org_networkqoses.yaml.j2 ${output_dir}/k8s.ovn.org_networkqoses.yaml
10631078
cp ../templates/k8s.ovn.org_userdefinednetworks.yaml.j2 ${output_dir}/k8s.ovn.org_userdefinednetworks.yaml
10641079
cp ../templates/k8s.ovn.org_clusteruserdefinednetworks.yaml.j2 ${output_dir}/k8s.ovn.org_clusteruserdefinednetworks.yaml
10651080
cp ../templates/k8s.ovn.org_routeadvertisements.yaml.j2 ${output_dir}/k8s.ovn.org_routeadvertisements.yaml

‎dist/images/ovnkube.sh‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,9 @@ ovnkube_compact_mode_enable=${OVNKUBE_COMPACT_MODE_ENABLE:-false}
311311
ovn_northd_backoff_interval=${OVN_NORTHD_BACKOFF_INTERVAL:-"300"}
312312
# OVN_ENABLE_SVC_TEMPLATE_SUPPORT - enable svc template support
313313
ovn_enable_svc_template_support=${OVN_ENABLE_SVC_TEMPLATE_SUPPORT:-true}
314+
315+
#OVN_NETWORK_QOS_ENABLE - enable network QoS for ovn-kubernetes
316+
ovn_network_qos_enable=${OVN_NETWORK_QOS_ENABLE:-false}
314317
# OVN_ENABLE_DNSNAMERESOLVER - enable dns name resolver support
315318
ovn_enable_dnsnameresolver=${OVN_ENABLE_DNSNAMERESOLVER:-false}
316319
# OVN_OBSERV_ENABLE - enable observability for ovnkube
@@ -1292,6 +1295,12 @@ ovn-master() {
12921295
fi
12931296
echo "ovn_disable_requestedchassis_flag=${ovn_disable_requestedchassis_flag}"
12941297

1298+
network_qos_enabled_flag=
1299+
if [[ ${ovn_network_qos_enable} == "true" ]]; then
1300+
network_qos_enabled_flag="--enable-network-qos"
1301+
fi
1302+
echo "network_qos_enabled_flag=${network_qos_enabled_flag}"
1303+
12951304
init_node_flags=
12961305
if [[ ${ovnkube_compact_mode_enable} == "true" ]]; then
12971306
init_node_flags="--init-node ${K8S_NODE} --nodeport"
@@ -1344,6 +1353,7 @@ ovn-master() {
13441353
${ovn_v6_join_subnet_opt} \
13451354
${ovn_v6_masquerade_subnet_opt} \
13461355
${persistent_ips_enabled_flag} \
1356+
${network_qos_enabled_flag} \
13471357
${ovn_enable_dnsnameresolver_flag} \
13481358
${nohostsubnet_label_option} \
13491359
${ovn_disable_requestedchassis_flag} \
@@ -1598,6 +1608,12 @@ ovnkube-controller() {
15981608
fi
15991609
echo "ovn_enable_svc_template_support_flag=${ovn_enable_svc_template_support_flag}"
16001610

1611+
network_qos_enabled_flag=
1612+
if [[ ${ovn_network_qos_enable} == "true" ]]; then
1613+
network_qos_enabled_flag="--enable-network-qos"
1614+
fi
1615+
echo "network_qos_enabled_flag=${network_qos_enabled_flag}"
1616+
16011617
ovn_enable_dnsnameresolver_flag=
16021618
if [[ ${ovn_enable_dnsnameresolver} == "true" ]]; then
16031619
ovn_enable_dnsnameresolver_flag="--enable-dns-name-resolver"
@@ -1642,6 +1658,7 @@ ovnkube-controller() {
16421658
${ovn_v4_masquerade_subnet_opt} \
16431659
${ovn_v6_join_subnet_opt} \
16441660
${ovn_v6_masquerade_subnet_opt} \
1661+
${network_qos_enabled_flag} \
16451662
${ovn_enable_dnsnameresolver_flag} \
16461663
--cluster-subnets ${net_cidr} --k8s-service-cidr=${svc_cidr} \
16471664
--gateway-mode=${ovn_gateway_mode} \
@@ -2019,6 +2036,12 @@ ovnkube-controller-with-node() {
20192036
fi
20202037
echo "ovn_enable_svc_template_support_flag=${ovn_enable_svc_template_support_flag}"
20212038

2039+
network_qos_enabled_flag=
2040+
if [[ ${ovn_network_qos_enable} == "true" ]]; then
2041+
network_qos_enabled_flag="--enable-network-qos"
2042+
fi
2043+
echo "network_qos_enabled_flag=${network_qos_enabled_flag}"
2044+
20222045
ovn_enable_dnsnameresolver_flag=
20232046
if [[ ${ovn_enable_dnsnameresolver} == "true" ]]; then
20242047
ovn_enable_dnsnameresolver_flag="--enable-dns-name-resolver"
@@ -2081,6 +2104,7 @@ ovnkube-controller-with-node() {
20812104
${routable_mtu_flag} \
20822105
${sflow_targets} \
20832106
${ssl_opts} \
2107+
${network_qos_enabled_flag} \
20842108
${ovn_enable_dnsnameresolver_flag} \
20852109
--cluster-subnets ${net_cidr} --k8s-service-cidr=${svc_cidr} \
20862110
--export-ovs-metrics \
@@ -2264,6 +2288,12 @@ ovn-cluster-manager() {
22642288
fi
22652289
echo "empty_lb_events_flag=${empty_lb_events_flag}"
22662290

2291+
network_qos_enabled_flag=
2292+
if [[ ${ovn_network_qos_enable} == "true" ]]; then
2293+
network_qos_enabled_flag="--enable-network-qos"
2294+
fi
2295+
echo "network_qos_enabled_flag=${network_qos_enabled_flag}"
2296+
22672297
ovn_enable_dnsnameresolver_flag=
22682298
if [[ ${ovn_enable_dnsnameresolver} == "true" ]]; then
22692299
ovn_enable_dnsnameresolver_flag="--enable-dns-name-resolver"
@@ -2295,7 +2325,9 @@ ovn-cluster-manager() {
22952325
${ovn_v6_masquerade_subnet_opt} \
22962326
${ovn_v4_transit_switch_subnet_opt} \
22972327
${ovn_v6_transit_switch_subnet_opt} \
2328+
${network_qos_enabled_flag} \
22982329
${ovn_enable_dnsnameresolver_flag} \
2330+
--gateway-mode=${ovn_gateway_mode} \
22992331
--cluster-subnets ${net_cidr} --k8s-service-cidr=${svc_cidr} \
23002332
--host-network-namespace ${ovn_host_network_namespace} \
23012333
--logfile-maxage=${ovnkube_logfile_maxage} \
@@ -2655,6 +2687,12 @@ ovn-node() {
26552687
fi
26562688
echo "ovn_conntrack_zone_flag=${ovn_conntrack_zone_flag}"
26572689

2690+
network_qos_enabled_flag=
2691+
if [[ ${ovn_network_qos_enable} == "true" ]]; then
2692+
network_qos_enabled_flag="--enable-network-qos"
2693+
fi
2694+
echo "network_qos_enabled_flag=${network_qos_enabled_flag}"
2695+
26582696
ovn_v4_masquerade_subnet_opt=
26592697
if [[ -n ${ovn_v4_masquerade_subnet} ]]; then
26602698
ovn_v4_masquerade_subnet_opt="--gateway-v4-masquerade-subnet=${ovn_v4_masquerade_subnet}"
@@ -2705,6 +2743,7 @@ ovn-node() {
27052743
${ovn_unprivileged_flag} \
27062744
${routable_mtu_flag} \
27072745
${sflow_targets} \
2746+
${network_qos_enabled_flag} \
27082747
--cluster-subnets ${net_cidr} --k8s-service-cidr=${svc_cidr} \
27092748
--export-ovs-metrics \
27102749
--gateway-mode=${ovn_gateway_mode} ${ovn_gateway_opts} \

0 commit comments

Comments
 (0)