machineSets: add os-stream label to machineSets and machines for aws

Author: isabella-janssen

pkg/asset/machines/aws/machines.go

@@ -41,6 +41,7 @@ type machineProviderInput struct {
 }
 
 // Machines returns a list of machines for a machinepool.
+// func Machines(clusterID string, region string, subnets aws.SubnetsByZone, pool *types.MachinePool, role, userDataSecret string, userTags map[string]string, publicSubnet bool, osImageStream string) ([]machineapi.Machine, *machinev1.ControlPlaneMachineSet, error) {
 func Machines(clusterID string, region string, subnets aws.SubnetsByZone, pool *types.MachinePool, role, userDataSecret string, userTags map[string]string, publicSubnet bool) ([]machineapi.Machine, *machinev1.ControlPlaneMachineSet, error) {
 	if poolPlatform := pool.Platform.Name(); poolPlatform != awstypes.Name {
 		return nil, nil, fmt.Errorf("non-AWS machine-pool: %q", poolPlatform)
@@ -98,6 +99,9 @@ func Machines(clusterID string, region string, subnets aws.SubnetsByZone, pool *
 					"machine.openshift.io/cluster-api-cluster":      clusterID,
 					"machine.openshift.io/cluster-api-machine-role": role,
 					"machine.openshift.io/cluster-api-machine-type": role,
+					// TODO: understand if the label needs to be set here or if just setting it in
+					// the MachineSet's Spec.Template.ObjectMeta.Labels is enough.
+					// "machine.openshift.io/os-image-stream":          osImageStream,
 				},
 			},
 			Spec: machineapi.MachineSpec{
@@ -177,6 +181,8 @@ func Machines(clusterID string, region string, subnets aws.SubnetsByZone, pool *
 							"machine.openshift.io/cluster-api-cluster":      clusterID,
 							"machine.openshift.io/cluster-api-machine-role": role,
 							"machine.openshift.io/cluster-api-machine-type": role,
+							// TODO: see if we need these labels on CPMSs
+							// "machine.openshift.io/os-image-stream":          osImageStream,
 						},
 					},
 					Spec: machineapi.MachineSpec{

pkg/asset/machines/aws/machinesets.go

@@ -26,6 +26,7 @@ type MachineSetInput struct {
 	Role                     string
 	UserDataSecret           string
 	Hosts                    map[string]icaws.Host
+	OSImageStream            string
 }
 
 // MachineSets returns a list of machinesets for a machinepool.
@@ -48,7 +49,7 @@ func MachineSets(in *MachineSetInput) ([]*machineapi.MachineSet, error) {
 			replicas++
 		}
 
-		nodeLabels := make(map[string]string, 3)
+		machineSpecLabels := make(map[string]string, 3)
 		nodeTaints := []corev1.Taint{}
 		instanceType := mpool.InstanceType
 		publicSubnet := in.PublicSubnet
@@ -71,7 +72,7 @@ func MachineSets(in *MachineSetInput) ([]*machineapi.MachineSet, error) {
 			if zone.PreferredInstanceType != "" {
 				instanceType = zone.PreferredInstanceType
 			}
-			nodeLabels = map[string]string{
+			machineSpecLabels = map[string]string{
 				"node-role.kubernetes.io/edge":          "",
 				"machine.openshift.io/zone-type":        zone.Type,
 				"machine.openshift.io/zone-group":       zone.GroupName,
@@ -112,13 +113,16 @@ func MachineSets(in *MachineSetInput) ([]*machineapi.MachineSet, error) {
 			return nil, errors.Wrap(err, "failed to create provider")
 		}
 
+		// TODO: use const for label
+		machineSpecLabels["machine.openshift.io/os-image-stream"] = in.OSImageStream
+
 		name := fmt.Sprintf("%s-%s-%s", in.ClusterID, in.Pool.Name, az)
 		spec := machineapi.MachineSpec{
 			ProviderSpec: machineapi.ProviderSpec{
 				Value: &runtime.RawExtension{Object: provider},
 			},
 			ObjectMeta: machineapi.ObjectMeta{
-				Labels: nodeLabels,
+				Labels: machineSpecLabels,
 			},
 			Taints: nodeTaints,
 		}
@@ -150,6 +154,7 @@ func MachineSets(in *MachineSetInput) ([]*machineapi.MachineSet, error) {
 							"machine.openshift.io/cluster-api-cluster":      in.ClusterID,
 							"machine.openshift.io/cluster-api-machine-role": in.Role,
 							"machine.openshift.io/cluster-api-machine-type": in.Role,
+							"machine.openshift.io/os-image-stream":          in.OSImageStream,
 						},
 					},
 					Spec: spec,

pkg/asset/machines/master.go

@@ -268,6 +268,7 @@ func (m *Master) Generate(ctx context.Context, dependencies asset.Parents) error
 			masterUserDataSecretName,
 			installConfig.Config.Platform.AWS.UserTags,
 			awstypes.IsPublicOnlySubnetsEnabled(),
+			// GetOSImageStream(ic),
 		)
 		if err != nil {
 			return errors.Wrap(err, "failed to create master machine objects")

pkg/asset/machines/util.go

@@ -11,6 +11,7 @@ import (
 	"github.com/openshift/installer/pkg/asset/installconfig"
 	"github.com/openshift/installer/pkg/asset/machines/machineconfig"
 	"github.com/openshift/installer/pkg/asset/machines/vsphere"
+	"github.com/openshift/installer/pkg/rhcos"
 	"github.com/openshift/installer/pkg/types"
 	azuretypes "github.com/openshift/installer/pkg/types/azure"
 	vspheretypes "github.com/openshift/installer/pkg/types/vsphere"
@@ -19,6 +20,9 @@ import (
 const (
 	// VsphereScsiByPath defines the path format for vsphere disks being added.
 	VsphereScsiByPath = "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:%d:0"
+
+	// OSImageStreamLabel is the label key used to identify the OS image stream for a machine.
+	OSImageStreamLabel = "machine.openshift.io/os-image-stream"
 )
 
 // NodeDiskSetup determines the path per disk type, and per platform and role, runs ForDiskSetup.
@@ -71,3 +75,12 @@ func NodeDiskSetup(installConfig *installconfig.InstallConfig, role string, disk
 	}
 	return nil, nil
 }
+
+// GetOSImageStream returns the OS image stream value from the install config, defaulting to the
+// value of `DefaultOSImageStream` in as defined in pkg/rhcos/stream.go if not specified.
+func GetOSImageStream(ic *types.InstallConfig) string {
+	if ic.OSImageStream == "" {
+		return string(rhcos.DefaultOSImageStream)
+	}
+	return string(ic.OSImageStream)
+}

pkg/asset/machines/worker.go

@@ -554,6 +554,7 @@ func (w *Worker) Generate(ctx context.Context, dependencies asset.Parents) error
 				Role:                     pool.Name,
 				UserDataSecret:           workerUserDataSecretName,
 				Hosts:                    dHosts,
+				OSImageStream:            GetOSImageStream(ic),
 			})
 			if err != nil {
 				return errors.Wrap(err, "failed to create worker machine objects")