Merge pull request #294 from dulek/remove-kuryr

OSASINFRA-3289: OpenStack: Remove Kuryr bits

Author: openshift-merge-bot[bot]

pkg/cloud/openstack/openstack.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/asaskevich/govalidator"
 	configv1 "github.com/openshift/api/config/v1"
-	operatorv1 "github.com/openshift/api/operator/v1"
 	ini "gopkg.in/ini.v1"
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/klog/v2"
@@ -62,17 +61,11 @@ func getTemplateValues(images *imagesReference, operatorConfig config.OperatorCo
 
 // createLoadBalancerSection creates a loadBalancer section populated with
 // OpenShift defaults. It returns any error that happens.
-func createLoadBalancerSection(cfg *ini.File, network *configv1.Network) error {
+func createLoadBalancerSection(cfg *ini.File) error {
 	loadBalancer, err := cfg.NewSection("LoadBalancer")
 	if err != nil {
 		return fmt.Errorf("failed to modify the provided configuration: %w", err)
 	}
-	if network.Spec.NetworkType == string(operatorv1.NetworkTypeKuryr) {
-		_, err = loadBalancer.NewKey("enabled", "false")
-		if err != nil {
-			return fmt.Errorf("failed to modify the provided configuration: %w", err)
-		}
-	}
 	// Disable shared services by default as a feature that's potentially dangerous if misued.
 	_, err = loadBalancer.NewKey("max-shared-lb", "1")
 	if err != nil {
@@ -89,21 +82,9 @@ func createLoadBalancerSection(cfg *ini.File, network *configv1.Network) error {
 
 // updateLoadBalancerSection updates the loadBalancer section with OpenShift
 // defaults. It returns any error that happens.
-func updateLoadBalancerSection(loadBalancer *ini.Section, network *configv1.Network) error {
+func updateLoadBalancerSection(loadBalancer *ini.Section) error {
 	loadBalancer.DeleteKey("use-octavia") // use-octavia is no longer used, let's make sure it's gone from config
 
-	if network.Spec.NetworkType == string(operatorv1.NetworkTypeKuryr) {
-		enabledKey, err := loadBalancer.GetKey("enabled")
-		if err != nil {
-			_, err = loadBalancer.NewKey("enabled", "false")
-			if err != nil {
-				return fmt.Errorf("failed to modify the provided configuration: %w", err)
-			}
-		} else {
-			enabledKey.SetValue("false")
-		}
-	}
-
 	// Disable shared LBs by default if not overriden already
 	_, err := loadBalancer.GetKey("max-shared-lb")
 	if err != nil {
@@ -214,11 +195,11 @@ func CloudConfigTransformer(source string, infra *configv1.Infrastructure, netwo
 
 	loadBalancer, _ := cfg.GetSection("LoadBalancer")
 	if loadBalancer == nil {
-		if err = createLoadBalancerSection(cfg, network); err != nil {
+		if err = createLoadBalancerSection(cfg); err != nil {
 			return "", fmt.Errorf("could not create load balancer section: %w", err)
 		}
 	} else {
-		if err = updateLoadBalancerSection(loadBalancer, network); err != nil {
+		if err = updateLoadBalancerSection(loadBalancer); err != nil {
 			return "", fmt.Errorf("could not update load balancer section: %w", err)
 		}
 	}

pkg/cloud/openstack/openstack_test.go

@@ -159,12 +159,12 @@ secret-namespace = kube-system
 ignore-volume-az = true
 
 [LoadBalancer]
-manage-security-groups = true
 max-shared-lb          = 1
+manage-security-groups = true
 use-octavia            = false
 `,
 			infra:   makeInfrastructureResource(configv1.OpenStackPlatformType),
-			network: makeNetworkResource(operatorv1.NetworkTypeKuryr),
+			network: makeNetworkResource(operatorv1.NetworkTypeOVNKubernetes),
 		},
 	}
 
@@ -184,17 +184,6 @@ cloud       = openstack
 [LoadBalancer]
 max-shared-lb          = 1
 manage-security-groups = true`
-				if tc.network.Status.NetworkType == string(operatorv1.NetworkTypeKuryr) {
-					expected = `[Global]
-use-clouds  = true
-clouds-file = /etc/openstack/secret/clouds.yaml
-cloud       = openstack
-
-[LoadBalancer]
-manage-security-groups = true
-max-shared-lb          = 1
-enabled                = false`
-				}
 				actual := strings.TrimSpace(actual)
 				g.Expect(actual).Should(Equal(expected))
 			}