Merge branch 'master' into pahealy/fix-aks-log-collector

Azure · Feb 15, 2024 · 73da628 · 73da628
2 parents 52f7336 + 7ab28e9
commit 73da628
Show file tree

Hide file tree

Showing 114 changed files with 45,717 additions and 490 deletions.
diff --git a/e2e/scenario/base_vhd_catalog.json b/e2e/scenario/base_vhd_catalog.json
@@ -2,17 +2,17 @@
     "ubuntu1804": {
         "gen2containerd": {
             "artifactName": "1804-gen2-containerd",
-            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/1804Gen2/versions/1.1699020623.27601"
+            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/1804Gen2/versions/1.1707351757.24005"
         }
     },
     "ubuntu2204": {
         "gen2arm64containerd": {
             "artifactName": "2204-arm64-gen2-containerd",
-            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/2204Gen2Arm64/versions/1.1699146996.11679"
+            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/2204Gen2Arm64/versions/1.1707351609.8691"
         },
         "gen2containerd": {
             "artifactName": "2204-gen2-containerd",
-            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/2204Gen2/versions/1.1699020621.21398"
+            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/2204Gen2/versions/1.1707351742.21148"
         },
         "gen2containerdprivatekubepkg": {
             "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/2204Gen2/versions/1.1704411049.2812"
@@ -21,21 +21,21 @@
     "azurelinuxv2": {
         "gen2arm64": {
             "artifactName": "azurelinuxv2-gen2-arm64",
-            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/AzureLinuxV2Gen2Arm64/versions/1.1699146999.31863"
+            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/AzureLinuxV2Gen2Arm64/versions/1.1707351611.19505"
         },
         "gen2": {
             "artifactName": "azurelinuxv2-gen2",
-            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/AzureLinuxV2Gen2/versions/1.1699020620.29300"
+            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/AzureLinuxV2Gen2/versions/1.1707351621.9878"
         }
     },
     "cblmarinerv2": {
         "gen2arm64": {
             "artifactName": "marinerv2-gen2-arm64",
-            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/CBLMarinerV2Gen2Arm64/versions/1.1699146990.16638"
+            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/CBLMarinerV2Gen2Arm64/versions/1.1707351626.25667"
         },
         "gen2": {
             "artifactName": "marinerv2-gen2",
-            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/CBLMarinerV2Gen2/versions/1.1699020635.14957"
+            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/CBLMarinerV2Gen2/versions/1.1707351721.29111"
         }
     }
 }
diff --git a/parts/linux/cloud-init/artifacts/init-aks-custom-cloud.sh b/parts/linux/cloud-init/artifacts/init-aks-custom-cloud.sh
@@ -35,9 +35,13 @@ sudo sed -i "s,http://.[^ ]*,$repoDepotEndpoint,g" /etc/apt/sources.list
 systemctl stop systemd-timesyncd
 systemctl disable systemd-timesyncd
 
-apt-get update
-apt-get install chrony -y
-cat > /etc/chrony/chrony.conf <<EOF
+chrony_conf="/etc/chrony/chrony.conf"
+if [ ! -e "$chrony_conf" ]; then
+    apt-get update
+    apt-get install chrony -y
+fi
+
+cat > $chrony_conf <<EOF
 # Welcome to the chrony configuration file. See chrony.conf(5) for more
 # information about usuable directives.
 

diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData
@@ -81,7 +81,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/reconcilePrivateHosts.sh
   permissions: "0744"

diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line84.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line84.sh
@@ -30,9 +30,13 @@ sudo sed -i "s,http://.[^ ]*,$repoDepotEndpoint,g" /etc/apt/sources.list
 systemctl stop systemd-timesyncd
 systemctl disable systemd-timesyncd
 
-apt-get update
-apt-get install chrony -y
-cat > /etc/chrony/chrony.conf <<EOF
+chrony_conf="/etc/chrony/chrony.conf"
+if [ ! -e "$chrony_conf" ]; then
+    apt-get update
+    apt-get install chrony -y
+fi
+
+cat > $chrony_conf <<EOF
 
 #
 #pool ntp.ubuntu.com        iburst maxsources 4

diff --git a/pkg/templates/templates_generated.go b/pkg/templates/templates_generated.go
diff --git a/vhdbuilder/packer/install-dependencies.sh b/vhdbuilder/packer/install-dependencies.sh
@@ -220,17 +220,17 @@ if [[ $OS == $UBUNTU_OS_NAME && $(isARM64) != 1 ]]; then  # no ARM64 SKU with GP
       exit $ret
     fi
   fi
+
+  cat << EOF >> ${VHD_LOGS_FILEPATH}
+  - nvidia-driver=${NVIDIA_DRIVER_IMAGE_TAG}
+EOF
 fi
 
 ls -ltr /opt/gpu/* >> ${VHD_LOGS_FILEPATH}
 
 installBpftrace
 echo "  - $(bpftrace --version)" >> ${VHD_LOGS_FILEPATH}
 
-cat << EOF >> ${VHD_LOGS_FILEPATH}
-  - nvidia-driver=${NVIDIA_DRIVER_IMAGE_TAG}
-EOF
-
 installBcc
 cat << EOF >> ${VHD_LOGS_FILEPATH}
   - bcc-tools