From 6808502e5d213ec57ce53e45f093228191824a39 Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Wed, 17 Sep 2025 10:47:00 +0200 Subject: [PATCH] conversion: do not set ignition version on AWSMachine --- e2e/aws_test.go | 1 - pkg/conversion/capi2mapi/aws_fuzz_test.go | 1 - pkg/conversion/mapi2capi/aws.go | 1 - 3 files changed, 3 deletions(-) diff --git a/e2e/aws_test.go b/e2e/aws_test.go index 45446206d..a46c885ab 100644 --- a/e2e/aws_test.go +++ b/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{ diff --git a/pkg/conversion/capi2mapi/aws_fuzz_test.go b/pkg/conversion/capi2mapi/aws_fuzz_test.go index 0d0ceb16b..35ed04130 100644 --- a/pkg/conversion/capi2mapi/aws_fuzz_test.go +++ b/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, } }, diff --git a/pkg/conversion/mapi2capi/aws.go b/pkg/conversion/mapi2capi/aws.go index 6f1b9aaa2..8330d38e3 100644 --- a/pkg/conversion/mapi2capi/aws.go +++ b/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. },