Cleanup not required tls.Enabled() method

stuggi · stuggi · commit 8dd831b33eba · 2024-03-11T17:45:30.000+01:00
With the rework of the tls struct the method is not really useful.
diff --git a/apis/core/v1beta1/openstackcontrolplane_types.go b/apis/core/v1beta1/openstackcontrolplane_types.go
@@ -30,7 +30,6 @@ import (
 	keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/route"
-	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
 	"github.com/openstack-k8s-operators/lib-common/modules/storage"
@@ -822,17 +821,3 @@ func SetupDefaults() {
 
 	SetupOpenStackControlPlaneDefaults(openstackControlPlaneDefaults)
 }
-
-// Enabled - returns status of tls configuration for the passed in endpoint type
-func (t *TLSSection) Enabled(endpt service.Endpoint) bool {
-	if t != nil {
-		switch endpt {
-		case service.EndpointPublic:
-			return t.Ingress.Enabled
-
-		case service.EndpointInternal:
-			return t.PodLevel.Enabled
-		}
-	}
-	return false
-}
diff --git a/pkg/openstack/barbican.go b/pkg/openstack/barbican.go
@@ -54,7 +54,7 @@ func ReconcileBarbican(ctx context.Context, instance *corev1beta1.OpenStackContr
 	}
 
 	// preserve any previously set TLS certs, set CA cert
-	if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+	if instance.Spec.TLS.PodLevel.Enabled {
 		instance.Spec.Barbican.Template.BarbicanAPI.TLS = barbican.Spec.BarbicanAPI.TLS
 	}
 	instance.Spec.Barbican.Template.BarbicanAPI.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName
diff --git a/pkg/openstack/cinder.go b/pkg/openstack/cinder.go
@@ -56,7 +56,7 @@ func ReconcileCinder(ctx context.Context, instance *corev1beta1.OpenStackControl
 	}
 
 	// preserve any previously set TLS certs,set CA cert
-	if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+	if instance.Spec.TLS.PodLevel.Enabled {
 		instance.Spec.Cinder.Template.CinderAPI.TLS = cinder.Spec.CinderAPI.TLS
 	}
 	instance.Spec.Cinder.Template.CinderAPI.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName
diff --git a/pkg/openstack/glance.go b/pkg/openstack/glance.go
@@ -68,7 +68,7 @@ func ReconcileGlance(ctx context.Context, instance *corev1beta1.OpenStackControl
 		}
 
 		// preserve any previously set TLS certs,set CA cert
-		if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+		if instance.Spec.TLS.PodLevel.Enabled {
 			glanceAPI.TLS.API = glance.Spec.GlanceAPIs[name].TLS.API
 		}
 		glanceAPI.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName
diff --git a/pkg/openstack/heat.go b/pkg/openstack/heat.go
@@ -67,7 +67,7 @@ func ReconcileHeat(ctx context.Context, instance *corev1beta1.OpenStackControlPl
 	}
 
 	// preserve any previously set TLS certs,set CA cert
-	if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+	if instance.Spec.TLS.PodLevel.Enabled {
 		instance.Spec.Heat.Template.HeatAPI.TLS = heat.Spec.HeatAPI.TLS
 		instance.Spec.Heat.Template.HeatCfnAPI.TLS = heat.Spec.HeatCfnAPI.TLS
 	}
diff --git a/pkg/openstack/horizon.go b/pkg/openstack/horizon.go
@@ -58,7 +58,7 @@ func ReconcileHorizon(ctx context.Context, instance *corev1beta1.OpenStackContro
 	}
 
 	// preserve any previously set TLS certs, set CA cert
-	if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+	if instance.Spec.TLS.PodLevel.Enabled {
 		instance.Spec.Horizon.Template.TLS = horizon.Spec.TLS
 	}
 	instance.Spec.Horizon.Template.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName
diff --git a/pkg/openstack/ironic.go b/pkg/openstack/ironic.go
@@ -64,7 +64,7 @@ func ReconcileIronic(ctx context.Context, instance *corev1beta1.OpenStackControl
 	}
 
 	// preserve any previously set TLS certs,set CA cert
-	if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+	if instance.Spec.TLS.PodLevel.Enabled {
 		instance.Spec.Ironic.Template.IronicAPI.TLS = ironic.Spec.IronicAPI.TLS
 		instance.Spec.Ironic.Template.IronicInspector.TLS = ironic.Spec.IronicInspector.TLS
 	}
diff --git a/pkg/openstack/keystone.go b/pkg/openstack/keystone.go
@@ -57,7 +57,7 @@ func ReconcileKeystoneAPI(ctx context.Context, instance *corev1beta1.OpenStackCo
 	}
 
 	// preserve any previously set TLS certs,set CA cert
-	if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+	if instance.Spec.TLS.PodLevel.Enabled {
 		instance.Spec.Keystone.Template.TLS = keystoneAPI.Spec.TLS
 	}
 	instance.Spec.Keystone.Template.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName
diff --git a/pkg/openstack/manila.go b/pkg/openstack/manila.go
@@ -56,7 +56,7 @@ func ReconcileManila(ctx context.Context, instance *corev1beta1.OpenStackControl
 	}
 
 	// preserve any previously set TLS certs, set CA cert
-	if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+	if instance.Spec.TLS.PodLevel.Enabled {
 		instance.Spec.Manila.Template.ManilaAPI.TLS = manila.Spec.ManilaAPI.TLS
 	}
 	instance.Spec.Manila.Template.ManilaAPI.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName
diff --git a/pkg/openstack/memcached.go b/pkg/openstack/memcached.go
@@ -158,7 +158,7 @@ func reconcileMemcached(
 	Log.Info("Reconciling Memcached", "Memcached.Namespace", instance.Namespace, "Memcached.Name", name)
 
 	tlsCert := ""
-	if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+	if instance.Spec.TLS.PodLevel.Enabled {
 		certRequest := certmanager.CertificateRequest{
 			IssuerName: tls.DefaultCAPrefix + string(service.EndpointInternal),
 			CertName:   fmt.Sprintf("%s-svc", memcached.Name),
diff --git a/pkg/openstack/neutron.go b/pkg/openstack/neutron.go
@@ -59,7 +59,7 @@ func ReconcileNeutron(ctx context.Context, instance *corev1beta1.OpenStackContro
 	}
 
 	// preserve any previously set TLS certs,set CA cert
-	if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+	if instance.Spec.TLS.PodLevel.Enabled {
 		instance.Spec.Neutron.Template.TLS = neutronAPI.Spec.TLS
 
 		serviceName := "neutron"
diff --git a/pkg/openstack/nova.go b/pkg/openstack/nova.go
@@ -76,7 +76,7 @@ func ReconcileNova(ctx context.Context, instance *corev1beta1.OpenStackControlPl
 				nova.Name+"-api")
 	}
 	// preserve any previously set TLS certs,set CA cert
-	if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+	if instance.Spec.TLS.PodLevel.Enabled {
 		instance.Spec.Nova.Template.APIServiceTemplate.TLS = nova.Spec.APIServiceTemplate.TLS
 	}
 	instance.Spec.Nova.Template.APIServiceTemplate.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName
@@ -89,7 +89,7 @@ func ReconcileNova(ctx context.Context, instance *corev1beta1.OpenStackControlPl
 		instance.Spec.Nova.Template.MetadataServiceTemplate.Override.Service.AddLabel(centralMetadataLabelMap(nova.Name))
 
 		// preserve any previously set TLS certs,set CA cert
-		if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+		if instance.Spec.TLS.PodLevel.Enabled {
 			instance.Spec.Nova.Template.MetadataServiceTemplate.TLS = nova.Spec.MetadataServiceTemplate.TLS
 		}
 		instance.Spec.Nova.Template.MetadataServiceTemplate.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName
@@ -104,7 +104,7 @@ func ReconcileNova(ctx context.Context, instance *corev1beta1.OpenStackControlPl
 			cellTemplate.NoVNCProxyServiceTemplate.Override.Service.AddLabel(getNoVNCProxyLabelMap(nova.Name, cellName))
 
 			// preserve any previously set TLS certs,set CA cert
-			if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+			if instance.Spec.TLS.PodLevel.Enabled {
 				cellTemplate.NoVNCProxyServiceTemplate.TLS = nova.Spec.CellTemplates[cellName].NoVNCProxyServiceTemplate.TLS
 			}
 			cellTemplate.NoVNCProxyServiceTemplate.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName
@@ -118,7 +118,7 @@ func ReconcileNova(ctx context.Context, instance *corev1beta1.OpenStackControlPl
 			cellTemplate.MetadataServiceTemplate.Override.Service.AddLabel(cellMetadataLabelMap(nova.Name, cellName))
 
 			// preserve any previously set TLS certs,set CA cert
-			if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+			if instance.Spec.TLS.PodLevel.Enabled {
 				cellTemplate.MetadataServiceTemplate.TLS = nova.Spec.CellTemplates[cellName].MetadataServiceTemplate.TLS
 			}
 			cellTemplate.MetadataServiceTemplate.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName
@@ -166,7 +166,7 @@ func ReconcileNova(ctx context.Context, instance *corev1beta1.OpenStackControlPl
 	}
 
 	// create certificate for central Metadata agent if internal TLS and Metadata are enabled
-	if instance.Spec.TLS.Enabled(service.EndpointInternal) &&
+	if instance.Spec.TLS.PodLevel.Enabled &&
 		metadataEnabled(instance.Spec.Nova.Template.MetadataServiceTemplate) {
 		certScrt, ctrlResult, err := certmanager.EnsureCertForServiceWithSelector(
 			ctx,
@@ -187,7 +187,7 @@ func ReconcileNova(ctx context.Context, instance *corev1beta1.OpenStackControlPl
 	// cell Metadata and NoVNCProxy
 	for cellName, cellTemplate := range instance.Spec.Nova.Template.CellTemplates {
 		// create certificate for Metadata agend if internal TLS and Metadata per cell is enabled
-		if instance.Spec.TLS.Enabled(service.EndpointInternal) &&
+		if instance.Spec.TLS.PodLevel.Enabled &&
 			metadataEnabled(cellTemplate.MetadataServiceTemplate) {
 
 			certScrt, ctrlResult, err := certmanager.EnsureCertForServiceWithSelector(
diff --git a/pkg/openstack/ovn.go b/pkg/openstack/ovn.go
@@ -7,7 +7,6 @@ import (
 	"github.com/openstack-k8s-operators/lib-common/modules/certmanager"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/helper"
-	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
@@ -87,7 +86,7 @@ func ReconcileOVNDbClusters(ctx context.Context, instance *corev1beta1.OpenStack
 				return false, err
 			}
 		}
-		if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+		if instance.Spec.TLS.PodLevel.Enabled {
 			dbcluster.TLS = OVNDBCluster.Spec.TLS
 		}
 		dbcluster.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName
@@ -121,7 +120,7 @@ func ReconcileOVNDbClusters(ctx context.Context, instance *corev1beta1.OpenStack
 				return false, nil
 			}
 
-			if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+			if instance.Spec.TLS.PodLevel.Enabled {
 				dbcluster.TLS.SecretName = &certSecret.Name
 			}
 		}
@@ -181,7 +180,7 @@ func ReconcileOVNNorthd(ctx context.Context, instance *corev1beta1.OpenStackCont
 			return false, err
 		}
 	}
-	if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+	if instance.Spec.TLS.PodLevel.Enabled {
 		ovnNorthdSpec.TLS = OVNNorthd.Spec.TLS
 
 		serviceName := ovnv1.ServiceNameOvnNorthd
@@ -272,7 +271,7 @@ func ReconcileOVNController(ctx context.Context, instance *corev1beta1.OpenStack
 			return false, err
 		}
 	}
-	if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+	if instance.Spec.TLS.PodLevel.Enabled {
 		ovnControllerSpec.TLS = OVNController.Spec.TLS
 
 		serviceName := ovnv1.ServiceNameOvnController
diff --git a/pkg/openstack/placement.go b/pkg/openstack/placement.go
@@ -55,7 +55,7 @@ func ReconcilePlacementAPI(ctx context.Context, instance *corev1beta1.OpenStackC
 	}
 
 	// set CA cert and preserve any previously set TLS certs
-	if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+	if instance.Spec.TLS.PodLevel.Enabled {
 		instance.Spec.Placement.Template.TLS = placementAPI.Spec.TLS
 	}
 	instance.Spec.Placement.Template.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName
diff --git a/pkg/openstack/rabbitmq.go b/pkg/openstack/rabbitmq.go
@@ -175,7 +175,7 @@ func reconcileRabbitMQ(
 	hostname := fmt.Sprintf("%s.%s.svc", name, instance.Namespace)
 	tlsCert := ""
 
-	if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+	if instance.Spec.TLS.PodLevel.Enabled {
 		certRequest := certmanager.CertificateRequest{
 			IssuerName: tls.DefaultCAPrefix + string(service.EndpointInternal),
 			CertName:   fmt.Sprintf("%s-svc", rabbitmq.Name),
diff --git a/pkg/openstack/swift.go b/pkg/openstack/swift.go
@@ -57,7 +57,7 @@ func ReconcileSwift(ctx context.Context, instance *corev1beta1.OpenStackControlP
 	}
 
 	// preserve any previously set TLS certs,set CA cert
-	if instance.Spec.TLS.Enabled(service.EndpointInternal) {
+	if instance.Spec.TLS.PodLevel.Enabled {
 		instance.Spec.Swift.Template.SwiftProxy.TLS = swift.Spec.SwiftProxy.TLS
 	}
 	instance.Spec.Swift.Template.SwiftProxy.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func ReconcileBarbican(ctx context.Context, instance *corev1beta1.OpenStackContr`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`// preserve any previously set TLS certs, set CA cert`
`57`		`- if instance.Spec.TLS.Enabled(service.EndpointInternal) {`
	`57`	`+ if instance.Spec.TLS.PodLevel.Enabled {`
`58`	`58`	`instance.Spec.Barbican.Template.BarbicanAPI.TLS = barbican.Spec.BarbicanAPI.TLS`
`59`	`59`	`}`
`60`	`60`	`instance.Spec.Barbican.Template.BarbicanAPI.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func ReconcileCinder(ctx context.Context, instance *corev1beta1.OpenStackControl`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`// preserve any previously set TLS certs,set CA cert`
`59`		`- if instance.Spec.TLS.Enabled(service.EndpointInternal) {`
	`59`	`+ if instance.Spec.TLS.PodLevel.Enabled {`
`60`	`60`	`instance.Spec.Cinder.Template.CinderAPI.TLS = cinder.Spec.CinderAPI.TLS`
`61`	`61`	`}`
`62`	`62`	`instance.Spec.Cinder.Template.CinderAPI.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ func ReconcileGlance(ctx context.Context, instance *corev1beta1.OpenStackControl`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`// preserve any previously set TLS certs,set CA cert`
`71`		`- if instance.Spec.TLS.Enabled(service.EndpointInternal) {`
	`71`	`+ if instance.Spec.TLS.PodLevel.Enabled {`
`72`	`72`	`glanceAPI.TLS.API = glance.Spec.GlanceAPIs[name].TLS.API`
`73`	`73`	`}`
`74`	`74`	`glanceAPI.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func ReconcileHeat(ctx context.Context, instance *corev1beta1.OpenStackControlPl`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`// preserve any previously set TLS certs,set CA cert`
`70`		`- if instance.Spec.TLS.Enabled(service.EndpointInternal) {`
	`70`	`+ if instance.Spec.TLS.PodLevel.Enabled {`
`71`	`71`	`instance.Spec.Heat.Template.HeatAPI.TLS = heat.Spec.HeatAPI.TLS`
`72`	`72`	`instance.Spec.Heat.Template.HeatCfnAPI.TLS = heat.Spec.HeatCfnAPI.TLS`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func ReconcileHorizon(ctx context.Context, instance *corev1beta1.OpenStackContro`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`// preserve any previously set TLS certs, set CA cert`
`61`		`- if instance.Spec.TLS.Enabled(service.EndpointInternal) {`
	`61`	`+ if instance.Spec.TLS.PodLevel.Enabled {`
`62`	`62`	`instance.Spec.Horizon.Template.TLS = horizon.Spec.TLS`
`63`	`63`	`}`
`64`	`64`	`instance.Spec.Horizon.Template.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func ReconcileIronic(ctx context.Context, instance *corev1beta1.OpenStackControl`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`// preserve any previously set TLS certs,set CA cert`
`67`		`- if instance.Spec.TLS.Enabled(service.EndpointInternal) {`
	`67`	`+ if instance.Spec.TLS.PodLevel.Enabled {`
`68`	`68`	`instance.Spec.Ironic.Template.IronicAPI.TLS = ironic.Spec.IronicAPI.TLS`
`69`	`69`	`instance.Spec.Ironic.Template.IronicInspector.TLS = ironic.Spec.IronicInspector.TLS`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func ReconcileKeystoneAPI(ctx context.Context, instance *corev1beta1.OpenStackCo`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`// preserve any previously set TLS certs,set CA cert`
`60`		`- if instance.Spec.TLS.Enabled(service.EndpointInternal) {`
	`60`	`+ if instance.Spec.TLS.PodLevel.Enabled {`
`61`	`61`	`instance.Spec.Keystone.Template.TLS = keystoneAPI.Spec.TLS`
`62`	`62`	`}`
`63`	`63`	`instance.Spec.Keystone.Template.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func ReconcileManila(ctx context.Context, instance *corev1beta1.OpenStackControl`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`// preserve any previously set TLS certs, set CA cert`
`59`		`- if instance.Spec.TLS.Enabled(service.EndpointInternal) {`
	`59`	`+ if instance.Spec.TLS.PodLevel.Enabled {`
`60`	`60`	`instance.Spec.Manila.Template.ManilaAPI.TLS = manila.Spec.ManilaAPI.TLS`
`61`	`61`	`}`
`62`	`62`	`instance.Spec.Manila.Template.ManilaAPI.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName`