fix: vhdbuilder phase 2.5 should still use nbccsecmd hack#8712
Open
lilypan26 wants to merge 4 commits into
Open
fix: vhdbuilder phase 2.5 should still use nbccsecmd hack#8712lilypan26 wants to merge 4 commits into
lilypan26 wants to merge 4 commits into
Conversation
lilypan26
requested review from
AbelHu,
Devinwong,
SriHarsha001,
awesomenix,
calvin197,
cameronmeissner,
djsly,
ganeshkumarashok,
mxj220,
pdamianov-dev,
phealy,
r2k1,
runzhen,
sulixu,
surajssd,
timmy-wright and
zachary-bailey
as code owners
lilypan26
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adjusts the e2e VMSS customData generation flow for “scriptless phase 2.5” scenarios so that the aks-node-controller NBC cmd “hack” path is used (instead of falling back to non-scriptless customData generation).
Changes:
- Reorders customData generation in
createVMSSModelto compile/uploadaks-node-controllerearlier and apply the NBC cmd hack path first. - Keeps the existing non-scriptless fallback path for
DISABLE_SCRIPTLESS_COMPILATION, but now after the hack path.
djsly
approved these changes
Jun 15, 2026
lilypan26
force-pushed
the
lily/scriptless/fix-vhdbuilder-phase-2.5-e2es
branch
from
9a67e76 to
4e4f371
Compare
awesomenix
reviewed
Jun 15, 2026
| if nbc != nil && nbc.EnableScriptlessNBCCSECmd && s.VHD.SupportsScriptless() { | ||
| fileNameToCheck := "/opt/azure/containers/aks-node-controller-nbc-cmd.sh" | ||
| if !config.Config.DisableScriptLessCompilation && !s.Tags.NetworkIsolated { | ||
| if s.Runtime.AKSNodeConfig != nil || (!config.Config.DisableScriptLessCompilation && !s.Tags.NetworkIsolated) { |
Contributor
There was a problem hiding this comment.
i think there are 2 cases
- AgentBaker E2E - Where we compile the AKS node controller and this uses -hach.sh
- Regular PR E2E - Where we use production scenario because we us whatever is on disk
The check before seems fine isnt it?
awesomenix
reviewed
Jun 15, 2026
|
|
||
| customData = func() string { | ||
| if config.Config.DisableScriptLessCompilation { | ||
| if config.Config.DisableScriptLessCompilation && !s.Runtime.NBC.EnableScriptlessNBCCSECmd { |
Contributor
There was a problem hiding this comment.
hmm seems odd, are we saying this is old scriptless?
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
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 this PR does / why we need it:
For phase 2.5, we should still use nbccsecmd hack, not scriptless compilation
Which issue(s) this PR fixes:
Fixes #