Merge pull request #12 from amazeeio/fix-dest-to-source

Use the correct namespace for checking secrets and services
amazeeio · Dec 20, 2020 · 4f8f3f1 · 4f8f3f1
2 parents 0742c13 + f462b4b
commit 4f8f3f1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/controllers/ingress_handler.go b/controllers/ingress_handler.go
@@ -145,7 +145,7 @@ func (r *HostMigrationReconciler) KubernetesHandler(ctx context.Context, opLog l
 		&dioscuri,
 		ingressDestinationToSource,
 		migrateDestinationToSource,
-		destinationNamespace,
+		sourceNamespace,
 	); err != nil {
 		r.updateKubernetesStatusCondition(ctx,
 			&dioscuri,
@@ -180,7 +180,7 @@ func (r *HostMigrationReconciler) KubernetesHandler(ctx context.Context, opLog l
 	if err := r.checkSecrets(ctx,
 		&dioscuri,
 		ingressDestinationToSource,
-		destinationNamespace,
+		sourceNamespace,
 	); err != nil {
 		r.updateKubernetesStatusCondition(ctx,
 			&dioscuri,

diff --git a/controllers/ingressmigrate_controller.go b/controllers/ingressmigrate_controller.go
@@ -206,7 +206,7 @@ func (r *IngressMigrateReconciler) Reconcile(req ctrl.Request) (ctrl.Result, err
 				&dioscuri,
 				ingressDestinationToSource,
 				migrateDestinationToSource,
-				destinationNamespace,
+				sourceNamespace,
 			); err != nil {
 				r.updateStatusCondition(ctx,
 					&dioscuri,
@@ -241,7 +241,7 @@ func (r *IngressMigrateReconciler) Reconcile(req ctrl.Request) (ctrl.Result, err
 			if err := r.checkSecrets(ctx,
 				&dioscuri,
 				ingressDestinationToSource,
-				destinationNamespace,
+				sourceNamespace,
 			); err != nil {
 				r.updateStatusCondition(ctx,
 					&dioscuri,

diff --git a/controllers/route_handler.go b/controllers/route_handler.go
@@ -96,7 +96,7 @@ func (r *HostMigrationReconciler) OpenshiftHandler(ctx context.Context, opLog lo
 	migrateSourceToDestination := &routev1.RouteList{}
 	r.checkServices(&dioscuri, routesSourceToDestination, migrateSourceToDestination, destinationNamespace)
 	migrateDestinationToSource := &routev1.RouteList{}
-	r.checkServices(&dioscuri, routesDestinationToSource, migrateDestinationToSource, destinationNamespace)
+	r.checkServices(&dioscuri, routesDestinationToSource, migrateDestinationToSource, sourceNamespace)
 	// END CHECKING SERVICES SECTION
 	// START MIGRATING ROUTES SECTION
 	// actually start the migrations here

diff --git a/controllers/routemigrate_controller.go b/controllers/routemigrate_controller.go
@@ -154,7 +154,7 @@ func (r *RouteMigrateReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error
 			migrateSourceToDestination := &routev1.RouteList{}
 			r.checkServices(&dioscuri, routesSourceToDestination, migrateSourceToDestination, destinationNamespace)
 			migrateDestinationToSource := &routev1.RouteList{}
-			r.checkServices(&dioscuri, routesDestinationToSource, migrateDestinationToSource, destinationNamespace)
+			r.checkServices(&dioscuri, routesDestinationToSource, migrateDestinationToSource, sourceNamespace)
 			// END CHECKING SERVICES SECTION
 			// START MIGRATING ROUTES SECTION
 			// actually start the migrations here