Merge remote-tracking branch 'upstream/master' into sync-20240801

Makefile

@@ -27,7 +27,8 @@ WEBHOOK_IMAGE_TAG?=$(IMAGE_REPO)/$(APP_NAME)-webhook:latest
 MAIN_PKG=cmd/manager/main.go
 export NAMESPACE?=openshift-sriov-network-operator
 export WATCH_NAMESPACE?=openshift-sriov-network-operator
-export GOFLAGS+=-mod=vendor
+export HOME?=$(PWD)
+export GOPATH?=$(shell go env GOPATH)
 export GO111MODULE=on
 PKGS=$(shell go list ./... | grep -v -E '/vendor/|/test|/examples')
 TESTPKGS?=./...
@@ -168,12 +169,16 @@ GOMOCK = $(shell pwd)/bin/mockgen
 gomock:
 	$(call go-install-tool,$(GOMOCK),github.com/golang/mock/[email protected])
 
+GINKGO = $(BIN_DIR)/ginkgo
+ginkgo:
+	$(call go-install-tool,$(GINKGO),github.com/onsi/ginkgo/v2/ginkgo)
+
 # go-install-tool will 'go install' any package $2 and install it to $1.
 define go-install-tool
 @[ -f $(1) ] || { \
 set -e ;\
 echo "Downloading $(2)" ;\
-GOBIN=$(BIN_DIR) go install -mod=mod $(2) ;\
+GOBIN=$(BIN_DIR) go install $(2) ;\
 }
 endef
 
@@ -199,26 +204,26 @@ deploy-setup-k8s: export OPERATOR_EXEC=kubectl
 deploy-setup-k8s: export CLUSTER_TYPE=kubernetes
 deploy-setup-k8s: deploy-setup
 
-test-e2e-conformance:
+test-e2e-conformance: ginkgo
 	SUITE=./test/conformance ./hack/run-e2e-conformance.sh
 
-test-e2e-conformance-virtual-k8s-cluster-ci:
+test-e2e-conformance-virtual-k8s-cluster-ci: ginkgo
 	./hack/run-e2e-conformance-virtual-cluster.sh
 
-test-e2e-conformance-virtual-k8s-cluster:
+test-e2e-conformance-virtual-k8s-cluster: ginkgo
 	SKIP_DELETE=TRUE ./hack/run-e2e-conformance-virtual-cluster.sh
 
-test-e2e-conformance-virtual-ocp-cluster-ci:
+test-e2e-conformance-virtual-ocp-cluster-ci: ginkgo
 	./hack/run-e2e-conformance-virtual-ocp.sh
 
-test-e2e-conformance-virtual-ocp-cluster:
+test-e2e-conformance-virtual-ocp-cluster: ginkgo
 	SKIP_DELETE=TRUE ./hack/run-e2e-conformance-virtual-ocp.sh
 
 redeploy-operator-virtual-cluster:
 	./hack/virtual-cluster-redeploy.sh
 
-test-e2e-validation-only:
-	SUITE=./test/validation ./hack/run-e2e-conformance.sh
+test-e2e-validation-only: ginkgo
+	SUITE=./test/validation ./hack/run-e2e-conformance.sh	
 
 test-e2e: generate manifests skopeo envtest
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir=/tmp -p path)"; source hack/env.sh; HOME="$(shell pwd)" go test ./test/e2e/... -timeout 60m -coverprofile cover.out -v
@@ -255,11 +260,10 @@ undeploy-k8s: export OPERATOR_EXEC=kubectl
 undeploy-k8s: undeploy
 
 deps-update:
-	go mod tidy && \
-	go mod vendor
+	go mod tidy
 
 check-deps: deps-update
-	@set +e; git diff --quiet HEAD go.sum go.mod vendor; \
+	@set +e; git diff --quiet HEAD go.sum go.mod; \
 	if [ $$? -eq 1 ]; \
 	then echo -e "\ngo modules are out of date. Please commit after running 'make deps-update' command\n"; \
 	exit 1; fi

api/v1/helper.go

