Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Azure/AgentBaker
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7d2fa7404b2b9564386297db71eb81844ba589c0
Choose a base ref
..
head repository: Azure/AgentBaker
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d2d6052641f464cbdd01c4547a837a5c5404533d
Choose a head ref
Showing with 230 additions and 538 deletions.
  1. +2 −6 parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh
  2. +1 −1 pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
  3. +2 −6 pkg/agent/testdata/AKSUbuntu1604+Containerd/line62.sh
  4. +1 −1 pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
  5. +2 −6 pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line62.sh
  6. +1 −1 pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
  7. +2 −6 pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line62.sh
  8. +1 −1 pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
  9. +2 −6 pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line62.sh
  10. +1 −1 pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
  11. +2 −6 pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line62.sh
  12. +1 −1 pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData
  13. +2 −6 pkg/agent/testdata/AKSUbuntu1604+Docker/line62.sh
  14. +1 −1 pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData
  15. +2 −6 pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line62.sh
  16. +1 −1 pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData
  17. +2 −6 pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line62.sh
  18. +1 −1 pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData
  19. +2 −6 pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line62.sh
  20. +1 −1 pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData
  21. +2 −6 pkg/agent/testdata/AKSUbuntu1604+K8S115/line62.sh
  22. +1 −1 pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData
  23. +2 −6 pkg/agent/testdata/AKSUbuntu1604+K8S117/line62.sh
  24. +1 −1 pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData
  25. +2 −6 pkg/agent/testdata/AKSUbuntu1604+K8S118/line62.sh
  26. +1 −1 pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData
  27. +2 −6 pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line62.sh
  28. +1 −1 pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData
  29. +2 −6 pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line62.sh
  30. +1 −1 pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData
  31. +2 −6 pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line62.sh
  32. +1 −1 pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData
  33. +2 −6 pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line62.sh
  34. +1 −1 pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData
  35. +2 −6 pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line62.sh
  36. +1 −1 pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData
  37. +2 −6 pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line62.sh
  38. +1 −1 pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData
  39. +2 −6 pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line62.sh
  40. +1 −1 pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData
  41. +2 −6 pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line62.sh
  42. +1 −1 pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData
  43. +2 −6 pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line62.sh
  44. +1 −1 pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData
  45. +2 −6 pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line62.sh
  46. +1 −1 pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData
  47. +2 −6 pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line62.sh
  48. +1 −1 pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData
  49. +2 −6 pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line62.sh
  50. +1 −1 pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData
  51. +2 −6 pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line62.sh
  52. +1 −1 pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData
  53. +2 −6 pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line62.sh
  54. +1 −1 pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData
  55. +2 −6 pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line62.sh
  56. +1 −1 pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData
  57. +2 −6 pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line62.sh
  58. +1 −1 pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData
  59. +2 −6 pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line62.sh
  60. +1 −1 pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData
  61. +2 −6 pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line62.sh
  62. +1 −1 pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData
  63. +2 −6 pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line62.sh
  64. +1 −1 pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData
  65. +2 −6 pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line62.sh
  66. +1 −1 pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData
  67. +2 −6 pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line62.sh
  68. +1 −1 pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData
  69. +2 −6 pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line62.sh
  70. +1 −1 pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData
  71. +2 −6 pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line62.sh
  72. +1 −1 pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData
  73. +2 −6 pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line62.sh
  74. +1 −1 pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData
  75. +2 −6 pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line62.sh
  76. +1 −1 pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData
  77. +2 −6 pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line62.sh
  78. +1 −1 pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData
  79. +2 −6 pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line62.sh
  80. +1 −1 pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData
  81. +2 −6 pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line62.sh
  82. +1 −1 pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData
  83. +2 −6 pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line62.sh
  84. +1 −1 pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData
  85. +2 −6 pkg/agent/testdata/AKSUbuntu1804+krustlet/line62.sh
  86. +1 −1 pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData
  87. +2 −6 pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line62.sh
  88. +1 −1 pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData
  89. +2 −6 pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line62.sh
  90. +1 −1 pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData
  91. +2 −6 pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line62.sh
  92. +1 −1 pkg/agent/testdata/AKSUbuntu2204+China/CustomData
  93. +2 −6 pkg/agent/testdata/AKSUbuntu2204+China/line62.sh
  94. +1 −1 pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData
  95. +2 −6 pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line62.sh
  96. +1 −1 pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData
  97. +2 −6 pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line62.sh
  98. +1 −1 pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData
  99. +2 −6 pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line62.sh
  100. +1 −1 pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData
  101. +2 −6 pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line62.sh
  102. +1 −1 pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
  103. +2 −6 pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line62.sh
  104. +1 −1 pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData
  105. +2 −6 pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line62.sh
  106. +1 −1 ...nt/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData
  107. +2 −6 ...ent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line62.sh
  108. +1 −1 pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData
  109. +2 −6 pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line62.sh
  110. +1 −1 pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData
  111. +2 −6 pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line62.sh
  112. +1 −1 pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData
  113. +2 −6 pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line62.sh
  114. +1 −1 pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData
  115. +2 −6 pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line62.sh
  116. +1 −1 pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData
  117. +2 −6 pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line62.sh
  118. +1 −1 pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData
  119. +2 −6 pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line62.sh
  120. +1 −1 pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData
  121. +2 −6 pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line62.sh
  122. +1 −1 pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData
  123. +2 −6 pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line62.sh
  124. +1 −1 pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData
  125. +2 −6 pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line62.sh
  126. +1 −1 pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData
  127. +2 −6 pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line62.sh
  128. +1 −1 pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData
  129. +2 −6 pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line62.sh
  130. +1 −1 pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData
  131. +2 −6 pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line62.sh
  132. +1 −1 pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData
  133. +2 −6 pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line62.sh
  134. +1 −1 pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData
  135. +2 −6 pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line62.sh
  136. +1 −1 pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData
  137. +2 −6 pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line62.sh
  138. +1 −1 pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData
  139. +2 −6 pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line62.sh
  140. +1 −1 pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData
  141. +2 −6 pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line62.sh
  142. +1 −1 pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData
  143. +2 −6 pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line62.sh
  144. +1 −1 pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData
  145. +2 −6 pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line62.sh
  146. +1 −1 pkg/agent/testdata/CustomizedImage/CustomData
  147. +2 −6 pkg/agent/testdata/CustomizedImage/line57.sh
  148. +1 −1 pkg/agent/testdata/CustomizedImageKata/CustomData
  149. +2 −6 pkg/agent/testdata/CustomizedImageKata/line57.sh
  150. +1 −1 pkg/agent/testdata/RawUbuntu/CustomData
  151. +2 −6 pkg/agent/testdata/RawUbuntu/line62.sh
  152. +1 −1 pkg/agent/testdata/RawUbuntuContainerd/CustomData
  153. +2 −6 pkg/agent/testdata/RawUbuntuContainerd/line62.sh
8 changes: 2 additions & 6 deletions parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
View file
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
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


- path: /opt/azure/containers/provision_configs.sh
8 changes: 2 additions & 6 deletions pkg/agent/testdata/AKSUbuntu1604+Containerd/line62.sh
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
View file
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
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


- path: /opt/azure/containers/provision_configs.sh
8 changes: 2 additions & 6 deletions pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line62.sh
View file
Original file line number Diff line number Diff line change
@@ -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
Loading