Copy config on clone by default

Dimitra Chatzichrysou · Dimitra Chatzichrysou · commit 8ddf580c6b18 · 2022-02-14T12:28:47.000+01:00
diff --git a/controllers/drupalsite_controller.go b/controllers/drupalsite_controller.go
@@ -636,6 +636,10 @@ func (r *DrupalSiteReconciler) ensureSpecFinalizer(ctx context.Context, drp *web
 		if drp.Spec.Configuration.DiskSize < sourceSite.Spec.Configuration.DiskSize {
 			drp.Spec.Configuration.DiskSize = sourceSite.Spec.Configuration.DiskSize
 		}
+		// The extraConfigurationRepo should be set in the clone site if defined in the source
+		if sourceSite.Spec.Configuration.ExtraConfigurationRepo != "" && drp.Spec.Configuration.ExtraConfigurationRepo == "" {
+			drp.Spec.Configuration.ExtraConfigurationRepo = sourceSite.Spec.Configuration.ExtraConfigurationRepo
+		}
 	}
 	// Initialize 'spec.version.releaseSpec' if empty
 	if len(drp.Spec.Version.ReleaseSpec) == 0 {

Original file line number	Diff line number	Diff line change
`@@ -636,6 +636,10 @@ func (r DrupalSiteReconciler) ensureSpecFinalizer(ctx context.Context, drp web`
`636`	`636`	`if drp.Spec.Configuration.DiskSize < sourceSite.Spec.Configuration.DiskSize {`
`637`	`637`	`drp.Spec.Configuration.DiskSize = sourceSite.Spec.Configuration.DiskSize`
`638`	`638`	`}`
	`639`	`+ // The extraConfigurationRepo should be set in the clone site if defined in the source`
	`640`	`+ if sourceSite.Spec.Configuration.ExtraConfigurationRepo != "" && drp.Spec.Configuration.ExtraConfigurationRepo == "" {`
	`641`	`+ drp.Spec.Configuration.ExtraConfigurationRepo = sourceSite.Spec.Configuration.ExtraConfigurationRepo`
	`642`	`+ }`
`639`	`643`	`}`
`640`	`644`	`// Initialize 'spec.version.releaseSpec' if empty`
`641`	`645`	`if len(drp.Spec.Version.ReleaseSpec) == 0 {`