Extract variant branches into a generic extension mechanism

cmd/main.go

@@ -43,6 +43,8 @@ import (
 	"github.com/tigera/operator/pkg/controller/options"
 	"github.com/tigera/operator/pkg/controller/utils"
 	"github.com/tigera/operator/pkg/dns"
+	"github.com/tigera/operator/pkg/enterprise"
+	eoptions "github.com/tigera/operator/pkg/enterprise/options"
 	"github.com/tigera/operator/pkg/imports/admission"
 	"github.com/tigera/operator/pkg/imports/crds"
 	"github.com/tigera/operator/pkg/render"
@@ -607,6 +609,14 @@ admission policy installation; once an Installation exists it is the authority o
 		os.Exit(1)
 	}
 
+	// Build the extensions for the variant we resolved above.
+	extensionRegistry := enterprise.New(variant, eoptions.Options{
+		MultiTenant: multiTenant,
+		Cloud:       isCloudBuild(),
+		ManageCRDs:  manageCRDs,
+		UseV3CRDs:   v3CRDs,
+	})
+
 	options := options.ControllerOptions{
 		DetectedProvider:  provider,
 		Variant:           variant,
@@ -621,6 +631,7 @@ admission policy installation; once an Installation exists it is the authority o
 		ESMigration:       elasticIsMigrating,
 		UseV3CRDs:         v3CRDs,
 		APIDiscovery:      apiDiscovery,
+		Extensions:        extensionRegistry,
 	}
 
 	// Before we start any controllers, make sure our options are valid.

pkg/common/validation/apiserver/validation.go

@@ -44,9 +44,9 @@ func validateContainerPorts(container corev1.Container) field.ErrorList {
 	ports := container.Ports
 	// Validate if the port name can be attributed to the container.
 	for _, port := range ports {
-		if (port.Name == render.APIServerPortName && container.Name != string(render.APIServerContainerName)) ||
-			(port.Name == render.QueryServerPortName && container.Name != string(render.TigeraAPIServerQueryServerContainerName)) ||
-			(port.Name == render.L7AdmissionControllerPortName && container.Name != string(render.L7AdmissionControllerContainerName)) {
+		if (port.Name == render.APIServerPortName && container.Name != render.APIServerContainerName) ||
+			(port.Name == render.QueryServerPortName && container.Name != render.TigeraAPIServerQueryServerContainerName) ||
+			(port.Name == render.L7AdmissionControllerPortName && container.Name != render.L7AdmissionControllerContainerName) {
 			msg := fmt.Sprintf("port name %s is not valid for container %s", port.Name, container.Name)
 			allErrs = append(allErrs, field.Invalid(fldPath, port.Name, msg))
 		}

pkg/common/validation/overrides_test.go

@@ -298,7 +298,7 @@ var _ = Describe("Test overrides validation (APIServerDeployment - Container.Por
 	It("should accept custom valid ContainerPorts", func() {
 		overrides.Spec.Template.Spec.Containers = []opv1.APIServerDeploymentContainer{
 			{
-				Name: string(render.APIServerContainerName),
+				Name: render.APIServerContainerName,
 				Ports: []opv1.APIServerDeploymentContainerPort{
 					{
 						Name:          render.APIServerPortName,
@@ -307,7 +307,7 @@ var _ = Describe("Test overrides validation (APIServerDeployment - Container.Por
 				},
 			},
 			{
-				Name: string(render.TigeraAPIServerQueryServerContainerName),
+				Name: render.TigeraAPIServerQueryServerContainerName,
 				Ports: []opv1.APIServerDeploymentContainerPort{
 					{
 						Name:          render.QueryServerPortName,
@@ -316,7 +316,7 @@ var _ = Describe("Test overrides validation (APIServerDeployment - Container.Por
 				},
 			},
 			{
-				Name: string(render.L7AdmissionControllerContainerName),
+				Name: render.L7AdmissionControllerContainerName,
 				Ports: []opv1.APIServerDeploymentContainerPort{
 					{
 						Name:          render.L7AdmissionControllerPortName,
@@ -351,7 +351,7 @@ var _ = Describe("Test overrides validation (APIServerDeployment - Container.Por
 		),
 		Entry("queryserver PortName specified in the wrong container",
 			opv1.APIServerDeploymentContainer{
-				Name: string(render.APIServerContainerName),
+				Name: render.APIServerContainerName,
 				Ports: []opv1.APIServerDeploymentContainerPort{
 					{
 						Name:          render.QueryServerPortName,
@@ -363,7 +363,7 @@ var _ = Describe("Test overrides validation (APIServerDeployment - Container.Por
 		),
 		Entry("l7admctrl PortName specified in the wrong container",
 			opv1.APIServerDeploymentContainer{
-				Name: string(render.APIServerContainerName),
+				Name: render.APIServerContainerName,
 				Ports: []opv1.APIServerDeploymentContainerPort{
 					{
 						Name:          render.L7AdmissionControllerPortName,