Skip to content

Commit

Permalink
Containerd 1.6.4 for k8s >= 1.24 (Azure#1610)
Browse files Browse the repository at this point in the history 
* add edge version 1.23 to manifest and install containerd 1.6 for k8s >= 1.23 in cse_install

* make generate

* update manifest.json with 1.6.1-1

* update manifest.cue (since generate overrides manifest.json) and generate

* make generate

* update for k8s >= 1.24

* upgrade to containerd 1.6.4-1 from 1.6.1-1

Co-authored-by: Ganeshkumar Ashokavardhanan <aganeshkumar@microsoft.com>
  • Loading branch information
@ganeshkumarashok
ganeshkumarashok and ganeshkumarashok committed May 21, 2022
1 parent a21ac3a commit 6c518bc
Show file tree
Hide file tree
Showing 104 changed files with 347 additions and 126 deletions.
14 changes: 11 additions & 3 deletions parts/linux/cloud-init/artifacts/cse_install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,31 @@ installContainerRuntime() {
if [ -f "$MANIFEST_FILEPATH" ]; then
stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
else
echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
fi

# todo(ace): read 1.22 from a manifest and track it against supported versions
if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ] || [ "$containerd_patch_version" == "null" ]; then
echo "invalid container version: $edge_containerd"
exit $ERR_CONTAINERD_INSTALL_TIMEOUT
fi
elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ] || [ "$containerd_patch_version" == "null" ]; then
echo "invalide container version: $latest_containerd"
echo "invalid container version: $latest_containerd"
exit $ERR_CONTAINERD_INSTALL_TIMEOUT
fi
else
containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ] || [ "$containerd_patch_version" == "null" ]; then
echo "invalide container version: $stable_containerd"
echo "invalid container version: $stable_containerd"
exit $ERR_CONTAINERD_INSTALL_TIMEOUT
fi
fi
Expand Down
1 change: 1 addition & 0 deletions parts/linux/cloud-init/artifacts/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"versions": [
"1.4.13-2"
],
"edge": "1.6.4-1",
"latest": "1.5.11-1",
"stable": "1.4.13-2"
},
Expand Down
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
Expand Up @@ -60,7 +60,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA



Expand Down
1 change: 1 addition & 0 deletions pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line63.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"versions": [
"1.4.13-2"
],
"edge": "1.6.4-1",
"latest": "1.5.11-1",
"stable": "1.4.13-2"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA



Expand Down
1 change: 1 addition & 0 deletions pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line63.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"versions": [
"1.4.13-2"
],
"edge": "1.6.4-1",
"latest": "1.5.11-1",
"stable": "1.4.13-2"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA



Expand Down
1 change: 1 addition & 0 deletions pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line63.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"versions": [
"1.4.13-2"
],
"edge": "1.6.4-1",
"latest": "1.5.11-1",
"stable": "1.4.13-2"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA



Expand Down
1 change: 1 addition & 0 deletions pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line63.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"versions": [
"1.4.13-2"
],
"edge": "1.6.4-1",
"latest": "1.5.11-1",
"stable": "1.4.13-2"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA



Expand Down
1 change: 1 addition & 0 deletions pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line63.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"versions": [
"1.4.13-2"
],
"edge": "1.6.4-1",
"latest": "1.5.11-1",
"stable": "1.4.13-2"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA



Expand Down
1 change: 1 addition & 0 deletions pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line63.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"versions": [
"1.4.13-2"
],
"edge": "1.6.4-1",
"latest": "1.5.11-1",
"stable": "1.4.13-2"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA



Expand Down
1 change: 1 addition & 0 deletions pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line63.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"versions": [
"1.4.13-2"
],
"edge": "1.6.4-1",
"latest": "1.5.11-1",
"stable": "1.4.13-2"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA



Expand Down
1 change: 1 addition & 0 deletions pkg/agent/testdata/AKSUbuntu1604+K8S115/line63.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"versions": [
"1.4.13-2"
],
"edge": "1.6.4-1",
"latest": "1.5.11-1",
"stable": "1.4.13-2"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA



Expand Down
1 change: 1 addition & 0 deletions pkg/agent/testdata/AKSUbuntu1604+K8S117/line63.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"versions": [
"1.4.13-2"
],
"edge": "1.6.4-1",
"latest": "1.5.11-1",
"stable": "1.4.13-2"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA



Expand Down
1 change: 1 addition & 0 deletions pkg/agent/testdata/AKSUbuntu1604+K8S118/line63.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"versions": [
"1.4.13-2"
],
"edge": "1.6.4-1",
"latest": "1.5.11-1",
"stable": "1.4.13-2"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA



Expand Down
1 change: 1 addition & 0 deletions pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line63.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"versions": [
"1.4.13-2"
],
"edge": "1.6.4-1",
"latest": "1.5.11-1",
"stable": "1.4.13-2"
},
Expand Down
Loading

0 comments on commit 6c518bc

Please sign in to comment.