Skip to content

Commit 01a9cba

Browse files
committed
fix: only provision Ubuntu with /opt/azure/manifest.json
It's a legacy file with .deb package data, and Flatcar needs to save space in OSProfile. Also the `MANIFEST_FILEPATH` references in the tests were unused. Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
1 parent d7b6fc4 commit 01a9cba

3 files changed

Lines changed: 2 additions & 3 deletions

File tree

parts/linux/cloud-init/nodecustomdata.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,14 @@ write_files:
118118
content: !!binary |
119119
{{GetVariableProperty "cloudInitData" "provisionConfigs"}}
120120

121+
{{ if not (or IsMariner IsFlatcar) -}}
121122
- path: /opt/azure/manifest.json
122123
permissions: "0644"
123124
encoding: gzip
124125
owner: root
125126
content: !!binary |
126127
{{GetVariableProperty "cloudInitData" "componentManifestFile"}}
128+
{{- end }}
127129

128130
- path: {{GetInitAKSCustomCloudFilepath}}
129131
permissions: "0744"

vhdbuilder/packer/pre-install-dependencies.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ CPU_ARCH=$(getCPUArch) #amd64 or arm64
2020
VHD_LOGS_FILEPATH=/opt/azure/vhd-install.complete
2121
COMPONENTS_FILEPATH=/opt/azure/components.json
2222
PERFORMANCE_DATA_FILE=/opt/azure/vhd-build-performance-data.json
23-
MANIFEST_FILEPATH=/opt/azure/manifest.json
2423
#this is used by post build test to check whether the compoenents do indeed exist
2524
cat components.json > ${COMPONENTS_FILEPATH}
26-
cat manifest.json > ${MANIFEST_FILEPATH}
2725
echo "Starting build on " $(date) > ${VHD_LOGS_FILEPATH}
2826

2927
if isMarinerOrAzureLinux "$OS"; then

vhdbuilder/packer/test/linux-vhd-content-test.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/bin/bash
22
COMPONENTS_FILEPATH=/opt/azure/components.json
3-
MANIFEST_FILEPATH=/opt/azure/manifest.json
43
VHD_LOGS_FILEPATH=/opt/azure/vhd-install.complete
54
UBUNTU_OS_NAME="UBUNTU"
65
MARINER_OS_NAME="MARINER"

0 commit comments

Comments
 (0)