DASD-11212 - Enabled KEDA on AKS Cluster and added node drain timeout…

… to node configuration (#342) * DASD-11212 - Testing Autoscaling using PP AKS Agents * DASD-11212 - Added node drain timeout * DASD-11212 - Added node drain timeout * DASD-11212 - Added node drain timeout * DASD-11212 - Added node drain timeout * DASD-11212 - Added node drain timeout * DASD-11212 - Enabled KEDA on AKS CLuster * DASD-11212 - Enabled KEDA on AKS Cluster and added node drain timeout to node configuration * DASD-11212 - Enabled KEDA on AKS Cluster and added node drain timeout to node configuration
SkillsFundingAgency · Nov 7, 2024 · 4f4f20b · 4f4f20b
1 parent 225cd94
commit 4f4f20b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/templates/aks-agent-pool.json b/templates/aks-agent-pool.json
@@ -101,6 +101,13 @@
         "description": "The maximum amount of nodes to autoscale up to."
       }
     },
+    "nodeDrainTimeout": {
+      "type": "int",
+      "defaultValue": 15,
+      "metadata": {
+        "description": "The amount of time (in minutes) to wait on eviction of pods and graceful termination per node. This eviction wait time honors waiting on pod disruption budgets. If this time is exceeded, the upgrade fails."
+      }
+    },
     "osDiskSizeGB": {
       "type": "int",
       "defaultValue": 0,
@@ -132,13 +139,16 @@
     "withAutoscalingNodeProperties": {
       "enableAutoScaling": true,
       "minCount": "[parameters('minNodeAutoScalingCount')]",
-      "maxCount": "[parameters('maxNodeAutoScalingCount')]"
+      "maxCount": "[parameters('maxNodeAutoScalingCount')]",
+      "upgradeSettings": {
+        "drainTimeoutInMinutes": "[parameters('nodeDrainTimeout')]"
+      }
     },
     "agentPoolsProperties": "[if(parameters('enableNodeAutoScaling'), union(variables('baseProperties'), variables('withAutoscalingNodeProperties')), variables('baseProperties'))]"
   },
   "resources": [
     {
-      "apiVersion": "2021-05-01",
+      "apiVersion": "2023-06-01",
       "type": "Microsoft.ContainerService/managedClusters/agentPools",
       "name": "[concat(parameters('clusterName'),'/', parameters('agentPoolName'))]",
       "location": "[resourceGroup().location]",

diff --git a/templates/aks.json b/templates/aks.json
@@ -218,6 +218,11 @@
       "apiServerAccessProfile": {
         "authorizedIPRanges": "[parameters('apiServerAuthorizedIPRanges')]",
         "enablePrivateCluster": false
+      },
+      "workloadAutoScalerProfile": {
+      "keda": {
+        "enabled": true
+        }
       }
     },
     "aadProfile": {
@@ -250,7 +255,7 @@
   },
   "resources": [
     {
-      "apiVersion": "[if(parameters('legacyDeployment'), '2019-08-01', '2020-09-01')]",
+      "apiVersion": "[if(parameters('legacyDeployment'), '2019-08-01', '2022-11-01')]",
       "type": "Microsoft.ContainerService/managedClusters",
       "location": "[resourceGroup().location]",
       "name": "[parameters('clusterName')]",