conversion: CAPI2MAPI set openshift labels for zone, region and instance-type

Author: chrischdi

pkg/conversion/capi2mapi/aws.go

@@ -221,7 +221,12 @@ func (m machineAndAWSMachineAndAWSCluster) ToMachine() (*mapiv1beta1.Machine, []
 
 	warnings = append(warnings, warn...)
 
-	mapiMachine, err := fromCAPIMachineToMAPIMachine(m.machine)
+	additionalMachineAPILabels := map[string]string{
+		"machine.openshift.io/instance-type": m.awsMachine.Spec.InstanceType,
+		"machine.openshift.io/region":        m.awsCluster.Spec.Region,
+	}
+
+	mapiMachine, err := fromCAPIMachineToMAPIMachine(m.machine, additionalMachineAPILabels)
 	if err != nil {
 		errors = append(errors, err...)
 	}

pkg/conversion/capi2mapi/common.go

@@ -45,13 +45,13 @@ func RawExtensionFromProviderSpec(spec interface{}) (*runtime.RawExtension, erro
 
 func convertCAPIMachineSetSelectorToMAPI(capiSelector metav1.LabelSelector) metav1.LabelSelector {
 	mapiSelector := capiSelector.DeepCopy()
-	mapiSelector.MatchLabels = convertCAPILabelsToMAPILabels(capiSelector.MatchLabels)
+	mapiSelector.MatchLabels = convertCAPILabelsToMAPILabels(capiSelector.MatchLabels, nil)
 
 	return *mapiSelector
 }
 
-func convertCAPILabelsToMAPILabels(capiLabels map[string]string) map[string]string {
-	if len(capiLabels) == 0 {
+func convertCAPILabelsToMAPILabels(capiLabels map[string]string, machineAPILabels map[string]string) map[string]string {
+	if len(capiLabels) == 0 && len(machineAPILabels) == 0 {
 		return nil
 	}
 
@@ -77,6 +77,15 @@ func convertCAPILabelsToMAPILabels(capiLabels map[string]string) map[string]stri
 		mapiLabels[k] = v
 	}
 
+	for k, v := range machineAPILabels {
+		// Ignore empty labels to ensure to not overwrite potentially existing labels with empty values.
+		if v == "" {
+			continue
+		}
+
+		mapiLabels[k] = v
+	}
+
 	// On the original MAPI object some label fields are nil rather than empty.
 	// So return nil instead to avoid unnecessary diff being picked up by the diff checker.
 	if len(mapiLabels) == 0 {
@@ -155,5 +164,8 @@ func convertCAPIAnnotationsToMAPIAnnotations(capiAnnotations map[string]string)
 		mapiAnnotations[k] = v
 	}
 
+	// TODO
+	// - machine.openshift.io/instance-state
+
 	return mapiAnnotations
 }

pkg/conversion/capi2mapi/machine.go

@@ -34,7 +34,7 @@ const (
 )
 
 // fromCAPIMachineToMAPIMachine translates a core CAPI Machine to its MAPI Machine correspondent.
-func fromCAPIMachineToMAPIMachine(capiMachine *clusterv1.Machine) (*mapiv1beta1.Machine, field.ErrorList) {
+func fromCAPIMachineToMAPIMachine(capiMachine *clusterv1.Machine, additionalMachineAPILabels map[string]string) (*mapiv1beta1.Machine, field.ErrorList) {
 	errs := field.ErrorList{}
 
 	lifecycleHooks, capiMachineNonHookAnnotations := convertCAPILifecycleHookAnnotationsToMAPILifecycleHooksAndAnnotations(capiMachine.Annotations)
@@ -44,11 +44,13 @@ func fromCAPIMachineToMAPIMachine(capiMachine *clusterv1.Machine) (*mapiv1beta1.
 		errs = append(errs, machineStatusErrs...)
 	}
 
+	additionalMachineAPILabels["machine.openshift.io/zone"] = ptr.Deref(capiMachine.Spec.FailureDomain, "")
+
 	mapiMachine := &mapiv1beta1.Machine{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:            capiMachine.Name,
 			Namespace:       mapiNamespace,
-			Labels:          convertCAPILabelsToMAPILabels(capiMachine.Labels),
+			Labels:          convertCAPILabelsToMAPILabels(capiMachine.Labels, additionalMachineAPILabels),
 			Annotations:     convertCAPIAnnotationsToMAPIAnnotations(capiMachineNonHookAnnotations),
 			Finalizers:      []string{mapiv1beta1.MachineFinalizer},
 			OwnerReferences: nil, // OwnerReferences not populated here. They are added later by the machineSync controller.

pkg/conversion/capi2mapi/machineset.go

@@ -32,7 +32,7 @@ func fromCAPIMachineSetToMAPIMachineSet(capiMachineSet *clusterv1.MachineSet) (*
 		ObjectMeta: metav1.ObjectMeta{
 			Name:            capiMachineSet.Name,
 			Namespace:       capiMachineSet.Namespace,
-			Labels:          convertCAPILabelsToMAPILabels(capiMachineSet.Labels),
+			Labels:          convertCAPILabelsToMAPILabels(capiMachineSet.Labels, nil),
 			Annotations:     convertCAPIAnnotationsToMAPIAnnotations(capiMachineSet.Annotations),
 			Finalizers:      nil, // MAPI MachineSet does not have finalizers.
 			OwnerReferences: nil, // OwnerReferences not populated here. They are added later by the machineSetSync controller.
@@ -44,7 +44,7 @@ func fromCAPIMachineSetToMAPIMachineSet(capiMachineSet *clusterv1.MachineSet) (*
 			DeletePolicy:    capiMachineSet.Spec.DeletePolicy,
 			Template: mapiv1beta1.MachineTemplateSpec{
 				ObjectMeta: mapiv1beta1.ObjectMeta{
-					Labels:      convertCAPILabelsToMAPILabels(capiMachineSet.Spec.Template.Labels),
+					Labels:      convertCAPILabelsToMAPILabels(capiMachineSet.Spec.Template.Labels, nil),
 					Annotations: convertCAPIAnnotationsToMAPIAnnotations(capiMachineSet.Spec.Template.Annotations),
 				},
 			},

pkg/conversion/capi2mapi/openstack.go

@@ -28,6 +28,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/validation/field"
+	"k8s.io/utils/ptr"
 	openstackv1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
@@ -201,7 +202,14 @@ func (m machineAndOpenStackMachineAndOpenStackCluster) ToMachine() (*mapiv1beta1
 
 	warnings = append(warnings, warns...)
 
-	mapiMachine, errs := fromCAPIMachineToMAPIMachine(m.machine)
+	additionalMachineAPILabels := map[string]string{
+		// Unable to determine the region without fetching the identity resources as done at:
+		// https://github.com/openshift/machine-api-provider-openstack/blob/2defb131bd0836beba0a9790de7c9a63137a5cec/pkg/machine/actuator.go#L85-L89
+		// "machine.openshift.io/region":
+		"machine.openshift.io/instance-type": ptr.Deref(m.openstackMachine.Spec.Flavor, ""),
+	}
+
+	mapiMachine, errs := fromCAPIMachineToMAPIMachine(m.machine, additionalMachineAPILabels)
 	if errs != nil {
 		errors = append(errors, errs...)
 	}

pkg/conversion/capi2mapi/powervs.go

@@ -100,7 +100,12 @@ func (m machineAndPowerVSMachineAndPowerVSCluster) ToMachine() (*mapiv1beta1.Mac
 		return nil, nil, fmt.Errorf("unable to convert PowerVS providerSpec to raw extension: %w", errRaw)
 	}
 
-	mapiMachine, err := fromCAPIMachineToMAPIMachine(m.machine)
+	additionalMachineAPILabels := map[string]string{
+		"machine.openshift.io/instance-type": m.powerVSMachine.Spec.SystemType,
+		"machine.openshift.io/region":        ptr.Deref(m.powerVSMachine.Status.Region, ""),
+	}
+
+	mapiMachine, err := fromCAPIMachineToMAPIMachine(m.machine, additionalMachineAPILabels)
 	if err != nil {
 		errors = append(errors, err...)
 	}