Skip to content

Commit f9ab1db

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

File tree

134 files changed

+710
-10770
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

+710
-10770
lines changed

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,6 @@ 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' }}"
493492
TRAFFIC_FLOW_TESTS: "${{ matrix.traffic-flow-tests }}"
494493
ENABLE_ROUTE_ADVERTISEMENTS: "${{ matrix.routeadvertisements != '' }}"
495494
ADVERTISE_DEFAULT_NETWORK: "${{ matrix.routeadvertisements == 'advertise-default' }}"
@@ -630,9 +629,7 @@ jobs:
630629
make -C test control-plane WHAT="Kubevirt Virtual Machines"
631630
elif [ "${{ matrix.target }}" == "control-plane-helm" ]; then
632631
make -C test control-plane
633-
if [ "${{ matrix.ipfamily }}" != "ipv6" ]; then
634-
make -C test conformance
635-
fi
632+
make -C test conformance
636633
elif [ "${{ matrix.target }}" == "network-segmentation" ]; then
637634
make -C test control-plane WHAT="Network Segmentation"
638635
elif [ "${{ matrix.target }}" == "bgp" ]; then

‎MAINTAINERS.md‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,11 @@ 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 |
56
| [Girish Moodalbail](https://github.com/girishmg) | NVIDIA | All things ovnkube |
67
| [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: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ 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}
3130
export KIND_NUM_WORKER=${KIND_NUM_WORKER:-2}
3231
export KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME:-ovn}
3332
export OVN_IMAGE=${OVN_IMAGE:-'ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-ubuntu:helm'}
@@ -99,7 +98,6 @@ usage() {
9998
echo " [ -ikv | --install-kubevirt ]"
10099
echo " [ -mne | --multi-network-enable ]"
101100
echo " [ -nse | --network-segmentation-enable ]"
102-
echo " [ -nqe | --network-qos-enable ]"
103101
echo " [ -wk | --num-workers <num> ]"
104102
echo " [ -ic | --enable-interconnect]"
105103
echo " [ -npz | --node-per-zone ]"
@@ -121,7 +119,6 @@ usage() {
121119
echo "-ikv | --install-kubevirt Install kubevirt"
122120
echo "-mne | --multi-network-enable Enable multi networks. DEFAULT: Disabled"
123121
echo "-nse | --network-segmentation-enable Enable network segmentation. DEFAULT: Disabled"
124-
echo "-nqe | --network-qos-enable Enable network QoS. DEFAULT: Disabled"
125122
echo "-ha | --ha-enabled Enable high availability. DEFAULT: HA Disabled"
126123
echo "-wk | --num-workers Number of worker nodes. DEFAULT: 2 workers"
127124
echo "-cn | --cluster-name Configure the kind cluster's name"
@@ -168,8 +165,6 @@ parse_args() {
168165
;;
169166
-nse | --network-segmentation-enable) ENABLE_NETWORK_SEGMENTATION=true
170167
;;
171-
-nqe | --network-qos-enable ) OVN_NETWORK_QOS_ENABLE=true
172-
;;
173168
-ha | --ha-enabled ) OVN_HA=true
174169
KIND_NUM_MASTER=3
175170
;;
@@ -223,7 +218,6 @@ print_params() {
223218
echo "KIND_REMOVE_TAINT = $KIND_REMOVE_TAINT"
224219
echo "ENABLE_MULTI_NET = $ENABLE_MULTI_NET"
225220
echo "ENABLE_NETWORK_SEGMENTATION = $ENABLE_NETWORK_SEGMENTATION"
226-
echo "OVN_NETWORK_QOS_ENABLE = $OVN_NETWORK_QOS_ENABLE"
227221
echo "OVN_IMAGE = $OVN_IMAGE"
228222
echo "KIND_NUM_MASTER = $KIND_NUM_MASTER"
229223
echo "KIND_NUM_WORKER = $KIND_NUM_WORKER"
@@ -420,7 +414,6 @@ helm install ovn-kubernetes . -f "${value_file}" \
420414
--set global.enableObservability=$(if [ "${OVN_OBSERV_ENABLE}" == "true" ]; then echo "true"; else echo "false"; fi) \
421415
--set global.emptyLbEvents=$(if [ "${OVN_EMPTY_LB_EVENTS}" == "true" ]; then echo "true"; else echo "false"; fi) \
422416
--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) \
424417
${ovnkube_db_options}
425418
EOF
426419
)

