From ede078bc85bfc42fe2e661060f14948b6177ab53 Mon Sep 17 00:00:00 2001
From: Eric Ernst <eric_ernst@apple.com>
Date: Tue, 27 Apr 2021 09:38:38 -0700
Subject: [PATCH] kata-deploy: aks-test: bump kubernetes/containerd

Bump to 1.20, latest aks-engine

Signed-off-by: Eric Ernst <eric_ernst@apple.com>
---
 tools/packaging/kata-deploy/action/Dockerfile                | 2 +-
 .../packaging/kata-deploy/action/kubernetes-containerd.json  | 5 ++---
 tools/packaging/kata-deploy/action/setup-aks.sh              | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/tools/packaging/kata-deploy/action/Dockerfile b/tools/packaging/kata-deploy/action/Dockerfile
index 7047680f64..4f5ac3f5b7 100644
--- a/tools/packaging/kata-deploy/action/Dockerfile
+++ b/tools/packaging/kata-deploy/action/Dockerfile
@@ -7,7 +7,7 @@ LABEL com.github.actions.name="Test kata-deploy in an AKS cluster"
 LABEL com.github.actions.description="Test kata-deploy in an AKS cluster"
 
 # Default to latest validated AKS-engine version
-ARG AKS_ENGINE_VER="v0.42.0"
+ARG AKS_ENGINE_VER="v0.62.0"
 ARG ARCH=amd64
 
 ENV GITHUB_ACTION_NAME="Test kata-deploy in an AKS cluster"
diff --git a/tools/packaging/kata-deploy/action/kubernetes-containerd.json b/tools/packaging/kata-deploy/action/kubernetes-containerd.json
index 1b92e04f99..25a94ab6c7 100644
--- a/tools/packaging/kata-deploy/action/kubernetes-containerd.json
+++ b/tools/packaging/kata-deploy/action/kubernetes-containerd.json
@@ -3,11 +3,10 @@
   "properties": {
     "orchestratorProfile": {
       "orchestratorType": "Kubernetes",
-      "orchestratorVersion": "1.15.4",
+      "orchestratorVersion": "1.20.5",
       "kubernetesConfig": {
-        "networkPlugin": "flannel",
         "containerRuntime": "containerd",
-        "containerdVersion": "1.2.4"
+        "useManagedIdentity": false
       }
     },
     "masterProfile": {
diff --git a/tools/packaging/kata-deploy/action/setup-aks.sh b/tools/packaging/kata-deploy/action/setup-aks.sh
index 8537a80043..39ce024161 100755
--- a/tools/packaging/kata-deploy/action/setup-aks.sh
+++ b/tools/packaging/kata-deploy/action/setup-aks.sh
@@ -47,5 +47,5 @@ function setup_aks() {
     kubectl wait --timeout=10m --for=condition=Ready --all nodes
 
     # make sure coredns is up before moving forward:
-    kubectl wait --timeout=10m -n kube-system --for=condition=Available deployment.extensions/coredns
+    kubectl wait --timeout=10m -n kube-system --for=condition=Available deployment/coredns
 }