Backport MetalLB Operator interacts with CNO plus upstream fix

controllers/metallb_controller.go

@@ -174,7 +174,7 @@ func (r *MetalLBReconciler) syncMetalLBResources(ctx context.Context, config *me
 
 	bgpType := params.BGPType(config, r.EnvConfig)
 	if r.EnvConfig.MustDeployFRRK8sFromCNO && r.EnvConfig.IsOpenshift && (bgpType == metallbv1beta1.FRRK8sExternalMode) {
-		supportsFRRK8s, err := openshift.SupportsFRRK8s(ctx, r.Client)
+		supportsFRRK8s, err := openshift.SupportsFRRK8s(ctx, r.Client, r.EnvConfig)
 		if err != nil {
 			return err
 		}

go.mod

@@ -25,6 +25,7 @@ require (
 
 require (
 	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
+	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Microsoft/hcsshim v0.11.4 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect

go.sum

@@ -609,6 +609,8 @@ github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ
 github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
+github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
+github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
 github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
 github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=

manifests/stable/metallb-operator.clusterserviceversion.yaml

@@ -887,7 +887,7 @@ spec:
             template:
               metadata:
                 annotations:
-                    openshift.io/required-scc: restricted-v2 
+                    openshift.io/required-scc: restricted-v2
                 labels:
                   control-plane: controller-manager
               spec:
@@ -932,6 +932,12 @@ spec:
                         value: "9121"
                       - name: MEMBER_LIST_BIND_PORT
                         value: "9122"
+                      - name: FRRK8S_EXTERNAL_NAMESPACE
+                        value: "openshift-frr-k8s"
+                      - name: DEPLOY_FRRK8S_FROM_CNO
+                        value: "true"
+                      - name: CNO_MIN_FRRK8S_VERSION
+                        value: 4.18.0-0
                     image: quay.io/openshift/origin-metallb-operator:4.18
                     name: manager
                     ports:
@@ -978,7 +984,7 @@ spec:
                 annotations:
                   prometheus.io/port: "7472"
                   prometheus.io/scrape: "true"
-                  openshift.io/required-scc: restricted-v2 
+                  openshift.io/required-scc: restricted-v2
 
                 labels:
                   app: metallb

pkg/openshift/openshift.go

@@ -5,34 +5,35 @@ import (
 	"slices"
 
 	"github.com/Masterminds/semver/v3"
+	"github.com/metallb/metallb-operator/pkg/params"
 	openshiftconfigv1 "github.com/openshift/api/config/v1"
 	openshiftapiv1 "github.com/openshift/api/operator/v1"
 	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-func SupportsFRRK8s(ctx context.Context, cli client.Client) (bool, error) {
+func SupportsFRRK8s(ctx context.Context, cli client.Client, envConfig params.EnvConfig) (bool, error) {
 	cno := &openshiftconfigv1.ClusterOperator{}
 	err := cli.Get(ctx, types.NamespacedName{Name: "network"}, cno)
 	if err != nil {
 		return false, errors.Wrapf(err, "get openshift network operator failed")
 	}
-	supports, err := cnoSupportsFRRK8s(cno)
+	supports, err := cnoSupportsFRRK8s(cno, envConfig)
 	if err != nil {
 		return false, err
 	}
 	return supports, nil
 }
 
-func cnoSupportsFRRK8s(cno *openshiftconfigv1.ClusterOperator) (bool, error) {
+func cnoSupportsFRRK8s(cno *openshiftconfigv1.ClusterOperator, envConfig params.EnvConfig) (bool, error) {
 	for _, v := range cno.Status.Versions {
 		if v.Name == "operator" {
 			v, err := semver.NewVersion(v.Version)
 			if err != nil {
 				return false, errors.Wrapf(err, "failed to parse semver for network operator")
 			}
-			validVersion, _ := semver.NewVersion("4.17.0-0")
+			validVersion, _ := semver.NewVersion(envConfig.CNOMinFRRK8sVersion)
 			valid := !v.LessThan(validVersion)
 			return valid, nil
 		}

pkg/openshift/openshift_test.go

@@ -3,6 +3,7 @@ package openshift
 import (
 	"testing"
 
+	"github.com/metallb/metallb-operator/pkg/params"
 	openshiftconfigv1 "github.com/openshift/api/config/v1"
 )
 
@@ -103,7 +104,8 @@ func TestCnoSupportsFRRK8s(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			supports, err := cnoSupportsFRRK8s(test.cno)
+			envConfig := params.EnvConfig{CNOMinFRRK8sVersion: "4.17.0-0"}
+			supports, err := cnoSupportsFRRK8s(test.cno, envConfig)
 			if test.shouldErr && err == nil {
 				t.Fatalf("expected error, got nil")
 			}

pkg/params/params.go

@@ -7,6 +7,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/Masterminds/semver"
 	"github.com/metallb/metallb-operator/api/v1beta1"
 )
 
@@ -36,6 +37,7 @@ type EnvConfig struct {
 	FRRImage                   ImageInfo
 	FRRK8sImage                ImageInfo
 	KubeRBacImage              ImageInfo
+	CNOMinFRRK8sVersion        string
 	MLBindPort                 int
 	FRRMetricsPort             int
 	SecureFRRMetricsPort       int
@@ -133,6 +135,7 @@ func FromEnvironment(isOpenshift bool) (EnvConfig, error) {
 
 	// Ignoring the error, if not set we'll consume the image from the chart
 	res.FRRK8sImage, _ = imageFromEnv("FRRK8S_IMAGE")
+	res.CNOMinFRRK8sVersion = os.Getenv("CNO_MIN_FRRK8S_VERSION")
 
 	err = validate(res)
 	if err != nil {
@@ -152,6 +155,12 @@ func validate(config EnvConfig) error {
 	if config.SecureFRRMetricsPort != 0 && !config.DeployServiceMonitors {
 		return fmt.Errorf("secureFRRMetricsPort is available only if service monitors are enabled")
 	}
+	if config.CNOMinFRRK8sVersion != "" {
+		_, err := semver.NewVersion(config.CNOMinFRRK8sVersion)
+		if err != nil {
+			return fmt.Errorf("invalid cno min frrk8s supported version: %w", err)
+		}
+	}
 	return nil
 }