chore: install container-networkingplugins from dalec packages replacing old share #6313
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
aks-node-assistant
bot
added
the
components
paulgmiller
commented
Apr 29, 2025
paulgmiller
commented
Apr 29, 2025
paulgmiller
commented
Apr 29, 2025
djsly
reviewed
Apr 29, 2025
Devinwong
reviewed
Apr 29, 2025
djsly
reviewed
Apr 29, 2025
Co-authored-by: aks-node-assistant[bot] <190555641+aks-node-assistant[bot]@users.noreply.github.com>
Co-authored-by: Cameron Meissner <[email protected]>
Co-authored-by: aks-node-assistant[bot] <190555641+aks-node-assistant[bot]@users.noreply.github.com>
…source in scenario Flatcar_SecureTLSBootstrapping_BootstrapToken_Fallback (#7495)
Co-authored-by: aks-node-assistant[bot] <190555641+aks-node-assistant[bot]@users.noreply.github.com>
added 2 commits
January 29, 2026 17:30
This reverts commit c7ee8e7.
paulgmiller
requested review from
SriHarsha001,
yagmurbaydogan and
yewmsft
as code owners
Contributor
|
The latest Buf updates on your PR. Results from workflow Buf CI / buf (pull_request).
|
paulgmiller
requested review from
YaoC,
mxj220 and
pdamianov-dev
as code owners
Contributor
There was a problem hiding this comment.
Pull request overview
This PR refactors the installation of container networking plugins by migrating from direct downloads to dalec packages, with versions now centrally defined in components.json. This change addresses CVE vulnerabilities in the tap binary and eliminates dependencies on external shares.
Changes:
- Replaced
cni-pluginswithcontainernetworking-pluginspackage from dalec - Removed generic download logic from
cse_install.shand added OS-specificinstallCNI()functions - Updated
components.jsonwith version specifications for Ubuntu (20.04, 22.04, 24.04) and Azure Linux 3.0 - Flatcar and OSGuard continue using hardcoded downloads (v1.6.2) pending dalec updates
Reviewed changes
Copilot reviewed 37 out of 71 changed files in this pull request and generated 8 comments.
Show a summary per file
| File | Description |
|---|---|
| parts/common/components.json | Renamed package from cni-plugins to containernetworking-plugins with OS-specific version entries |
| parts/linux/cloud-init/artifacts/cse_install.sh | Removed generic installCNI() function and commented out installation call |
| parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh | Added Ubuntu-specific installCNI() using apt-get |
| parts/linux/cloud-init/artifacts/mariner/cse_install_mariner.sh | Added Mariner-specific installCNI() using dnf |
| parts/linux/cloud-init/artifacts/flatcar/cse_install_flatcar.sh | Added Flatcar-specific installCNI() with hardcoded v1.6.2 download |
| parts/linux/cloud-init/artifacts/azlosguard/cse_install_osguard.sh | Added OSGuard-specific installCNI() with hardcoded v1.6.2 download |
| pkg/agent/testdata/* | Updated test data binary blobs reflecting the configuration changes |
| } | ||
|
|
||
| installCNI() { | ||
| #This is an old versionb because dalec needs to be updated for osguard/flatcar |
There was a problem hiding this comment.
The comment contains a typo: "versionb" should be "version".
Suggested change
| #This is an old versionb because dalec needs to be updated for osguard/flatcar | |
| #This is an old version because dalec needs to be updated for osguard/flatcar |
| installCNI() { | ||
| echo "installing ubuntu containernetworking-plugins" | ||
| # Old versions of VHDs will not have components.json. If it does not exist, we will fall back to the hardcoded download for CNI. | ||
| # Network Isolated Cluster / Bring Your Own ACR will not work with a vhd that requres a hardcoded CNI download. |
There was a problem hiding this comment.
The comment contains a typo: "requres" should be "requires".
Suggested change
| # Network Isolated Cluster / Bring Your Own ACR will not work with a vhd that requres a hardcoded CNI download. | |
| # Network Isolated Cluster / Bring Your Own ACR will not work with a vhd that requires a hardcoded CNI download. |
| fi | ||
| installCNI #reference plugins. Mostly for kubenet but loopback plugin is used by containerd until containerd 2 | ||
| rm -rf $CNI_DOWNLOADS_DIR & | ||
| #unncessary as this is completely installed at vhd build time in install dependeencies |
There was a problem hiding this comment.
The comment contains a typo: "unncessary" should be "unnecessary".
Suggested change
| #unncessary as this is completely installed at vhd build time in install dependeencies | |
| #unnecessary as this is completely installed at vhd build time in install dependeencies |
| } | ||
|
|
||
| # Reference CNI plugins is used by kubenet and the loopback plugin used by containerd 1.0 (dependency gone in 2.0) | ||
| # The version used to be deteremined by RP/toggle but are now just hadcoded in vhd as they rarely change and require a node image upgrade anyways |
There was a problem hiding this comment.
The comment contains a typo: "deteremined" should be "determined".
Suggested change
| # The version used to be deteremined by RP/toggle but are now just hadcoded in vhd as they rarely change and require a node image upgrade anyways | |
| # The version used to be determined by RP/toggle but is now just hardcoded in the VHD as it rarely changes and requires a node image upgrade anyway |
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 cleanup
What this PR does / why we need it:
Get new reference plugins from dalec packages instead of zip. Only ever install one version defined in components.json No longer takes input from RP so we only cache one version
Some important notes
flatcar and osguard still on old ones. Need to find owners there to build them in dalec
Not installing at CSE time any more just in vhd.
only ever one version cached.
Which issue(s) this PR fixes:
CVE in tap binary are fixed but also this stops us from going to wierd shars directly
Requirements:
Special notes for your reviewer:
Release note: