Merge branch 'master' into alburgess/airgap-e2e

parts/linux/cloud-init/artifacts/manifest.json

@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.7-1"
+        "edge": "1.7.14-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",

parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh

@@ -130,7 +130,7 @@ installStandaloneContainerd() {
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
         # pin 18.04 to 1.7.1
-        CONTAINERD_VERSION="1.7.7"
+        CONTAINERD_VERSION="1.7.14"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi

pkg/agent/datamodel/types.go

@@ -122,6 +122,12 @@ const (
 	WasmWasi WorkloadRuntime = "WasmWasi"
 )
 
+// OutboundType describes the options for outbound internet access.
+const (
+	OutboundTypeNone  string = "none"
+	OutboundTypeBlock string = "block"
+)
+
 /*
 CommandLineOmittedKubeletConfigFlags are the flags set by RP that should NOT be included within the set of
 command line flags when configuring kubelet.
@@ -1675,6 +1681,7 @@ type NodeBootstrappingConfiguration struct {
 	DisableUnattendedUpgrades              bool
 	SSHStatus                              SSHStatus
 	DisableCustomData                      bool
+	OutboundType                           string
 }
 
 type SSHStatus int

pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData

@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi8F1pdb2hqtoqRT1iAhhCIn9jaL1K4cp4VV+e7IhjZpcTPEJu36+Pm//7zrOI7juJngCjNOJXFHzm/N6LcspyFeUXfkuCuR/vRqY9LdTRbhMpiFKJomn1F0M1uE1Wv8UErqHb1dB8vJ1cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmXql1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IQqmDNe/tCzX8dJEE2uqtOErXsp05Kr8pA2QnMU3KCqbNlXs9bp7jZUFkzwwh05X7819DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmje1N/b/pjcGXJs0cQ0Zaku4vicHJufPP272OeRUSXen44TFbrADBlgrPsHATPP/n/H9gHfs9+X8YLhfPcFk7oLS5zZc1whAHfMMJwTb0eXTEDwRk0Hrtny/HOLsTWEpFMe16wke9lSiWnirY0UXs8Lgj1DFAeltk9UFiCu4cndLlnHWeFt2JSCgkMg/pfG9Lr4nDT3RkY0TT5GI9RMp6FQfTlgCZMGceS0QLaG26S+3ffzRWdYAp6l+Cy4a1V/8Iu9yxyH7y1qn2rOrSoA+BbVVveAXhvUYfA1vAQNL7OMR6Joqt1jtWL/JVO1XmFFh86vwIAAP//Kq5izvcHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"

pkg/agent/testdata/AKSUbuntu1604+Containerd/line62.sh

@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.7"
+        CONTAINERD_VERSION="1.7.14"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi

pkg/agent/testdata/AKSUbuntu1604+Containerd/line77.sh

@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.7-1"
+        "edge": "1.7.14-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",