Windows 1909 support #2339
Merged
Windows 1909 support #2339
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
cPu1
approved these changes
Jun 17, 2020
| return imageFamily == NodeImageFamilyWindowsServer2019CoreContainer || imageFamily == NodeImageFamilyWindowsServer2019FullContainer | ||
| return imageFamily == NodeImageFamilyWindowsServer2019CoreContainer || | ||
| imageFamily == NodeImageFamilyWindowsServer2019FullContainer || | ||
| imageFamily == NodeImageFamilyWindowsServer1909CoreContainer |
There was a problem hiding this comment.
Alternatively:
switch imageFamily {
case NodeImageFamilyWindowsServer2019CoreContainer, NodeImageFamilyWindowsServer2019FullContainer, NodeImageFamilyWindowsServer1909CoreContainer:
return true
default:
return false
}
pkg/ami/auto_resolver.go
Outdated
Comment on lines
48
to
50
| case api.NodeImageFamilyWindowsServer2019CoreContainer, | ||
| api.NodeImageFamilyWindowsServer2019FullContainer, | ||
| api.NodeImageFamilyWindowsServer1909CoreContainer: |
There was a problem hiding this comment.
Since this case clause has grown a bit, I think we should now use isWindowsImage.
There was a problem hiding this comment.
fixed, IsWindowsImage now in default case
pkg/nodebootstrap/userdata.go
Outdated
Comment on lines
196
to
198
| case api.NodeImageFamilyWindowsServer2019FullContainer, | ||
| api.NodeImageFamilyWindowsServer2019CoreContainer, | ||
| api.NodeImageFamilyWindowsServer1909CoreContainer: |
There was a problem hiding this comment.
Same as above, I think we should use isWindowsImage here.
cPu1
approved these changes
Jun 17, 2020
|
@cPu1 I had to update the test but I changed them to not be dependent on the exact AMI names, what do you think? |
cPu1
approved these changes
Jun 18, 2020
Makes sense. We are going to eventually deprecate static resolution for AMIs, so those tests will be removed as well. |
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.
Description
Closes #2321
Checklist
README.md, or theuserdocsdirectory)area/nodegroup), target version (e.g.version/0.12.0) and kind (e.g.kind/improvement)