Removing unused control plane default structure and funcs

Signed-off-by: Jiri Podivin <[email protected]>

apis/core/v1beta1/openstackcontrolplane_types.go

@@ -34,7 +34,6 @@ import (
 	"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"
 	manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1"
 	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
@@ -931,11 +930,6 @@ func (instance *OpenStackControlPlane) InitConditions() {
 // SetupDefaults - initializes any CRD field defaults based on environment variables (the defaulting mechanism itself is implemented via webhooks)
 func SetupDefaults() {
 	// Acquire environmental defaults and initialize OpenStackControlPlane defaults with them
-	openstackControlPlaneDefaults := OpenStackControlPlaneDefaults{
-		RabbitMqImageURL: util.GetEnvVar("RELATED_IMAGE_RABBITMQ_IMAGE_URL_DEFAULT", RabbitMqContainerImage),
-	}
-
-	SetupOpenStackControlPlaneDefaults(openstackControlPlaneDefaults)
 }
 
 // IsCustomIssuer - returns true if CustomIssuer is provided and not empty string

apis/core/v1beta1/openstackcontrolplane_webhook.go

@@ -46,8 +46,8 @@ import (
 	heatv1 "github.com/openstack-k8s-operators/heat-operator/api/v1beta1"
 	horizonv1 "github.com/openstack-k8s-operators/horizon-operator/api/v1beta1"
 	memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1"
-	redisv1 "github.com/openstack-k8s-operators/infra-operator/apis/redis/v1beta1"
 	networkv1 "github.com/openstack-k8s-operators/infra-operator/apis/network/v1beta1"
+	redisv1 "github.com/openstack-k8s-operators/infra-operator/apis/redis/v1beta1"
 	ironicv1 "github.com/openstack-k8s-operators/ironic-operator/api/v1beta1"
 	manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1"
 	neutronv1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1"
@@ -59,22 +59,9 @@ import (
 
 var ctlplaneWebhookClient client.Client
 
-// OpenStackControlPlaneDefaults -
-type OpenStackControlPlaneDefaults struct {
-	RabbitMqImageURL string
-}
-
-var openstackControlPlaneDefaults OpenStackControlPlaneDefaults
-
 // log is for logging in this package.
 var openstackcontrolplanelog = logf.Log.WithName("openstackcontrolplane-resource")
 
-// SetupOpenStackControlPlaneDefaults - initialize OpenStackControlPlane spec defaults for use with internal webhooks
-func SetupOpenStackControlPlaneDefaults(defaults OpenStackControlPlaneDefaults) {
-	openstackControlPlaneDefaults = defaults
-	openstackcontrolplanelog.Info("OpenStackControlPlane defaults initialized", "defaults", defaults)
-}
-
 // SetupWebhookWithManager sets up the Webhook with the Manager.
 func (r *OpenStackControlPlane) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	if ctlplaneWebhookClient == nil {
@@ -888,17 +875,17 @@ func (r *OpenStackControlPlane) DefaultServices() {
 	}
 
 	// Redis
-        if r.Spec.Redis.Enabled || r.Spec.Redis.Templates != nil {
-                if r.Spec.Redis.Templates == nil {
-                        r.Spec.Redis.Templates = ptr.To(map[string]redisv1.RedisSpecCore{})
-                }
-
-                for key, template := range *r.Spec.Redis.Templates {
-                        template.Default()
-                        // By-value copy, need to update
-                        (*r.Spec.Redis.Templates)[key] = template
-                }
-        }
+	if r.Spec.Redis.Enabled || r.Spec.Redis.Templates != nil {
+		if r.Spec.Redis.Templates == nil {
+			r.Spec.Redis.Templates = ptr.To(map[string]redisv1.RedisSpecCore{})
+		}
+
+		for key, template := range *r.Spec.Redis.Templates {
+			template.Default()
+			// By-value copy, need to update
+			(*r.Spec.Redis.Templates)[key] = template
+		}
+	}
 
 }