Merge pull request #1086 from jpodivin/removedefaults

Removing unused control plane default structure and funcs

Author: openshift-merge-bot[bot]

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"
@@ -928,16 +927,6 @@ func (instance *OpenStackControlPlane) InitConditions() {
 	instance.Status.Conditions.Init(&cl)
 }
 
-// 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
 func (ca CACertConfig) IsCustomIssuer() bool {
 	return ca.CustomIssuer != nil && *ca.CustomIssuer != ""

apis/core/v1beta1/openstackcontrolplane_webhook.go

@@ -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 {

apis/core/v1beta1/zz_generated.deepcopy.go

@@ -253,7 +253,6 @@ func main() {
 	dataplanev1.SetupDefaults()
 
 	// Defaults for anything else that was not covered by OpenStackClient nor service operator defaults
-	corev1.SetupDefaults()
 	corev1.SetupVersionDefaults()
 
 	// Webhooks

main.go

@@ -328,7 +328,6 @@ var _ = BeforeSuite(func() {
 	core_ctrl.SetupVersionDefaults()
 	openstack.SetupServiceOperatorDefaults()
 	openstackclientv1.SetupDefaults()
-	corev1.SetupDefaults()
 	corev1.SetupVersionDefaults()
 
 	err = (&client_ctrl.OpenStackClientReconciler{