Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleanup: remove stale conditional to update PMC #5461

Merged
merged 117 commits into from
Jan 31, 2025
Merged

cleanup: remove stale conditional to update PMC #5461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
9a3d354
sync(dev): Fix 24.04 ARM64 pipeline (#5181) (#5185)
cameronmeissner Oct 30, 2024
6279c49
chore: add dev branch to required PR workflow triggers (#5186)
cameronmeissner Oct 30, 2024
4f0281f
fix: append existing env variables to provision cmd (#5187)
lilypan26 Oct 31, 2024
ced4be1
test: add e2e test for kubelet configs (#5180)
bravebeaver Oct 31, 2024
bc8fb32
fix lint errors (#5174)
r2k1 Nov 3, 2024
654ed86
Rename node-bootstrapper => aks-node-controller (#5191)
r2k1 Nov 3, 2024
7342099
rename nbccontract => aksnodeconfig (#5193)
r2k1 Nov 3, 2024
0229dfc
Renovate config fix for AKS GPU CUDA and GRID updates (all types of v…
ganeshkumarashok Nov 4, 2024
69e31e4
feat: allow configuring base/target branch for automatic release note…
cameronmeissner Nov 4, 2024
2306976
chore: automated PR to update ReleaseNotes for 202411.03.0 VHD (#5221)
cameronmeissner Nov 4, 2024
6d63962
chore: automated PR to update VHDVersion for 202411.03.0 VHD (#5220)
cameronmeissner Nov 4, 2024
9a42fce
fix: add retry for initial trivy scan to handle 429's from ghcr on DB…
cameronmeissner Nov 5, 2024
d0a5460
feat: add scriptless bootstrap status poller (#5173)
lilypan26 Nov 5, 2024
2c4d823
Use nvidia container toolkit version from components.json, for Az Lin…
ganeshkumarashok Nov 5, 2024
37c7006
adding Trivy DB fallbacks (#5225)
djsly Nov 5, 2024
ae7e79c
chore: add tests for aks-node-controller provision wait (#5226)
lilypan26 Nov 6, 2024
23af207
bump to latest cri-tools 1.31.1 for CVE fixes (#5228)
djsly Nov 7, 2024
e3df88e
test: add e2e test for customkubeletconfig on azure linux v2 (#5183)
bravebeaver Nov 7, 2024
cebe606
chore: set default automation target branch to dev (#5238)
cameronmeissner Nov 11, 2024
bb5a6c9
chore: automated PR to update ReleaseNotes for 202411.10.0 VHD (#5240)
cameronmeissner Nov 11, 2024
bc3a602
chore: add binaries for 1.27.101 lts (#5200)
wenhug Nov 11, 2024
071d3b5
chore: add aks-node-controller doc (#5248)
lilypan26 Nov 12, 2024
645c502
fix components.json for aks 1.27.101 (#5250)
wenhug Nov 12, 2024
2a9548d
chore: cleanup + refactor for test infra migration (#5235)
cameronmeissner Nov 12, 2024
67bec7f
chore: set default abe2e branch selector to dev (#5255)
cameronmeissner Nov 12, 2024
a3120c3
feat: bump windows base image 2024-11B for Windows 2019, 2022, and 23…
timmy-wright Nov 13, 2024
a812b7e
try not to fail if performance data file is not set (#5262)
timmy-wright Nov 14, 2024
d874464
feat: update windows release notes for 2024-11 (#5272)
AbelHu Nov 15, 2024
c82920d
fix vhd_name env variable for trivy script (#5219)
jason1028kr Nov 15, 2024
686a986
revert: automated PR to update ReleaseNotes for 202411.10.0 VHD (#5275)
cameronmeissner Nov 15, 2024
c97624f
chore: automated PR to update ReleaseNotes for 202411.12.0 VHD (#5254)
cameronmeissner Nov 15, 2024
196afeb
chore: rename nbcontract to AKSNodeConfig (#5276)
Devinwong Nov 15, 2024
421a38c
chore: automated PR to update VHDVersion for 202411.12.0 VHD (#5253)
cameronmeissner Nov 15, 2024
a46c5d5
chore: rename leading aKS to aks in tests (#5279)
Devinwong Nov 16, 2024
4c84bee
feat: onboard kubernetes-binaries, azure-acr-credential-provider and …
Devinwong Nov 16, 2024
216a1b8
fix: packer vnet RG name resolution for prod builds (#5282)
cameronmeissner Nov 18, 2024
79dce3f
feat: add dedicated pipeline variable to determine whether to publish…
cameronmeissner Nov 18, 2024
1ed6c39
feat: use aks-node-assistant for VHD automation (#5287)
cameronmeissner Nov 18, 2024
e179c0c
Clean public interface for aks-node-controller (#5285)
r2k1 Nov 19, 2024
ce6c3dd
fix: add start and end symbols for source branch validation (#5263)
junjiezhang1997 Nov 19, 2024
84ff546
feat: Update WS2022 gen2 base image to 2024-11B (#5291)
AbelHu Nov 19, 2024
7e32b44
fix: add vhdbuilder sub-modules to go.work (#5294)
cameronmeissner Nov 19, 2024
78facfd
run buf workflow only on proto files change (#5290)
r2k1 Nov 19, 2024
5e26a68
feat: change from a bool value for bootstrapping auth method to an en…
timmy-wright Nov 19, 2024
ee19195
chore: fix readme (#5296)
timmy-wright Nov 19, 2024
8bf4ab5
chore: update assignee and tab for azure-acr-credential-provider (#5295)
Devinwong Nov 19, 2024
f40de5b
fix: ensure /mnt is mounted before bind-mount.service (#5297)
lilypan26 Nov 19, 2024
ac9dabf
fix e2e (#5302)
r2k1 Nov 20, 2024
b130298
docs: add release notes for WS2022 gen2 with 2024.11B (#5308)
AbelHu Nov 20, 2024
0ea9430
fix: handle missing MC resource group on abe2e clusters (#5314)
cameronmeissner Nov 21, 2024
2cb434c
Improve proto generation (#5312)
r2k1 Nov 21, 2024
0d97c1d
use azurelinux from mcr as a base image for protoc (#5324)
r2k1 Nov 22, 2024
569b722
bug: cve-2013-3900 (#5323)
timmy-wright Nov 22, 2024
72d76d9
fix: change vhds for ubuntu2204 network isolated tests (#5313)
AlisonB319 Nov 22, 2024
c0724c2
chore: more descriptive pod logs (#5326)
AlisonB319 Nov 23, 2024
0a42e31
fix: updates packages for cvm (#5328)
zachary-bailey Nov 25, 2024
fc7bb92
chore(deps): update dependency moby-containerd to v1.7.24-ubuntu20.04…
renovate[bot] Nov 25, 2024
1d96357
chore(deps): update dependency moby-containerd to v1.7.24-ubuntu22.04…
renovate[bot] Nov 25, 2024
b5c63c8
chore(deps): bump google.golang.org/protobuf from 1.33.0 to 1.35.2 (#…
dependabot[bot] Nov 25, 2024
5559546
fix airgapped cluster e2e image pull (#5316)
fseldow Nov 26, 2024
9af40f8
chore: update CODEOWNERS with nodecustomdata.yml and README (#5333)
lilypan26 Nov 26, 2024
ddf36a2
Windows E2E (#5249)
r2k1 Nov 27, 2024
9d4e495
Make E2E validation more flexible. (#5334)
r2k1 Nov 29, 2024
364c79c
Fix e2e (#5336)
r2k1 Nov 30, 2024
a609fdb
fix: git config for VHD automation (#5341)
cameronmeissner Dec 2, 2024
5468150
feat: dedicated garbage collection pipeline (#5325)
cameronmeissner Dec 3, 2024
3b8660a
test: run real GPU workload (#5337)
r2k1 Dec 4, 2024
0888591
fix: python package vuln (#5357)
zachary-bailey Dec 4, 2024
60fda2e
fix: have scanning VMs use correct vnet subnet (#5360)
cameronmeissner Dec 4, 2024
4b273ca
fix: confidential machine CVEs for December (#5363)
zachary-bailey Dec 4, 2024
9badd0d
feat: delete acr and recreate if cache rule is wrong (#5354)
AlisonB319 Dec 4, 2024
0a176ad
chore(deps): update aks/aks-gpu-cuda docker tag to v550.127.08-202412…
renovate[bot] Dec 4, 2024
5993fd1
fix: resolve Azure Linux nvidia-container-toolkit posttrans error (#5…
henryli001 Dec 5, 2024
04d10b7
chore(deps): update aks/aks-gpu-grid docker tag to v535.161.08-202412…
renovate[bot] Dec 5, 2024
c4de1e6
fix: scanning and resource group tags, use packer subnet for linux te…
cameronmeissner Dec 5, 2024
5e626a1
chore: rename airgap e2e resources with dev (#5374)
AlisonB319 Dec 5, 2024
a8cf455
fix: stop dnf from overwriting motd on azure linux nodes if motd is e…
UtheMan Dec 5, 2024
4b8502a
feat: use github app for VHD automation tasks (#5379)
cameronmeissner Dec 6, 2024
9d8d22d
feat: ensure user provided motd is displayed on ubuntu nodes when dyn…
UtheMan Dec 6, 2024
6ca6be9
chore: automated PR to update ReleaseNotes for 202412.04.0 VHD (#5376)
Dec 6, 2024
a5e8ea5
chore: automated PR to update VHDVersion for 202412.04.0 VHD (#5375)
Dec 6, 2024
bee9cc9
chore: upgrade oras version (#5385)
AlisonB319 Dec 6, 2024
c0f8cc2
refactor: packer vnet resolution (#5347)
cameronmeissner Dec 8, 2024
43298e8
fix: cgroup enablement syntax bug (#5388)
zachary-bailey Dec 9, 2024
082bf9f
chore: update Kubernetes versions add binary for 1.29.11,1.30.7,1.31.…
wenhug Dec 9, 2024
e8d5a1d
chore: add myself as a codeowner (#5399)
zachary-bailey Dec 9, 2024
f7ffe60
test: e2e fixes and improvements (#5362)
r2k1 Dec 10, 2024
bbd3ba6
chore: update 2404 base image and turn on weekly builds to be in sync…
anujmaheshwari1 Dec 10, 2024
eb360a6
chore: onboard windows automation to aks-node-sig-release-assistant (…
cameronmeissner Dec 10, 2024
16c95f2
fix: always specify agent identity ID when logging into azure for lin…
cameronmeissner Dec 11, 2024
c0a50d0
test: log SSH instructions (#5413)
r2k1 Dec 12, 2024
b531a3e
security: Windows update to 2024-12b (#5409)
timmy-wright Dec 13, 2024
1efe1be
fixing codeql warnings (#5421)
djsly Dec 13, 2024
9cae229
fix: codeql reports that go toolchain want 1.N.P format (#5426)
djsly Dec 14, 2024
be74e9b
chore: automated PR to update ReleaseNotes for 202412.10.0 VHD (#5405)
aks-node-sig-release-assistant[bot] Dec 15, 2024
f13a779
chore: automated PR to update VHDVersion for 202412.10.0 VHD (#5404)
aks-node-sig-release-assistant[bot] Dec 15, 2024
341885f
chore: use jq to bump image version rather than string replace (#5432)
timmy-wright Dec 16, 2024
848a56b
bug: set mode (#5436)
timmy-wright Dec 16, 2024
e1110bd
feat: use token for attaching ua (#5423)
cameronmeissner Dec 16, 2024
fd8cfed
Remove go workspaces (#5428)
r2k1 Dec 16, 2024
05a3f9b
chore(deps): bump golang.org/x/crypto from 0.27.0 to 0.31.0 in /e2e (…
dependabot[bot] Dec 16, 2024
b914cd3
chore: explicitly declare ua token variable group (#5440)
cameronmeissner Dec 16, 2024
cc3145c
fix: remove kubelet flag azure-container-registry-config (#5438)
AlisonB319 Dec 17, 2024
1b473cf
Fix: output curl output on error for retrycmd_curl_file (#5424)
djsly Dec 17, 2024
e74b23a
chore(deps): cache CNI/CNS v1.4.58 (#5441)
behzad-mir Dec 17, 2024
eec1cb9
chore: add dedicated pipeline variable for E2E location (#5447)
cameronmeissner Dec 18, 2024
e6b6d5d
cleanup: delete stale owners file (#5449)
anujmaheshwari1 Dec 18, 2024
4030f1c
cleanup: combine Linux/Windows test E2E pipelines (#5358)
r2k1 Dec 18, 2024
82a140b
chore: don't run e2e in PR when VHD builds fail (#5448)
timmy-wright Dec 18, 2024
97ff23a
chore: Update .NET patch version for Windows (#5445)
timmy-wright Dec 18, 2024
4c7a34d
test: Testing 💚: add e2e for seccomp on ARM64 (#5435)
bravebeaver Dec 18, 2024
08cdb03
chore: windows VHD build pipeline tweaks (#5453)
timmy-wright Dec 19, 2024
52ddca4
chore: bump oras version (#5459)
AlisonB319 Dec 19, 2024
035c7e1
cleanup: remove stale conditional to update PMC
Dec 19, 2024
0e02661
fix: resolve conflicts
Jan 31, 2025
843e36c
fix: make generate
Jan 31, 2025
0f111c7
Merge branch 'master' into amaheshwari/fixPMC
anujmaheshwari1 Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,8 @@ removeContainerd() {
}

installDeps() {
if [[ $(isARM64) == 1 ]]; then
wait_for_apt_locks
retrycmd_if_failure_no_stats 120 5 25 curl -fsSL https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/packages-microsoft-prod.deb > /tmp/packages-microsoft-prod.deb || exit $ERR_MS_PROD_DEB_DOWNLOAD_TIMEOUT
else
retrycmd_if_failure_no_stats 120 5 25 curl -fsSL https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/packages-microsoft-prod.deb > /tmp/packages-microsoft-prod.deb || exit $ERR_MS_PROD_DEB_DOWNLOAD_TIMEOUT
fi
wait_for_apt_locks
retrycmd_if_failure_no_stats 120 5 25 curl -fsSL https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/packages-microsoft-prod.deb > /tmp/packages-microsoft-prod.deb || exit $ERR_MS_PROD_DEB_DOWNLOAD_TIMEOUT
retrycmd_if_failure 60 5 10 dpkg -i /tmp/packages-microsoft-prod.deb || exit $ERR_MS_PROD_DEB_PKG_ADD_FAIL

aptmarkWALinuxAgent hold
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
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


- path: /opt/azure/containers/provision_configs.sh
Expand Down
8 changes: 2 additions & 6 deletions pkg/agent/testdata/AKSUbuntu1604+Containerd/line62.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,8 @@ removeContainerd() {
}

installDeps() {
if [[ $(isARM64) == 1 ]]; then
wait_for_apt_locks
retrycmd_if_failure_no_stats 120 5 25 curl -fsSL https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/packages-microsoft-prod.deb > /tmp/packages-microsoft-prod.deb || exit $ERR_MS_PROD_DEB_DOWNLOAD_TIMEOUT
else
retrycmd_if_failure_no_stats 120 5 25 curl -fsSL https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/packages-microsoft-prod.deb > /tmp/packages-microsoft-prod.deb || exit $ERR_MS_PROD_DEB_DOWNLOAD_TIMEOUT
fi
wait_for_apt_locks
retrycmd_if_failure_no_stats 120 5 25 curl -fsSL https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/packages-microsoft-prod.deb > /tmp/packages-microsoft-prod.deb || exit $ERR_MS_PROD_DEB_DOWNLOAD_TIMEOUT
retrycmd_if_failure 60 5 10 dpkg -i /tmp/packages-microsoft-prod.deb || exit $ERR_MS_PROD_DEB_PKG_ADD_FAIL

aptmarkWALinuxAgent hold
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
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


- path: /opt/azure/containers/provision_configs.sh
Expand Down
8 changes: 2 additions & 6 deletions pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line62.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,8 @@ removeContainerd() {
}

installDeps() {
if [[ $(isARM64) == 1 ]]; then
wait_for_apt_locks
retrycmd_if_failure_no_stats 120 5 25 curl -fsSL https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/packages-microsoft-prod.deb > /tmp/packages-microsoft-prod.deb || exit $ERR_MS_PROD_DEB_DOWNLOAD_TIMEOUT
else
retrycmd_if_failure_no_stats 120 5 25 curl -fsSL https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/packages-microsoft-prod.deb > /tmp/packages-microsoft-prod.deb || exit $ERR_MS_PROD_DEB_DOWNLOAD_TIMEOUT
fi
wait_for_apt_locks
retrycmd_if_failure_no_stats 120 5 25 curl -fsSL https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/packages-microsoft-prod.deb > /tmp/packages-microsoft-prod.deb || exit $ERR_MS_PROD_DEB_DOWNLOAD_TIMEOUT
retrycmd_if_failure 60 5 10 dpkg -i /tmp/packages-microsoft-prod.deb || exit $ERR_MS_PROD_DEB_PKG_ADD_FAIL

aptmarkWALinuxAgent hold
Expand Down
Loading
Loading