Add classNamespace to topology

Signed-off-by: Danil-Grigorev <[email protected]>

api/v1beta1/cluster_types.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1beta1
 
 import (
+	"cmp"
 	"fmt"
 	"net"
 	"strings"
@@ -100,6 +101,11 @@ type Topology struct {
 	// The name of the ClusterClass object to create the topology.
 	Class string `json:"class"`
 
+	// The namespace of the ClusterClass object to create the topology.
+	//
+	// +optional
+	ClassNamespace string `json:"classNamespace,omitempty"`
+
 	// The Kubernetes version of the cluster.
 	Version string `json:"version"`
 
@@ -628,7 +634,8 @@ func (c *Cluster) GetClassKey() types.NamespacedName {
 	if c.Spec.Topology == nil {
 		return types.NamespacedName{}
 	}
-	return types.NamespacedName{Namespace: c.GetNamespace(), Name: c.Spec.Topology.Class}
+	namespace := cmp.Or(c.Spec.Topology.ClassNamespace, c.GetNamespace())
+	return types.NamespacedName{Namespace: namespace, Name: c.Spec.Topology.Class}
 }
 
 // GetConditions returns the set of conditions for this object.

cmd/clusterctl/client/cluster/topology.go

@@ -704,7 +704,7 @@ func (t *topologyClient) affectedClusters(ctx context.Context, in *TopologyPlanI
 	for _, cc := range affectedClusterClasses {
 		for i := range clusterList.Items {
 			cluster := clusterList.Items[i]
-			if cluster.Spec.Topology != nil && cluster.GetClassKey().Name == cc.Name {
+			if cluster.Spec.Topology != nil && cluster.GetClassKey().Name == cc.Name && cluster.GetClassKey().Namespace == cc.Namespace {
 				affectedClusters[client.ObjectKeyFromObject(&clusterList.Items[i])] = true
 			}
 		}