@@ -6,7 +6,9 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"reflect"
 	"regexp"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -397,8 +399,7 @@ func UniqueAppend(inSlice []string, strings ...string) []string {
 // Apply policy to SriovNetworkNodeState CR
 func (p *SriovNetworkNodePolicy) Apply(state *SriovNetworkNodeState, equalPriority bool) error {
 	s := p.Spec.NicSelector
-	if s.Vendor == "" && s.DeviceID == "" && len(s.RootDevices) == 0 && len(s.PfNames) == 0 &&
-		len(s.NetFilter) == 0 {
+	if s.IsEmpty() {
 		// Empty NicSelector match none
 		return nil
 	}
@@ -438,6 +439,66 @@ func (p *SriovNetworkNodePolicy) Apply(state *SriovNetworkNodeState, equalPriori
 	return nil
 }
 
+// ApplyBridgeConfig applies bridge configuration from the policy to the provided state
+func (p *SriovNetworkNodePolicy) ApplyBridgeConfig(state *SriovNetworkNodeState) error {
+	if p.Spec.NicSelector.IsEmpty() {
+		// Empty NicSelector match none
+		return nil
+	}
+	// sanity check the policy
+	if !p.Spec.Bridge.IsEmpty() {
+		if p.Spec.EswitchMode != ESwithModeSwitchDev {
+			return fmt.Errorf("eSwitchMode must be switchdev to use software bridge management")
+		}
+		if p.Spec.LinkType != "" && !strings.EqualFold(p.Spec.LinkType, consts.LinkTypeETH) {
+			return fmt.Errorf("linkType must be eth or ETH to use software bridge management")
+		}
+		if p.Spec.ExternallyManaged {
+			return fmt.Errorf("software bridge management can't be used when link is externally managed")
+		}
+	}
+	for _, iface := range state.Status.Interfaces {
+		if p.Spec.NicSelector.Selected(&iface) {
+			if p.Spec.Bridge.OVS == nil {
+				// The policy has no OVS bridge config, this means that the node's state should have no managed OVS bridges for the interfaces that match the policy.
+				// Currently PF to OVS bridge mapping is always 1 to 1 (bonding is not supported at the moment), meaning we can remove the OVS bridge
+				// config from the node's state if it has the interface (that matches "empty-bridge" policy) in the uplink section.
+				state.Spec.Bridges.OVS = slices.DeleteFunc(state.Spec.Bridges.OVS, func(br OVSConfigExt) bool {
+					return slices.ContainsFunc(br.Uplinks, func(uplink OVSUplinkConfigExt) bool {
+						return uplink.PciAddress == iface.PciAddress
+					})
+				})
+				if len(state.Spec.Bridges.OVS) == 0 {
+					state.Spec.Bridges.OVS = nil
+				}
+				continue
+			}
+			ovsBridge := OVSConfigExt{
+				Name:   GenerateBridgeName(&iface),
+				Bridge: p.Spec.Bridge.OVS.Bridge,
+				Uplinks: []OVSUplinkConfigExt{{
+					PciAddress: iface.PciAddress,
+					Name:       iface.Name,
+					Interface:  p.Spec.Bridge.OVS.Uplink.Interface,
+				}},
+			}
+			log.Info("Update bridge for interface", "name", iface.Name, "bridge", ovsBridge.Name)
+
+			// We need to keep slices with bridges ordered to avoid unnecessary updates in the K8S API.
+			// Use binary search to insert (or update) the bridge config to the right place in the slice to keep it sorted.
+			pos, exist := slices.BinarySearchFunc(state.Spec.Bridges.OVS, ovsBridge, func(x, y OVSConfigExt) int {
+				return strings.Compare(x.Name, y.Name)
+			})
+			if exist {
+				state.Spec.Bridges.OVS[pos] = ovsBridge
+			} else {
+				state.Spec.Bridges.OVS = slices.Insert(state.Spec.Bridges.OVS, pos, ovsBridge)
+			}
+		}
+	}
+	return nil
+}
+
 // mergeConfigs merges configs from multiple polices where the last one has the
 // highest priority. This merge is dependent on: 1. SR-IOV partition is
 // configured with the #-notation in pfName, 2. The VF groups are
@@ -568,6 +629,15 @@ func ParseVfRange(device string) (rootDeviceName string, rngSt, rngEnd int, err
 	return
 }
 
+// IsEmpty returns true if nicSelector is empty
+func (selector *SriovNetworkNicSelector) IsEmpty() bool {
+	return selector.Vendor == "" &&
+		selector.DeviceID == "" &&
+		len(selector.RootDevices) == 0 &&
+		len(selector.PfNames) == 0 &&
+		len(selector.NetFilter) == 0
+}
+
 func (selector *SriovNetworkNicSelector) Selected(iface *InterfaceExt) bool {
 	if selector.Vendor != "" && selector.Vendor != iface.Vendor {
 		return false
@@ -923,3 +993,14 @@ func (s *SriovNetworkPoolConfig) MaxUnavailable(numOfNodes int) (int, error) {
 
 	return maxunavail, nil
 }
+
+// GenerateBridgeName generate predictable name for the software bridge
+// current format is: br-0000_00_03.0
+func GenerateBridgeName(iface *InterfaceExt) string {
+	return fmt.Sprintf("br-%s", strings.ReplaceAll(iface.PciAddress, ":", "_"))
+}
+
+// NeedToUpdateBridges returns true if bridge for the host requires update
+func NeedToUpdateBridges(bridgeSpec, bridgeStatus *Bridges) bool {
+	return !reflect.DeepEqual(bridgeSpec, bridgeStatus)
+}