Merge pull request #2521 from ricky-rav/downstreammerge_20250425

CORENET-5786: Downstream merge 2025-04-25

Author: openshift-merge-bot[bot]

.github/workflows/docs.yml

@@ -37,6 +37,7 @@ jobs:
         with:
           python-version: 3.x
       - run: pip install mkdocs-material
+      - run: pip install mkdocs-awesome-pages-plugin # Install the missing plugin
       - run: pip install $(mkdocs-get-deps)
       - run: mkdocs build
       - name: Setup Pages
@@ -60,6 +61,7 @@ jobs:
           python-version: 3.x
       - run: |
           pip install mkdocs-material
+          pip install mkdocs-awesome-pages-plugin # Install the missing plugin
           pip install $(mkdocs-get-deps)
       - run: mkdocs build
       - name: Upload Artifact (Test)

dist/READMEcontainer.md

@@ -84,7 +84,7 @@ kubelet.
 
 $ cd images && make
 builds the default centos based image from  Dockerfile
-$  make fedora
+$ make fedora-image
 builds the image with the fedora 
 
 Once the image is built it must be tagged and pushed to a docker image repo

docs/developer-guide/image-build.md

@@ -21,8 +21,8 @@ To build images locally, use the following [Makefile](https://github.com/ovn-kub
 
 ```bash
 $ cd dist/images
-$ make fedora
-$ make ubuntu
+$ make fedora-image
+$ make ubuntu-image
 ```
 
 The build will create an image called ovn-kube-fedora:latest or ovn-kube-ubuntu:latest, which can be re-tagged.

docs/images/ovn-inside-k8s-stacked.png

@@ -1,4 +1,4 @@
-![ovn-kubernetes-logo](images/ovn-inside-k8s.png)
+![ovn-kubernetes-logo](images/ovn-inside-k8s-stacked.png)
 
 # OVN-Kubernetes: A Robust Kubernetes Networking Provider
 

docs/images/ovn-inside-k8s.png

@@ -44,7 +44,7 @@ Build the image for fedora and launch the KIND Deployment
 
 ```
 $ pushd dist/images
-$ make fedora
+$ make fedora-image
 $ popd
 
 $ pushd contrib
@@ -70,7 +70,7 @@ $ OCI_BIN=podman
 Then build,
 
 ```
-$ make fedora
+$ make fedora-image
 $ popd
 ```
 
@@ -319,7 +319,7 @@ $ cd go-controller/
 $ make
 
 $ cd ../dist/images/
-$ make fedora
+$ make fedora-image
 
 $ cd ../../contrib/
 $ KIND_IPV4_SUPPORT=false KIND_IPV6_SUPPORT=true ./kind.sh
@@ -423,7 +423,7 @@ $ cd go-controller/
 $ make
 
 $ cd ../dist/images/
-$ make fedora
+$ make fedora-image
 
 $ cd ../../contrib/
 $ KIND_IPV4_SUPPORT=true KIND_IPV6_SUPPORT=true K8S_VERSION=v1.32.3 ./kind.sh

docs/index.md

@@ -64,7 +64,7 @@ networking:
 - Optional: build local image and load it into Kind nodes
 ```
 # cd dist/images
-# make ubuntu
+# make ubuntu-image
 # docker tag ovn-kube-ubuntu:latest ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-ubuntu:master
 # kind load docker-image ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-ubuntu:master
 ```

docs/installation/launching-ovn-kubernetes-on-kind.md

@@ -45,8 +45,8 @@ As of Aug 2024, the kernel need to be built from the source, therefore to try th
 - rebuild the kernel with the current master branch from [Linus' tree](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git)
   - to rebuild on fedora: https://docs.fedoraproject.org/en-US/quick-docs/kernel-build-custom/#_building_a_vanilla_upstream_kernel
 - Build an ovn-kubernetes image that uses the latest OVS/OVN code:
-`OVS_BRANCH=main make -C dist/images fedora-dev`
-- Start kind with that image, use `-ov localhost/ovn-kube-fedora-dev:latest` flag with `kind.sh` script.
+`OVS_BRANCH=main make -C dist/images fedora-dev-local-gw-deployment`
+- Start kind with that image, use `-ov localhost/ovn-daemonset-fedora:latest` flag with `kind.sh` script.
 
 ## Workflow Description
 

docs/installation/launching-ovn-kubernetes-with-helm.md

@@ -22,6 +22,8 @@ import (
 	"k8s.io/klog/v2"
 	kexec "k8s.io/utils/exec"
 
+	"github.com/ovn-org/libovsdb/client"
+
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/clustermanager"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/controllermanager"
@@ -529,6 +531,7 @@ func runOvnKube(ctx context.Context, runMode *ovnkubeRunMode, ovnClientset *util
 		}()
 	}
 
+	var ovsClient client.Client
 	if runMode.node {
 		wg.Add(1)
 		go func() {
@@ -543,13 +546,20 @@ func runOvnKube(ctx context.Context, runMode *ovnkubeRunMode, ovnClientset *util
 			// register ovnkube node specific prometheus metrics exported by the node
 			metrics.RegisterNodeMetrics(ctx.Done())
 
+			ovsClient, err = libovsdb.NewOVSClient(ctx.Done())
+			if err != nil {
+				nodeErr = fmt.Errorf("failed to initialize libovsdb vswitchd client: %w", err)
+				return
+			}
 			nodeControllerManager, err := controllermanager.NewNodeControllerManager(
 				ovnClientset,
 				watchFactory,
 				runMode.identity,
 				wg,
 				eventRecorder,
-				routemanager.NewController())
+				routemanager.NewController(),
+				ovsClient,
+			)
 			if err != nil {
 				nodeErr = fmt.Errorf("failed to create node network controller: %w", err)
 				return
@@ -575,9 +585,11 @@ func runOvnKube(ctx context.Context, runMode *ovnkubeRunMode, ovnClientset *util
 		metricsScrapeInterval := 30
 		defer cancel()
 
-		ovsClient, err := libovsdb.NewOVSClient(ctx.Done())
-		if err != nil {
-			return fmt.Errorf("failed to initialize libovsdb vswitchd client: %w", err)
+		if ovsClient == nil {
+			ovsClient, err = libovsdb.NewOVSClient(ctx.Done())
+			if err != nil {
+				return fmt.Errorf("failed to initialize libovsdb vswitchd client: %w", err)
+			}
 		}
 		if config.Metrics.ExportOVSMetrics {
 			metrics.RegisterOvsMetricsWithOvnMetrics(ovsClient, metricsScrapeInterval, ctx.Done())