Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 19, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion e2e/aws_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
1 change: 0 additions & 1 deletion pkg/conversion/capi2mapi/aws_fuzz_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
},
Expand Down
1 change: 0 additions & 1 deletion pkg/conversion/mapi2capi/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
},

Expand Down