Skip to content

feat: consume NI kubernetes packages on MAR#7134

Merged
Devinwong merged 40 commits intomasterfrom
qweeah/install-ni-pkg
Oct 17, 2025
Merged

feat: consume NI kubernetes packages on MAR#7134
Devinwong merged 40 commits intomasterfrom
qweeah/install-ni-pkg

Conversation

@qweeah
Copy link
Copy Markdown
Contributor

@qweeah qweeah commented Oct 7, 2025

What type of PR is this?
/kind feature

What this PR does / why we need it:
This PR consumes Network-Isolated packages kubelet and kubectl binaries on MAR. Current implementation only covers Ubuntu scenario.

Which issue(s) this PR fixes:

Fixes #

Requirements:

  • uses conventional commit messages
  • includes documentation
  • adds unit tests
  • tested upgrade from previous version
  • commits are GPG signed and Github marks them as verified

Special notes for your reviewer:

Release note:

none

qweeah added 2 commits October 7, 2025 04:41
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
@qweeah qweeah changed the title feat: consume kubernetes packages on MAR feat: consume NI kubernetes packages on MAR Oct 7, 2025
…_oras call

Signed-off-by: Billy Zha <jinzha1@microsoft.com>
Comment thread parts/linux/cloud-init/artifacts/cse_helpers.sh
Comment thread parts/linux/cloud-init/artifacts/cse_install.sh Outdated
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
if [ "$i" -gt 1 ]; then
sleep $wait_sleep
fi
timeout 60 oras pull $url -o $target_folder --registry-config ${ORAS_REGISTRY_CONFIG_FILE} $extra_flags > $ORAS_OUTPUT 2>&1
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • timeout 60 oras pull privateace2enonanonpullwestus3.azurecr.io/aks/packages/kubernetes/kubelet:v1.32.7 -o /tmp/kubernetes/downloads/kubelet --registry-config /etc/oras/config.yaml '"--platform=linux/amd64:ubuntu' '22.04"'
  • '[' 1 -eq 0 ']'
  • cat /tmp/oras_verbose.out
    Error: "oras pull" requires exactly 1 argument but got 3
    Usage: oras pull [flags] {:|@}
    Please specify exactly 1 argument as the artifact reference you want to pull. Run "oras pull -h" for more options and examples

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems $* is buggy, let's switch back to $@. I will add unit test coverage for it.

Comment thread parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh Outdated
Comment thread parts/linux/cloud-init/artifacts/cse_config.sh
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
@qweeah qweeah force-pushed the qweeah/install-ni-pkg branch from 9a59747 to 6004bc4 Compare October 14, 2025 02:24
@qweeah qweeah force-pushed the qweeah/install-ni-pkg branch from 6004bc4 to e6f4862 Compare October 14, 2025 02:26
Comment thread parts/linux/cloud-init/artifacts/cse_install.sh Outdated
Comment thread parts/linux/cloud-init/artifacts/cse_install.sh
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
Comment thread parts/linux/cloud-init/artifacts/ubuntu/cse_helpers_ubuntu.sh Outdated
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
Comment thread parts/linux/cloud-init/artifacts/cse_install.sh
Copy link
Copy Markdown
Collaborator

@Devinwong Devinwong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved. Thanks.

@Devinwong
Copy link
Copy Markdown
Collaborator

The master branch updated with new customData files. So unfortunately you will need to rebase/merge with master, resolve the conflicts (just accepting all incoming should be fine), and then do make generate.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants