Skip to content

Commit

Permalink
add hard-coded containerd version and unit test
Browse files Browse the repository at this point in the history
  • Loading branch information
Devin Wong committed Oct 29, 2024
1 parent 083476c commit fc6896e
Show file tree
Hide file tree
Showing 174 changed files with 184 additions and 260 deletions.
3 changes: 1 addition & 2 deletions parts/linux/cloud-init/artifacts/cse_install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,8 @@ installContainerdWithComponentsJson() {
# containerd versions definitions are only available in the manifest file before the centralized packages changes, before around early July 2024.
# After the centralized packages changes, the containerd versions are only available in the components.json.
installContainerdWithManifestJson() {
local containerd_version
local containerd_version="1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1604+Containerd/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1604+Docker/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1604+K8S115/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1604+K8S117/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1604+K8S118/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line40.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ installContainerdWithComponentsJson() {
}

installContainerdWithManifestJson() {
local containerd_version
local containerd_version = "1.7.1-1"
if [ -f "$MANIFEST_FILEPATH" ]; then
local containerd_version
containerd_version="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
containerd_version="$(jq -r '.containerd.pinned."1804"' "$MANIFEST_FILEPATH")"
Expand Down
Loading

0 comments on commit fc6896e

Please sign in to comment.