Merge branch 'master' into imageBump/202403.13.0

Azure · Mar 14, 2024 · 2822aaa · 2822aaa
2 parents 57f8bda + e41b196
commit 2822aaa
Show file tree

Hide file tree

Showing 108 changed files with 47,814 additions and 1,668 deletions.
diff --git a/vhdbuilder/release-notes/AKSAzureLinux/gen1/202403.13.0-image-list.json b/vhdbuilder/release-notes/AKSAzureLinux/gen1/202403.13.0-image-list.json
diff --git a/vhdbuilder/release-notes/AKSAzureLinux/gen1/202403.13.0.txt b/vhdbuilder/release-notes/AKSAzureLinux/gen1/202403.13.0.txt
diff --git a/vhdbuilder/release-notes/AKSAzureLinux/gen1/latest-image-list.json b/vhdbuilder/release-notes/AKSAzureLinux/gen1/latest-image-list.json
@@ -1,6 +1,6 @@
 {
   "sku": "V2",
-  "imageVersion": "202403.04.0",
+  "imageVersion": "202403.13.0",
   "imageBom": [
     {
       "id": "sha256:00340387ee9d90fda9b6cfcaaf491b5815f04494f41142eb3b5ac3e86be63ef3",
@@ -74,15 +74,6 @@
         "sha256:519bfcb6ff1652c755f337e49dec8c8bbb026e036e04efb3a736a29161b5e5c1"
       ]
     },
-    {
-      "id": "sha256:0c00acac9c2794adfa8bb7b13ef38504300b505a043bf68dff7a00068dcc732b",
-      "repoTags": [
-        "mcr.microsoft.com/mirror/docker/library/busybox:1.35"
-      ],
-      "repoDigests": [
-        "sha256:02289a9972c5024cd2f083221f6903786e7f4cb4a9a9696f665d20dd6892e5d6"
-      ]
-    },
     {
       "id": "sha256:0fd342105129ca0a3f0abe9f26c3cd70c840846fa05902cfad12e3be4a4a7d66",
       "repoTags": [
@@ -128,6 +119,15 @@
         "sha256:adb9398505107d79e489ce6368e726eb6edec5118f0a037b68e0389506fde2f2"
       ]
     },
+    {
+      "id": "sha256:1c10e93757391bd459976f6382e0c0e03a0af3f239cd745424b06d3b4737f60e",
+      "repoTags": [
+        "mcr.microsoft.com/mirror/docker/library/busybox:1.35"
+      ],
+      "repoDigests": [
+        "sha256:9945bed2798b6faab08e5b7b7218ca043c87e9c600939ea7a8ae12aff369987e"
+      ]
+    },
     {
       "id": "sha256:1cf3a9cfb51a46ea81a3e7ad63cf188903d9548738dfd066e2c0b64c12c9eab5",
       "repoTags": [
@@ -146,6 +146,15 @@
         "sha256:335f48b27dbfb733c75650853d920b0e7e02b24640f436b347a12cc669827906"
       ]
     },
+    {
+      "id": "sha256:22259ce8c03a0bb35bb8ba5564cac3e7b49f3585b57470e0b627090313071267",
+      "repoTags": [
+        "mcr.microsoft.com/oss/azure/secrets-store/provider-azure:v1.5.1"
+      ],
+      "repoDigests": [
+        "sha256:55f5f15415e89bb45d89dbbd3a29c01ed11b624badc7365de4b302dc2c0d43b2"
+      ]
+    },
     {
       "id": "sha256:22d70746aedf4d8907d95ca74221a39b491fbd9611376f038295cb280637456c",
       "repoTags": [
@@ -317,15 +326,6 @@
         "sha256:dbcfeff8034e5cf158f378b5a0c303891d347d7f865128b46c60628c079a1bb4"
       ]
     },
-    {
-      "id": "sha256:52fdad1a38dbba1737f95c07878706bcfd522b7793fb25891973fbce93f6cbbd",
-      "repoTags": [
-        "mcr.microsoft.com/oss/azure/secrets-store/provider-azure:v1.5.0"
-      ],
-      "repoDigests": [
-        "sha256:a50ee13af205d9c766222a30647b10052234990056846874d88454d69c615dd4"
-      ]
-    },
     {
       "id": "sha256:558c17d33fb4572d93faeff724e5d00bb632e1c0d634f1d01b6915835d3e8023",
       "repoTags": [
@@ -506,15 +506,6 @@
         "sha256:5c8b09b954ee2ca62899a8b20127e8bcd0e2a96506fc142d256bc2430d1b04a3"
       ]
     },
-    {
-      "id": "sha256:8e307d642590848b621c64b4ef67c1310b10f81c1a6ed62ecd4a1450b5080f01",
-      "repoTags": [
-        "mcr.microsoft.com/oss/kubernetes-csi/secrets-store/driver:v1.4.0"
-      ],
-      "repoDigests": [
-        "sha256:7e574228e7b5102d0a9530d7743be7521e27c7c080d6f7cbed6c262903980367"
-      ]
-    },
     {
       "id": "sha256:8fc47335ae10727874b62c6eb3c03553c8dbcc5cf9287c97d6f4dd121bd3e02d",
       "repoTags": [
@@ -831,6 +822,15 @@
         "sha256:4510f7d064b90b24efc01346c166c100335f0ebf8de0a69eb299f8b63018f774"
       ]
     },
+    {
+      "id": "sha256:f1298b532f53009a663bef0f0713b9a53fb20484df70c31ed6520308c2acd203",
+      "repoTags": [
+        "mcr.microsoft.com/oss/kubernetes-csi/secrets-store/driver:v1.4.1"
+      ],
+      "repoDigests": [
+        "sha256:9f73e68b3ac9330da355b7edc81a35d00d6a1a524395b6888500ba05b7c9fc60"
+      ]
+    },
     {
       "id": "sha256:f6491711719a5e8a47c70ce07bf4aa8055b6eb2c3e8328d13f839eee91a1ece2",
       "repoTags": [

diff --git a/vhdbuilder/release-notes/AKSAzureLinux/gen1/latest.txt b/vhdbuilder/release-notes/AKSAzureLinux/gen1/latest.txt
@@ -1,4 +1,4 @@
-Starting build on  Mon Mar 4 09:06:11 UTC 2024
+Starting build on  Wed Mar 13 01:40:21 UTC 2024
 Components downloaded in this VHD build (some of the below components might get deleted during cluster provisioning if they are not needed):
   - containerd-wasm-shims v0.3.0 v0.5.1 v0.8.0
   - [installed] containerd v1.7.7-1
@@ -25,9 +25,9 @@ containerd images pre-pulled:
   - mcr.microsoft.com/oss/kubernetes/apiserver-network-proxy/agent:v0.0.33-hotfix.20221110
   - mcr.microsoft.com/oss/kubernetes/apiserver-network-proxy/agent:v0.1.6-hotfix.20240116
   - mcr.microsoft.com/oss/kubernetes-csi/secrets-store/driver:v1.3.4-1
-  - mcr.microsoft.com/oss/kubernetes-csi/secrets-store/driver:v1.4.0
+  - mcr.microsoft.com/oss/kubernetes-csi/secrets-store/driver:v1.4.1
   - mcr.microsoft.com/oss/azure/secrets-store/provider-azure:v1.4.1
-  - mcr.microsoft.com/oss/azure/secrets-store/provider-azure:v1.5.0
+  - mcr.microsoft.com/oss/azure/secrets-store/provider-azure:v1.5.1
   - mcr.microsoft.com/azuremonitor/containerinsights/ciprod:3.1.17
   - mcr.microsoft.com/aks/msi/addon-token-adapter:master.221118.2
   - mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.3-main-01-09-2024-a192d342
@@ -141,14 +141,14 @@ kubelet/kubectl downloaded:
 -rwxr-xr-x 1 root root  49704960 Dec 23 09:05 /usr/local/bin/kubectl-1.29.0
 -rwxr-xr-x 1 root root 111812608 Feb 15 09:01 /usr/local/bin/kubelet-1.29.2
 -rwxr-xr-x 1 root root  49704960 Feb 15 09:01 /usr/local/bin/kubectl-1.29.2
--rwxr-xr-x 1 root root       705 Mar  4 09:06 /usr/local/bin/ci-syslog-watcher.sh
--rwxr-xr-x 1 root root  36014944 Mar  4 09:08 /usr/local/bin/containerd-shim-spin-v0-3-0-v1
--rwxr-xr-x 1 root root  47622592 Mar  4 09:08 /usr/local/bin/containerd-shim-slight-v0-3-0-v1
--rwxr-xr-x 1 root root  45334640 Mar  4 09:11 /usr/local/bin/containerd-shim-spin-v0-5-1-v1
--rwxr-xr-x 1 root root  52232184 Mar  4 09:11 /usr/local/bin/containerd-shim-slight-v0-5-1-v1
--rwxr-xr-x 1 root root  53775024 Mar  4 09:13 /usr/local/bin/containerd-shim-spin-v0-8-0-v1
--rwxr-xr-x 1 root root  60175432 Mar  4 09:13 /usr/local/bin/containerd-shim-slight-v0-8-0-v1
--rwxr-xr-x 1 root root  39369104 Mar  4 09:13 /usr/local/bin/containerd-shim-wws-v0-8-0-v1
+-rwxr-xr-x 1 root root       705 Mar 13 01:40 /usr/local/bin/ci-syslog-watcher.sh
+-rwxr-xr-x 1 root root  36014944 Mar 13 01:42 /usr/local/bin/containerd-shim-spin-v0-3-0-v1
+-rwxr-xr-x 1 root root  47622592 Mar 13 01:42 /usr/local/bin/containerd-shim-slight-v0-3-0-v1
+-rwxr-xr-x 1 root root  45334640 Mar 13 01:45 /usr/local/bin/containerd-shim-spin-v0-5-1-v1
+-rwxr-xr-x 1 root root  52232184 Mar 13 01:45 /usr/local/bin/containerd-shim-slight-v0-5-1-v1
+-rwxr-xr-x 1 root root  53775024 Mar 13 01:47 /usr/local/bin/containerd-shim-spin-v0-8-0-v1
+-rwxr-xr-x 1 root root  60175432 Mar 13 01:47 /usr/local/bin/containerd-shim-slight-v0-8-0-v1
+-rwxr-xr-x 1 root root  39369104 Mar 13 01:47 /usr/local/bin/containerd-shim-wws-v0-8-0-v1
 === Installed Packages Begin
 filesystem-1.1-20.cm2.x86_64
 glibc-2.35-6.cm2.x86_64
@@ -171,9 +171,9 @@ libsepol-3.2-2.cm2.x86_64
 xz-5.2.5-1.cm2.x86_64
 kmod-29-2.cm2.x86_64
 kernel-5.15.148.2-2.cm2.x86_64
-mariner-release-2.0-59.cm2.noarch
+mariner-release-2.0-60.cm2.noarch
 shim-15.4-2.cm2.x86_64
-grub2-efi-binary-2.06-12.cm2.x86_64
+grub2-efi-binary-2.06-13.cm2.x86_64
 popt-1.18-1.cm2.x86_64
 slang-2.3.2-4.cm2.x86_64
 newt-0.52.21-5.cm2.x86_64
@@ -192,7 +192,6 @@ libgcrypt-1.10.3-1.cm2.x86_64
 glib-2.71.0-2.cm2.x86_64
 lz4-1.9.4-1.cm2.x86_64
 systemd-rpm-macros-250.3-19.cm2.noarch
-zstd-libs-1.5.0-1.cm2.x86_64
 libcap-ng-0.8.2-2.cm2.x86_64
 audit-libs-3.0.6-8.cm2.x86_64
 json-c-0.15-2.cm2.x86_64
@@ -267,11 +266,11 @@ tdnf-cli-libs-3.5.2-4.cm2.x86_64
 libpkgconf-1.8.0-3.cm2.x86_64
 pkgconf-1.8.0-3.cm2.x86_64
 pkgconf-pkg-config-1.8.0-3.cm2.x86_64
-bind-license-9.16.44-1.cm2.noarch
-libuv-1.43.0-1.cm2.x86_64
+bind-license-9.16.48-1.cm2.noarch
+libuv-1.43.0-2.cm2.x86_64
 libxml2-2.10.4-2.cm2.x86_64
-bind-libs-9.16.44-1.cm2.x86_64
-bind-utils-9.16.44-1.cm2.x86_64
+bind-libs-9.16.48-1.cm2.x86_64
+bind-utils-9.16.48-1.cm2.x86_64
 chrony-4.1-3.cm2.x86_64
 nghttp2-1.57.0-1.cm2.x86_64
 curl-libs-8.5.0-2.cm2.x86_64
@@ -315,8 +314,6 @@ python3-hawkey-0.63.1-2.cm2.x86_64
 elfutils-libelf-devel-0.186-2.cm2.x86_64
 xz-devel-5.2.5-1.cm2.x86_64
 zlib-devel-1.2.13-2.cm2.x86_64
-zstd-1.5.0-1.cm2.x86_64
-zstd-devel-1.5.0-1.cm2.x86_64
 elfutils-0.186-2.cm2.x86_64
 elfutils-devel-0.186-2.cm2.x86_64
 rpm-build-libs-4.18.0-4.cm2.x86_64
@@ -359,7 +356,7 @@ gptfdisk-1.0.8-1.cm2.x86_64
 mpfr-4.1.0-2.cm2.x86_64
 gawk-5.1.1-1.cm2.x86_64
 cloud-utils-growpart-0.32-3.cm2.noarch
-grub2-2.06-12.cm2.x86_64
+grub2-2.06-13.cm2.x86_64
 installkernel-1.0.0-2.cm2.noarch
 grubby-8.40-46.cm2.x86_64
 hyperv-daemons-license-5.15.148.2-1.cm2.noarch
@@ -373,7 +370,6 @@ ethtool-5.16-2.cm2.x86_64
 snappy-1.1.9-3.cm2.x86_64
 kexec-tools-2.0.23-3.cm2.x86_64
 libnl3-3.5.0-4.cm2.x86_64
-wpa_supplicant-2.10-1.cm2.x86_64
 netplan-0.95-2.cm2.x86_64
 ncurses-term-6.4-2.cm2.x86_64
 openssh-server-8.9p1-4.cm2.x86_64
@@ -383,7 +379,7 @@ gc-8.0.0-4.cm2.x86_64
 libmpc-1.2.1-1.cm2.x86_64
 libstdc++-devel-11.2.0-8.cm2.x86_64
 liblognorm-2.0.6-2.cm2.x86_64
-postgresql-libs-14.10-1.cm2.x86_64
+postgresql-libs-14.11-1.cm2.x86_64
 autogen-libopts-5.18.16-8.cm2.x86_64
 cyrus-sasl-2.1.28-4.cm2.x86_64
 librdkafka1-1.8.2-2.cm2.x86_64
@@ -597,6 +593,10 @@ wireless-regdb-2022.08.12-1.cm2.noarch
 gpg-pubkey-3135ce90-5e6fda74
 gpg-pubkey-be1229cf-5631588c
 inotify-tools-3.22.1.0-1.cm2.x86_64
+zstd-libs-1.5.4-1.cm2.x86_64
+zstd-1.5.4-1.cm2.x86_64
+zstd-devel-1.5.4-1.cm2.x86_64
+wpa_supplicant-2.10-2.cm2.x86_64
 fuse-2.9.7-10.cm2.x86_64
 boost-1.76.0-4.cm2.x86_64
 blobfuse-1.4.5-14.cm2.x86_64
@@ -657,7 +657,7 @@ jansson-2.14-1.cm2.x86_64
 nftables-1.0.1-2.cm2.x86_64
 moby-runc-1.1.9-5.cm2.x86_64
 moby-containerd-1.6.26-4.cm2.x86_64
-acr-mirror-0.2.7-1.x86_64
+acr-mirror-0.2.8-1.x86_64
 llvm-12.0.1-7.cm2.x86_64
 binutils-devel-2.37-8.cm2.x86_64
 binutils-2.37-8.cm2.x86_64
@@ -676,14 +676,14 @@ Filesystem      Size  Used Avail Use% Mounted on
 devtmpfs        4.0M     0  4.0M   0% /dev
 tmpfs           3.3G     0  3.3G   0% /dev/shm
 tmpfs           1.4G  8.8M  1.3G   1% /run
-/dev/sda3        29G   24G  4.3G  85% /
+/dev/sdb3        29G   24G  4.3G  85% /
 tmpfs           3.3G  4.0K  3.3G   1% /tmp
-/dev/sda2       452M   36M  382M   9% /boot
-/dev/sdb1        14G   28K   13G   1% /mnt
+/dev/sdb2       452M   36M  382M   9% /boot
+/dev/sda1        14G   28K   13G   1% /mnt
 tmpfs           668M     0  668M   0% /run/user/1000
 === os-release Begin
 NAME="Common Base Linux Mariner"
-VERSION="2.0.20240223"
+VERSION="2.0.20240301"
 ID=mariner
 VERSION_ID="2.0"
 PRETTY_NAME="CBL-Mariner/Linux"
@@ -694,10 +694,10 @@ SUPPORT_URL="https://aka.ms/cbl-mariner"
 === os-release End
 Using kernel:
 Linux version 5.15.148.2-2.cm2 (root@CBL-Mariner) (gcc (GCC) 11.2.0, GNU ld (GNU Binutils) 2.37) #1 SMP Fri Feb 23 23:44:30 UTC 2024
-Install completed successfully on  Mon Mar 4 09:28:49 UTC 2024
-VSTS Build NUMBER: 20240304.1_master_88710846
-VSTS Build ID: 88710846
-Commit: be0828039ca9c7ac9ff8b15470292886226beb1d
+Install completed successfully on  Wed Mar 13 02:03:23 UTC 2024
+VSTS Build NUMBER: 20240312.3_master_89330270
+VSTS Build ID: 89330270
+Commit: 4cfc581567696ed975e28978452bec8084654961
 Ubuntu version: 
 Hyperv generation: V1
 Feature flags: None