Add ClusterNamespace Annotations to Worker Nodes (#1924) (#1926)

* add clusterNamespace annotations
* initialize annotation

(cherry picked from commit 7a93ac5)

Signed-off-by: moadqassem <[email protected]>

Author: moadqassem

pkg/admission/machines.go

@@ -129,6 +129,13 @@ func (ad *admissionData) defaultAndValidateMachineSpec(ctx context.Context, spec
 		}
 	}
 
+	// For KubeVirt we need to initialize the annotations for MachineDeployment, to enable setting of the needed annotations.
+	if providerConfig.CloudProvider == providerconfigtypes.CloudProviderKubeVirt {
+		if spec.Annotations == nil {
+			spec.Annotations = make(map[string]string)
+		}
+	}
+
 	skg := providerconfig.NewConfigVarResolver(ctx, ad.workerClient)
 	prov, err := cloudprovider.ForProvider(providerConfig.CloudProvider, skg)
 	if err != nil {

pkg/cloudprovider/provider/kubevirt/provider.go

@@ -81,6 +81,8 @@ const (
 	// node affinity constraints on a PersistentVolume.
 	topologyRegionKey = "topology.kubernetes.io/region"
 	topologyZoneKey   = "topology.kubernetes.io/zone"
+	// clusterNamespace represents the infra cluster namespace, where KubeVirt resources are created.
+	clusterNamespace = "cluster.x-k8s.io/cluster-namespace"
 )
 
 type provider struct {
@@ -675,6 +677,13 @@ func (p *provider) AddDefaults(_ *zap.SugaredLogger, spec clusterv1alpha1.Machin
 		return spec, err
 	}
 
+	annotations := spec.Annotations
+	if annotations == nil {
+		annotations = make(map[string]string)
+	}
+
+	annotations[clusterNamespace] = c.Namespace
+	spec.Annotations = annotations
 	if err := appendTopologiesLabels(context.TODO(), c, spec.Labels); err != nil {
 		return spec, err
 	}