Merge remote-tracking branch 'ovnorg/master' into ds-merge-25th-march…

…-2024
openshift · Mar 25, 2024 · b686df6 · b686df6
2 parents 06e52e9 + 41fe592
commit b686df6
Show file tree

Hide file tree

Showing 1,216 changed files with 52,477 additions and 24,516 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -48,7 +48,7 @@ jobs:
       id: go
 
     - name: Verify
-      uses: golangci/golangci-lint-action@v3
+      uses: golangci/golangci-lint-action@v4
       with:
         version: v1.52
         working-directory: go-controller

diff --git a/.github/workflows/test_periodic.yml b/.github/workflows/test_periodic.yml
diff --git a/contrib/kind.sh b/contrib/kind.sh
@@ -1048,6 +1048,12 @@ install_metallb() {
   pushd "${builddir}"
   git clone https://github.com/metallb/metallb.git
   cd metallb
+  # Use global IP next hops in IPv6
+  if  [ "$KIND_IPV6_SUPPORT" == true ]; then
+    sed -i '/address-family PROTOCOL unicast/a \
+  neighbor NODE0_IP route-map IPV6GLOBAL in\n  neighbor NODE1_IP route-map IPV6GLOBAL in\n  neighbor NODE2_IP route-map IPV6GLOBAL in' dev-env/bgp/frr/bgpd.conf.tmpl
+    printf "route-map IPV6GLOBAL permit 10\n set ipv6 next-hop prefer-global" >> dev-env/bgp/frr/bgpd.conf.tmpl
+  fi
   pip install -r dev-env/requirements.txt
 
   local ip_family ipv6_network
@@ -1066,6 +1072,10 @@ install_metallb() {
 
   docker network create --subnet="${METALLB_CLIENT_NET_SUBNET_IPV4}" ${ipv6_network} --driver bridge clientnet
   docker network connect clientnet frr
+  if  [ "$KIND_IPV6_SUPPORT" == true ]; then
+    # Enable IPv6 forwarding in FRR
+    docker exec frr sysctl -w net.ipv6.conf.all.forwarding=1
+  fi
   docker run  --cap-add NET_ADMIN --user 0  -d --network clientnet  --rm  --name lbclient  quay.io/itssurya/dev-images:metallb-lbservice
   popd
   delete_metallb_dir

diff --git a/dist/images/ovnkube.sh b/dist/images/ovnkube.sh
@@ -1994,6 +1994,12 @@ ovn-cluster-manager() {
   fi
   echo "egressfirewall_enabled_flag=${egressfirewall_enabled_flag}"
 
+  egressqos_enabled_flag=
+  if [[ ${ovn_egressqos_enable} == "true" ]]; then
+	  egressqos_enabled_flag="--enable-egress-qos"
+  fi
+  echo "egressqos_enabled_flag=${egressqos_enabled_flag}"
+
   hybrid_overlay_flags=
   if [[ ${ovn_hybrid_overlay_enable} == "true" ]]; then
     hybrid_overlay_flags="--enable-hybrid-overlay"
@@ -2086,6 +2092,7 @@ ovn-cluster-manager() {
     ${egressfirewall_enabled_flag} \
     ${egressip_enabled_flag} \
     ${egressip_healthcheck_port_flag} \
+    ${egressqos_enabled_flag} \
     ${egressservice_enabled_flag} \
     ${empty_lb_events_flag} \
     ${hybrid_overlay_flags} \