Skip to content

Commit

Permalink
Remove more manifest.json references
Browse files Browse the repository at this point in the history
  • Loading branch information
ganeshkumarashok committed Oct 29, 2024
1 parent 589a1f3 commit 4eae766
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 23 deletions.
1 change: 0 additions & 1 deletion pkg/agent/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ const (
tlsBootstrapDropin = "linux/cloud-init/artifacts/10-tlsbootstrap.conf"
bindMountDropin = "linux/cloud-init/artifacts/10-bindmount.conf"
httpProxyDropin = "linux/cloud-init/artifacts/10-httpproxy.conf"
componentManifestFile = "linux/cloud-init/artifacts/manifest.json"
)

// cloud-init destination file references.
Expand Down
1 change: 0 additions & 1 deletion pkg/agent/variables.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ func getCustomDataVariables(config *datamodel.NodeBootstrappingConfiguration) pa
"packageUpdateScriptMariner": getBase64EncodedGzippedCustomScript(packageUpdateScriptMariner, config),
"packageUpdateServiceMariner": getBase64EncodedGzippedCustomScript(packageUpdateSystemdServiceMariner, config),
"packageUpdateTimerMariner": getBase64EncodedGzippedCustomScript(packageUpdateSystemdTimerMariner, config),
"componentManifestFile": getBase64EncodedGzippedCustomScript(componentManifestFile, config),
},
}

Expand Down
1 change: 0 additions & 1 deletion vhdbuilder/packer/pre-install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ COMPONENTS_FILEPATH=/opt/azure/components.json
PERFORMANCE_DATA_FILE=/opt/azure/vhd-build-performance-data.json
#this is used by post build test to check whether the compoenents do indeed exist
cat components.json > ${COMPONENTS_FILEPATH}
cat manifest.json > ${MANIFEST_FILEPATH}
echo "Starting build on " $(date) > ${VHD_LOGS_FILEPATH}

if isMarinerOrAzureLinux "$OS"; then
Expand Down
5 changes: 0 additions & 5 deletions vhdbuilder/packer/vhd-image-builder-arm64-gen2.json
Original file line number Diff line number Diff line change
Expand Up @@ -319,11 +319,6 @@
"source": "parts/linux/cloud-init/artifacts/components.json",
"destination": "/home/packer/components.json"
},
{
"type": "file",
"source": "parts/linux/cloud-init/artifacts/manifest.json",
"destination": "/home/packer/manifest.json"
},
{
"type": "file",
"source": "parts/linux/cloud-init/artifacts/sysctl-d-60-CIS.conf",
Expand Down
5 changes: 0 additions & 5 deletions vhdbuilder/packer/vhd-image-builder-base.json
Original file line number Diff line number Diff line change
Expand Up @@ -321,11 +321,6 @@
"source": "parts/linux/cloud-init/artifacts/components.json",
"destination": "/home/packer/components.json"
},
{
"type": "file",
"source": "parts/linux/cloud-init/artifacts/manifest.json",
"destination": "/home/packer/manifest.json"
},
{
"type": "file",
"source": "parts/linux/cloud-init/artifacts/sysctl-d-60-CIS.conf",
Expand Down
5 changes: 0 additions & 5 deletions vhdbuilder/packer/vhd-image-builder-mariner-arm64.json
Original file line number Diff line number Diff line change
Expand Up @@ -298,11 +298,6 @@
"source": "parts/linux/cloud-init/artifacts/components.json",
"destination": "/home/packer/components.json"
},
{
"type": "file",
"source": "parts/linux/cloud-init/artifacts/manifest.json",
"destination": "/home/packer/manifest.json"
},
{
"type": "file",
"source": "parts/linux/cloud-init/artifacts/sysctl-d-60-CIS.conf",
Expand Down
5 changes: 0 additions & 5 deletions vhdbuilder/packer/vhd-image-builder-mariner.json
Original file line number Diff line number Diff line change
Expand Up @@ -315,11 +315,6 @@
"source": "parts/linux/cloud-init/artifacts/components.json",
"destination": "/home/packer/components.json"
},
{
"type": "file",
"source": "parts/linux/cloud-init/artifacts/manifest.json",
"destination": "/home/packer/manifest.json"
},
{
"type": "file",
"source": "parts/linux/cloud-init/artifacts/sysctl-d-60-CIS.conf",
Expand Down

0 comments on commit 4eae766

Please sign in to comment.