Have new ExtraRepo field have priority over the deprecated one

Make new S2I field overwrite the old one, as it is deprecated and should take precedence over it.

Part of cern-drupal-distribution#19 (closed)

controllers/drupalsite_resources.go

@@ -193,26 +193,26 @@ func (r *DrupalSiteReconciler) ensureResources(drp *webservicesv1a1.DrupalSite,
 
 /*
 ensureResourceX ensure the requested resource is created, with the following valid values
-	- pvc_drupal: PersistentVolume for the drupalsite
-	- site_install_job: Kubernetes Job for the drush ensure-site-install
-	- clone_job: Kubernetes Job for cloning a drupal site
-	- easystart_taskrun: Taskrun for restoring easystart backup
-	- is_base: ImageStream for sitebuilder-base
-	- is_s2i: ImageStream for S2I sitebuilder
-	- bc_s2i: BuildConfig for S2I sitebuilder
-	- deploy_drupal: <moved to `ensureDrupalDeployment`>
-	- svc_nginx: Service for Nginx
-	- cm_php: ConfigMap for PHP-FPM
-	- cm_nginx_global: ConfigMap for Nginx global settings (performance)
-	- cm_settings: ConfigMap for `settings.php`
-	- cm_php_cli: ConfigMap for 'config.ini' for PHP CLI
-	- route: Route for the drupalsite
-	- oidc_return_uri: Redirection URI for OIDC
-	- dbod_cr: DBOD custom resource to establish database & respective connection for the drupalsite
-	- webdav_secret: Secret with credential for WebDAV
-	- backup_schedule: Velero Schedule for scheduled backups of the drupalSite
-	- tekton_extra_perm_rbac: ClusterRoleBinding for tekton tasks
-	- gitlab_trigger_secret: Secret for Gitlab trigger config in buildconfig
+  - pvc_drupal: PersistentVolume for the drupalsite
+  - site_install_job: Kubernetes Job for the drush ensure-site-install
+  - clone_job: Kubernetes Job for cloning a drupal site
+  - easystart_taskrun: Taskrun for restoring easystart backup
+  - is_base: ImageStream for sitebuilder-base
+  - is_s2i: ImageStream for S2I sitebuilder
+  - bc_s2i: BuildConfig for S2I sitebuilder
+  - deploy_drupal: <moved to `ensureDrupalDeployment`>
+  - svc_nginx: Service for Nginx
+  - cm_php: ConfigMap for PHP-FPM
+  - cm_nginx_global: ConfigMap for Nginx global settings (performance)
+  - cm_settings: ConfigMap for `settings.php`
+  - cm_php_cli: ConfigMap for 'config.ini' for PHP CLI
+  - route: Route for the drupalsite
+  - oidc_return_uri: Redirection URI for OIDC
+  - dbod_cr: DBOD custom resource to establish database & respective connection for the drupalsite
+  - webdav_secret: Secret with credential for WebDAV
+  - backup_schedule: Velero Schedule for scheduled backups of the drupalSite
+  - tekton_extra_perm_rbac: ClusterRoleBinding for tekton tasks
+  - gitlab_trigger_secret: Secret for Gitlab trigger config in buildconfig
 */
 func (r *DrupalSiteReconciler) ensureResourceX(ctx context.Context, d *webservicesv1a1.DrupalSite, resType string, log logr.Logger) (transientErr reconcileError) {
 	switch resType {
@@ -679,7 +679,8 @@ func buildConfigForDrupalSiteBuilderS2I(currentobject *buildv1.BuildConfig, d *w
 				URI: d.Spec.Configuration.ExtraConfigurationRepo,
 			},
 		}
-	} else if currentobject.CreationTimestamp.IsZero() && len(d.Spec.Configuration.ExtraConfigurationRepository.RepositoryUrl) > 0 {
+	}
+	if currentobject.CreationTimestamp.IsZero() && len(d.Spec.Configuration.ExtraConfigurationRepository.RepositoryUrl) > 0 {
 		currentobject.Spec.CommonSpec.Source = buildv1.BuildSource{
 			Git: &buildv1.GitBuildSource{
 				Ref: d.Spec.Configuration.ExtraConfigurationRepository.Branch,