feat: enable 2.0 Mariner images #1871
Merged
Conversation
This file contains hidden or 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
Camelron
force-pushed
the
cam/mariner2_enabling_squashed
branch
from
15b9559 to
282eadc
Compare
hbeberman
requested review from
anujmaheshwari1,
hbeberman,
ganeshkumarashok and
alexeldeib
alexeldeib
reviewed
Jun 14, 2022
| @@ -38,6 +39,18 @@ else | |||
| @echo "${MODE}: Building with Hyper-v generation 1 VM and save to Classic Storage Account" | |||
| @packer build -var-file=vhdbuilder/packer/settings.json vhdbuilder/packer/vhd-image-builder-mariner.json | |||
| endif | |||
| else ifeq (${OS_VERSION},V2) | |||
There was a problem hiding this comment.
@anujmaheshwari1 I feel like we had discussed some better way to do this?
alexeldeib
reviewed
Jun 14, 2022
alexeldeib
reviewed
Jun 14, 2022
…AgentBaker into cam/mariner2_enabling_squashed
alexeldeib
approved these changes
Jun 20, 2022
There was a problem hiding this comment.
lgtm, one comment for @anujmaheshwari1 but think you're fine to merge 👍
hbeberman
approved these changes
Jun 20, 2022
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.
What type of PR is this?
/kind feature
What this PR does / why we need it:
Enables Mariner 2.0 AKS image builds from Mariner 2.0 marketplace images.
Contains a cloud-init custom data script to allow sha1 ssh auth during packer build. Cleans it up after.
Requirements: