azure: enable CustomData if the userdata has cloud-init format #546
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ader1990
force-pushed
the
ader1990/fix_azure_userdata
branch
from
018e9ca to
7217492
Compare
tormath1
reviewed
Aug 1, 2024
platform/api/azure/instance.go
Outdated
| @@ -164,7 +165,7 @@ func (a *API) getVMParameters(name, userdata, sshkey, storageAccountURI string, | |||
| // I don't think it would be an issue to have empty user-data set but better | |||
| // to be safe than sorry. | |||
| if ud != "" { | |||
| if a.Opts.UseUserData { | |||
| if a.Opts.UseUserData && (userdata.IsIgnition() || userdata.IsEmpty()) { | |||
There was a problem hiding this comment.
That's interesting because we already have a check for empty user data:
// I don't think it would be an issue to have empty user-data set but better
// to be safe than sorry.
if ud != "" {
There was a problem hiding this comment.
good point, so the IsEmpty() check can be removed.
@ader1990 would you ensure this PR gets merged?
There was a problem hiding this comment.
Hello, the PR looks good and was tested by github actions from the /scripts repository.
The IsEmpty() check is performed also in the IsIgnition(), I will remove it. I don't think there is the need for another full rerun after the IsEmpty removal?
Co-authored-by: Jeremi Piotrowski <[email protected]> Signed-off-by: Adrian Vladu <[email protected]>
ader1990
force-pushed
the
ader1990/fix_azure_userdata
branch
from
7217492 to
87bd3f4
Compare
tormath1
approved these changes
Aug 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, see: flatcar/Flatcar#656, Flatcar on Azure does not support the Azure Virtual Machine feature AzureVM-UserData (https://learn.microsoft.com/en-us/azure/virtual-machines/user-data) enabled when the userdata is in cloud-init (cloud-config) format. It requires the Azure Virtual Machine feature called AzureVM-CustomData (https://learn.microsoft.com/en-us/azure/virtual-machines/custom-data) to be enabled. Yes, I know, confusing.
This change fixes the flakiness in the
cl.cloudinit.basicMantle test, which sometimes was run with AzureVMUserData enabled.Patch made by @jepio.
Fixes: flatcar/Flatcar#1505