Merge pull request openstack-k8s-operators#308 from hjensas/ironic-de…

…faulting Move ironic template defaulting to the webhook
ASBishop · May 15, 2023 · 8aff954 · 8aff954
2 parents 4ebfb36 + f40baf2
commit 8aff954
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/apis/core/v1beta1/openstackcontrolplane_webhook.go b/apis/core/v1beta1/openstackcontrolplane_webhook.go
@@ -232,6 +232,18 @@ func (r *OpenStackControlPlane) DefaultServices() {
 
 	// Ironic
 	if r.Spec.Ironic.Enabled {
+		// Default Secret
+		if r.Spec.Ironic.Template.Secret == "" {
+			r.Spec.Ironic.Template.Secret = r.Spec.Secret
+		}
+		// Default DatabaseInstance
+		if r.Spec.Ironic.Template.DatabaseInstance == "" {
+			r.Spec.Ironic.Template.DatabaseInstance = "openstack"
+		}
+		// Default StorageClass
+		if r.Spec.Ironic.Template.StorageClass == "" {
+			r.Spec.Ironic.Template.StorageClass = r.Spec.StorageClass
+		}
 		r.Spec.Ironic.Template.Default()
 	}
 

diff --git a/pkg/openstack/ironic.go b/pkg/openstack/ironic.go
@@ -35,15 +35,6 @@ func ReconcileIronic(ctx context.Context, instance *corev1beta1.OpenStackControl
 	helper.GetLogger().Info("Reconciling Ironic", "Ironic.Namespace", instance.Namespace, "Ironic.Name", "ironic")
 	op, err := controllerutil.CreateOrPatch(ctx, helper.GetClient(), ironic, func() error {
 		instance.Spec.Ironic.Template.DeepCopyInto(&ironic.Spec)
-		if ironic.Spec.Secret == "" {
-			ironic.Spec.Secret = instance.Spec.Secret
-		}
-		if ironic.Spec.DatabaseInstance == "" {
-			ironic.Spec.DatabaseInstance = "openstack"
-		}
-		if ironic.Spec.StorageClass == "" {
-			ironic.Spec.StorageClass = instance.Spec.StorageClass
-		}
 		err := controllerutil.SetControllerReference(helper.GetBeforeObject(), ironic, helper.GetScheme())
 		if err != nil {
 			return err