Merge pull request #363 from chrischdi/pr-ignition-not-set-version

OCPCLOUD-3162: conversion: do not set ignition version on AWSMachine

Author: openshift-merge-bot[bot]

e2e/aws_test.go

@@ -117,7 +117,6 @@ func newAWSMachineTemplate(mapiProviderSpec *mapiv1.AWSMachineProviderConfig) *a
 			ID: mapiProviderSpec.AMI.ID,
 		},
 		Ignition: &awsv1.Ignition{
-			Version:     "3.4",
 			StorageType: awsv1.IgnitionStorageTypeOptionUnencryptedUserData,
 		},
 		Subnet: &awsv1.AWSResourceReference{

pkg/conversion/capi2mapi/aws_fuzz_test.go

@@ -150,7 +150,6 @@ func awsMachineFuzzerFuncs(codecs runtimeserializer.CodecFactory) []interface{}
 		func(ignition *awsv1.Ignition, c randfill.Continue) {
 			// We force these fields, so they must be fuzzed in this way.
 			*ignition = awsv1.Ignition{
-				Version:     "3.4",
 				StorageType: awsv1.IgnitionStorageTypeOptionUnencryptedUserData,
 			}
 		},

pkg/conversion/mapi2capi/aws.go

@@ -257,7 +257,6 @@ func (m *awsMachineAndInfra) toAWSMachine(providerSpec mapiv1.AWSMachineProvider
 		AdditionalTags:           convertAWSTagsToCAPI(providerSpec.Tags),
 		IAMInstanceProfile:       convertIAMInstanceProfiletoCAPI(providerSpec.IAMInstanceProfile),
 		Ignition: &awsv1.Ignition{
-			Version:     "3.4",                                              // TODO(OCPCLOUD-2719): Should this be extracted from the ignition in the user data secret?
 			StorageType: awsv1.IgnitionStorageTypeOptionUnencryptedUserData, // Hardcoded for OpenShift.
 		},