‎contrib/kind.sh‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ usage() {
8282
echo " [-ic | --enable-interconnect]"
8383
echo " [-rae | --enable-route-advertisements]"
8484
echo " [-adv | --advertise-default-network]"
85-
echo " [-nqe | --network-qos-enable]"
8685
echo " [--isolated]"
8786
echo " [-dns | --enable-dnsnameresolver]"
8887
echo " [-obs | --observability]"
@@ -142,7 +141,6 @@ usage() {
142141
echo "-sm | --scale-metrics Enable scale metrics"
143142
echo "-cm | --compact-mode Enable compact mode, ovnkube master and node run in the same process."
144143
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."
146144
echo "--disable-ovnkube-identity Disable per-node cert and ovnkube-identity webhook"
147145
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."
148146
echo "-mtu Define the overlay mtu"
@@ -348,8 +346,6 @@ parse_args() {
348346
-mtu ) shift
349347
OVN_MTU=$1
350348
;;
351-
-nqe | --network-qos-enable ) OVN_NETWORK_QOS_ENABLE=true
352-
;;
353349
--delete ) delete
354350
exit
355351
;;
@@ -443,7 +439,6 @@ print_params() {
443439
fi
444440
fi
445441
echo "OVN_ENABLE_OVNKUBE_IDENTITY = $OVN_ENABLE_OVNKUBE_IDENTITY"
446-
echo "OVN_NETWORK_QOS_ENABLE = $OVN_NETWORK_QOS_ENABLE"
447442
echo "KIND_NUM_WORKER = $KIND_NUM_WORKER"
448443
echo "OVN_MTU= $OVN_MTU"
449444
echo "OVN_ENABLE_DNSNAMERESOLVER= $OVN_ENABLE_DNSNAMERESOLVER"
@@ -608,7 +603,6 @@ set_default_params() {
608603
KIND_NUM_MASTER=1
609604
OVN_ENABLE_INTERCONNECT=${OVN_ENABLE_INTERCONNECT:-false}
610605
OVN_ENABLE_OVNKUBE_IDENTITY=${OVN_ENABLE_OVNKUBE_IDENTITY:-true}
611-
OVN_NETWORK_QOS_ENABLE=${OVN_NETWORK_QOS_ENABLE:-false}
612606

613607

614608
if [ "$OVN_COMPACT_MODE" == true ] && [ "$OVN_ENABLE_INTERCONNECT" != false ]; then
@@ -907,7 +901,6 @@ create_ovn_kube_manifests() {
907901
--enable-multi-external-gateway=true \
908902
--enable-ovnkube-identity="${OVN_ENABLE_OVNKUBE_IDENTITY}" \
909903
--enable-persistent-ips=true \
910-
--network-qos-enable="${OVN_NETWORK_QOS_ENABLE}" \
911904
--mtu="${OVN_MTU}" \
912905
--enable-dnsnameresolver="${OVN_ENABLE_DNSNAMERESOLVER}" \
913906
--mtu="${OVN_MTU}" \
@@ -992,7 +985,6 @@ install_ovn() {
992985
run_kubectl apply -f k8s.ovn.org_egressqoses.yaml
993986
run_kubectl apply -f k8s.ovn.org_egressservices.yaml
994987
run_kubectl apply -f k8s.ovn.org_adminpolicybasedexternalroutes.yaml
995-
run_kubectl apply -f k8s.ovn.org_networkqoses.yaml
996988
run_kubectl apply -f k8s.ovn.org_userdefinednetworks.yaml
997989
run_kubectl apply -f k8s.ovn.org_clusteruserdefinednetworks.yaml
998990
run_kubectl apply -f k8s.ovn.org_routeadvertisements.yaml

‎dist/images/daemonset.sh‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ 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=
9998
OVN_ENABLE_DNSNAMERESOLVER="false"
10099
OVN_NOHOSTSUBNET_LABEL=""
101100
OVN_DISABLE_REQUESTEDCHASSIS="false"
@@ -363,9 +362,6 @@ while [ "$1" != "" ]; do
363362
--enable-svc-template-support)
364363
OVN_ENABLE_SVC_TEMPLATE_SUPPORT=$VALUE
365364
;;
366-
--network-qos-enable)
367-
OVN_NETWORK_QOS_ENABLE=$VALUE
368-
;;
369365
--enable-dnsnameresolver)
370366
OVN_ENABLE_DNSNAMERESOLVER=$VALUE
371367
;;
@@ -569,9 +565,6 @@ echo "ovn_enable_persistent_ips: ${ovn_enable_persistent_ips}"
569565
ovn_enable_svc_template_support=${OVN_ENABLE_SVC_TEMPLATE_SUPPORT}
570566
echo "ovn_enable_svc_template_support: ${ovn_enable_svc_template_support}"
571567

572-
ovn_network_qos_enable=${OVN_NETWORK_QOS_ENABLE}
573-
echo "ovn_network_qos_enable: ${ovn_network_qos_enable}"
574-
575568
ovn_enable_dnsnameresolver=${OVN_ENABLE_DNSNAMERESOLVER}
576569
echo "ovn_enable_dnsnameresolver: ${ovn_enable_dnsnameresolver}"
577570

@@ -634,7 +627,6 @@ ovn_image=${ovnkube_image} \
634627
ovn_enable_multi_external_gateway=${ovn_enable_multi_external_gateway} \
635628
ovn_enable_ovnkube_identity=${ovn_enable_ovnkube_identity} \
636629
ovn_observ_enable=${ovn_observ_enable} \
637-
ovn_network_qos_enable=${ovn_network_qos_enable} \
638630
ovnkube_app_name=ovnkube-node \
639631
jinjanate ../templates/ovnkube-node.yaml.j2 -o ${output_dir}/ovnkube-node.yaml
640632

@@ -688,7 +680,6 @@ ovn_image=${ovnkube_image} \
688680
ovn_enable_multi_external_gateway=${ovn_enable_multi_external_gateway} \
689681
ovn_enable_ovnkube_identity=${ovn_enable_ovnkube_identity} \
690682
ovn_observ_enable=${ovn_observ_enable} \
691-
ovn_network_qos_enable=${ovn_network_qos_enable} \
692683
ovnkube_app_name=ovnkube-node-dpu \
693684
jinjanate ../templates/ovnkube-node.yaml.j2 -o ${output_dir}/ovnkube-node-dpu.yaml
694685

@@ -731,7 +722,6 @@ ovn_image=${image} \
731722
ovn_ex_gw_networking_interface=${ovn_ex_gw_networking_interface} \
732723
ovnkube_node_mgmt_port_netdev=${ovnkube_node_mgmt_port_netdev} \
733724
ovn_enable_ovnkube_identity=${ovn_enable_ovnkube_identity} \
734-
ovn_network_qos_enable=${ovn_network_qos_enable} \
735725
ovnkube_app_name=ovnkube-node-dpu-host \
736726
jinjanate ../templates/ovnkube-node.yaml.j2 -o ${output_dir}/ovnkube-node-dpu-host.yaml
737727

@@ -778,7 +768,6 @@ ovn_image=${ovnkube_image} \
778768
ovn_unprivileged_mode=${ovn_unprivileged_mode} \
779769
ovn_enable_multi_external_gateway=${ovn_enable_multi_external_gateway} \
780770
ovn_enable_ovnkube_identity=${ovn_enable_ovnkube_identity} \
781-
ovn_network_qos_enable=${ovn_network_qos_enable} \
782771
ovn_enable_persistent_ips=${ovn_enable_persistent_ips} \
783772
ovn_enable_svc_template_support=${ovn_enable_svc_template_support} \
784773
ovn_enable_dnsnameresolver=${ovn_enable_dnsnameresolver} \
@@ -823,7 +812,6 @@ ovn_image=${ovnkube_image} \
823812
ovn_enable_interconnect=${ovn_enable_interconnect} \
824813
ovn_enable_multi_external_gateway=${ovn_enable_multi_external_gateway} \
825814
ovn_enable_ovnkube_identity=${ovn_enable_ovnkube_identity} \
826-
ovn_network_qos_enable=${ovn_network_qos_enable} \
827815
ovn_v4_transit_switch_subnet=${ovn_v4_transit_switch_subnet} \
828816
ovn_v6_transit_switch_subnet=${ovn_v6_transit_switch_subnet} \
829817
ovn_enable_persistent_ips=${ovn_enable_persistent_ips} \
@@ -921,7 +909,6 @@ ovn_image=${ovnkube_image} \
921909
ovn_enable_interconnect=${ovn_enable_interconnect} \
922910
ovn_enable_multi_external_gateway=${ovn_enable_multi_external_gateway} \
923911
ovn_enable_ovnkube_identity=${ovn_enable_ovnkube_identity} \
924-
ovn_network_qos_enable=${ovn_network_qos_enable} \
925912
ovn_northd_backoff_interval=${ovn_northd_backoff_interval} \
926913
ovn_enable_persistent_ips=${ovn_enable_persistent_ips} \
927914
ovn_enable_svc_template_support=${ovn_enable_svc_template_support} \
@@ -987,7 +974,6 @@ ovn_image=${ovnkube_image} \
987974
ovn_enable_interconnect=${ovn_enable_interconnect} \
988975
ovn_enable_multi_external_gateway=${ovn_enable_multi_external_gateway} \
989976
ovn_enable_ovnkube_identity=${ovn_enable_ovnkube_identity} \
990-
ovn_network_qos_enable=${ovn_network_qos_enable} \
991977
ovn_northd_backoff_interval=${ovn_enable_backoff_interval} \
992978
ovn_enable_persistent_ips=${ovn_enable_persistent_ips} \
993979
ovn_enable_svc_template_support=${ovn_enable_svc_template_support} \
@@ -1074,7 +1060,6 @@ cp ../templates/k8s.ovn.org_egressips.yaml.j2 ${output_dir}/k8s.ovn.org_egressip
10741060
cp ../templates/k8s.ovn.org_egressqoses.yaml.j2 ${output_dir}/k8s.ovn.org_egressqoses.yaml
10751061
cp ../templates/k8s.ovn.org_egressservices.yaml.j2 ${output_dir}/k8s.ovn.org_egressservices.yaml
10761062
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
10781063
cp ../templates/k8s.ovn.org_userdefinednetworks.yaml.j2 ${output_dir}/k8s.ovn.org_userdefinednetworks.yaml
10791064
cp ../templates/k8s.ovn.org_clusteruserdefinednetworks.yaml.j2 ${output_dir}/k8s.ovn.org_clusteruserdefinednetworks.yaml
10801065
cp ../templates/k8s.ovn.org_routeadvertisements.yaml.j2 ${output_dir}/k8s.ovn.org_routeadvertisements.yaml

‎dist/images/ovnkube.sh‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,6 @@ 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}
317314
# OVN_ENABLE_DNSNAMERESOLVER - enable dns name resolver support
318315
ovn_enable_dnsnameresolver=${OVN_ENABLE_DNSNAMERESOLVER:-false}
319316
# OVN_OBSERV_ENABLE - enable observability for ovnkube
@@ -1295,12 +1292,6 @@ ovn-master() {
12951292
fi
12961293
echo "ovn_disable_requestedchassis_flag=${ovn_disable_requestedchassis_flag}"
12971294

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-
13041295
init_node_flags=
13051296
if [[ ${ovnkube_compact_mode_enable} == "true" ]]; then
13061297
init_node_flags="--init-node ${K8S_NODE} --nodeport"
@@ -1353,7 +1344,6 @@ ovn-master() {
13531344
${ovn_v6_join_subnet_opt} \
13541345
${ovn_v6_masquerade_subnet_opt} \
13551346
${persistent_ips_enabled_flag} \
1356-
${network_qos_enabled_flag} \
13571347
${ovn_enable_dnsnameresolver_flag} \
13581348
${nohostsubnet_label_option} \
13591349
${ovn_disable_requestedchassis_flag} \
@@ -1608,12 +1598,6 @@ ovnkube-controller() {
16081598
fi
16091599
echo "ovn_enable_svc_template_support_flag=${ovn_enable_svc_template_support_flag}"
16101600

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-
16171601
ovn_enable_dnsnameresolver_flag=
16181602
if [[ ${ovn_enable_dnsnameresolver} == "true" ]]; then
16191603
ovn_enable_dnsnameresolver_flag="--enable-dns-name-resolver"
@@ -1658,7 +1642,6 @@ ovnkube-controller() {
16581642
${ovn_v4_masquerade_subnet_opt} \
16591643
${ovn_v6_join_subnet_opt} \
16601644
${ovn_v6_masquerade_subnet_opt} \
1661-
${network_qos_enabled_flag} \
16621645
${ovn_enable_dnsnameresolver_flag} \
16631646
--cluster-subnets ${net_cidr} --k8s-service-cidr=${svc_cidr} \
16641647
--gateway-mode=${ovn_gateway_mode} \
@@ -2036,12 +2019,6 @@ ovnkube-controller-with-node() {
20362019
fi
20372020
echo "ovn_enable_svc_template_support_flag=${ovn_enable_svc_template_support_flag}"
20382021

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-
20452022
ovn_enable_dnsnameresolver_flag=
20462023
if [[ ${ovn_enable_dnsnameresolver} == "true" ]]; then
20472024
ovn_enable_dnsnameresolver_flag="--enable-dns-name-resolver"
@@ -2104,7 +2081,6 @@ ovnkube-controller-with-node() {
21042081
${routable_mtu_flag} \
21052082
${sflow_targets} \
21062083
${ssl_opts} \
2107-
${network_qos_enabled_flag} \
21082084
${ovn_enable_dnsnameresolver_flag} \
21092085
--cluster-subnets ${net_cidr} --k8s-service-cidr=${svc_cidr} \
21102086
--export-ovs-metrics \
@@ -2288,12 +2264,6 @@ ovn-cluster-manager() {
22882264
fi
22892265
echo "empty_lb_events_flag=${empty_lb_events_flag}"
22902266

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-
22972267
ovn_enable_dnsnameresolver_flag=
22982268
if [[ ${ovn_enable_dnsnameresolver} == "true" ]]; then
22992269
ovn_enable_dnsnameresolver_flag="--enable-dns-name-resolver"
@@ -2325,9 +2295,7 @@ ovn-cluster-manager() {
23252295
${ovn_v6_masquerade_subnet_opt} \
23262296
${ovn_v4_transit_switch_subnet_opt} \
23272297
${ovn_v6_transit_switch_subnet_opt} \
2328-
${network_qos_enabled_flag} \
23292298
${ovn_enable_dnsnameresolver_flag} \
2330-
--gateway-mode=${ovn_gateway_mode} \
23312299
--cluster-subnets ${net_cidr} --k8s-service-cidr=${svc_cidr} \
23322300
--host-network-namespace ${ovn_host_network_namespace} \
23332301
--logfile-maxage=${ovnkube_logfile_maxage} \
@@ -2687,12 +2655,6 @@ ovn-node() {
26872655
fi
26882656
echo "ovn_conntrack_zone_flag=${ovn_conntrack_zone_flag}"
26892657

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-
26962658
ovn_v4_masquerade_subnet_opt=
26972659
if [[ -n ${ovn_v4_masquerade_subnet} ]]; then
26982660
ovn_v4_masquerade_subnet_opt="--gateway-v4-masquerade-subnet=${ovn_v4_masquerade_subnet}"
@@ -2743,7 +2705,6 @@ ovn-node() {
27432705
${ovn_unprivileged_flag} \
27442706
${routable_mtu_flag} \
27452707
${sflow_targets} \
2746-
${network_qos_enabled_flag} \
27472708
--cluster-subnets ${net_cidr} --k8s-service-cidr=${svc_cidr} \
27482709
--export-ovs-metrics \
27492710
--gateway-mode=${ovn_gateway_mode} ${ovn_gateway_opts} \

0 commit comments

Comments
 (0)