Fix #1799: fix catalog location

apache · Mar 3, 2021 · c11d9d5 · c11d9d5
1 parent 621f795
commit c11d9d5
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/pkg/trait/trait_types.go b/pkg/trait/trait_types.go
@@ -343,15 +343,16 @@ func (e *Environment) GetIntegrationPodSpec() *corev1.PodSpec {
 
 // DetermineCatalogNamespace --
 func (e *Environment) DetermineCatalogNamespace() string {
+	// Catalog is expected to be together with the platform
+	if e.Platform != nil && e.Platform.Namespace != "" {
+		return e.Platform.Namespace
+	}
 	if e.Integration != nil && e.Integration.Status.IntegrationKit != nil && e.Integration.Status.IntegrationKit.Namespace != "" {
 		return e.Integration.Status.IntegrationKit.Namespace
 	}
 	if e.Integration != nil && e.Integration.Spec.IntegrationKit != nil && e.Integration.Spec.IntegrationKit.Namespace != "" {
 		return e.Integration.Spec.IntegrationKit.Namespace
 	}
-	if e.Platform != nil && e.Platform.Namespace != "" {
-		return e.Platform.Namespace
-	}
 	if e.IntegrationKit != nil && e.IntegrationKit.Namespace != "" {
 		return e.IntegrationKit.Namespace
 	}