From aa792ab618a9c641e92d2effe5faefd523f3bd83 Mon Sep 17 00:00:00 2001 From: Naveen Angali Date: Wed, 30 Aug 2023 17:01:11 -0400 Subject: [PATCH] updated arm template to have windows node version select option --- Azure-ARM/azuredeploy.json | 8 ++++++-- Azure-ARM/azuredeploy.parameters.json | 3 +++ Azure-ARM/createUIDefinition.json | 22 ++++++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/Azure-ARM/azuredeploy.json b/Azure-ARM/azuredeploy.json index 266b28a..d4a2e9b 100644 --- a/Azure-ARM/azuredeploy.json +++ b/Azure-ARM/azuredeploy.json @@ -56,6 +56,9 @@ "defaultValue": "", "type": "String" }, + "WindowsNodeVersion":{ + "type": "string" + }, "KubernetesClusterName": { "type": "String" }, @@ -187,6 +190,7 @@ "ACRUSER":"", "ACRUSERPASSWORD":"", + "UPDATEAAD":"[parameters('ActiveDirectoryCreateApp')]", "CLIENTID":"[parameters('ActiveDirectoryClientId')]", "CLIENTSECRET":"[parameters('ActiveDirectoryClientSecret')]", @@ -203,7 +207,7 @@ "AuthenticationType": "[parameters('AuthenticationType')]", "KubernetesWindowsNodeCount": "[int(parameters('KubernetesWindowsNodeCount'))]", "KubernetesWindowsNodeSize": "[parameters('KubernetesWindowsNodeSize')]", - + "WindowsNodeVersion": "[parameters('WindowsNodeVersion')]", "ManagedIdentity": "[parameters('ManagedIdentityName')]", "DNSHostName": "[parameters('DNSHostName')]", @@ -526,7 +530,7 @@ "orchestratorVersion": "[variables('KubernetesVersion')]", "enableNodePublicIP": false, "mode": "User", - "osSKU": "Windows2019", + "osSKU": "[variables('WindowsNodeVersion')]", "osType": "Windows", "vnetSubnetID": "[if(not(empty(variables('KubernetesVnetResourceGroup'))),variables('vnetId'),json('null'))]" } diff --git a/Azure-ARM/azuredeploy.parameters.json b/Azure-ARM/azuredeploy.parameters.json index e438f71..6f56229 100644 --- a/Azure-ARM/azuredeploy.parameters.json +++ b/Azure-ARM/azuredeploy.parameters.json @@ -138,6 +138,9 @@ "KubenetesInfrastructureResourceGroupName": { "value": "" }, + "WindowsNodeVersion":{ + "value": "" + }, "AuthenticationType":{ "value": "" } diff --git a/Azure-ARM/createUIDefinition.json b/Azure-ARM/createUIDefinition.json index 716421e..47dc441 100644 --- a/Azure-ARM/createUIDefinition.json +++ b/Azure-ARM/createUIDefinition.json @@ -138,6 +138,27 @@ }, "visible": true }, + { + "name": "WindowsNodeVersion", + "type": "Microsoft.Common.DropDown", + "label": "Profisee windows node version", + "defaultValue": "", + "toolTip": "windows node version to use", + "constraints": { + "required": true, + "allowedValues": [ + { + "label": "windows 2019", + "value": "Windows2019" + }, + { + "label": "windows 2022", + "value": "Windows2022" + } + ] + }, + "visible": "[or(equals(steps('profisee').ProfiseeVersion, 'profiseeplatformdev:2023r2.preview-win19') , equals(steps('profisee').ProfiseeVersion, 'profiseeplatformdev:2023r2.preview-win22'))]" + }, { "name": "ProfiseeAdminUserAccount", "type": "Microsoft.Common.TextBox", @@ -996,6 +1017,7 @@ "ActiveDirectoryCreateApp": "[steps('profisee').ActiveDirectoryCreateApp]", "ActiveDirectoryClientId": "[steps('profisee').UserSuppliedClientId.ActiveDirectoryClientId]", "ActiveDirectoryClientSecret": "[steps('profisee').UserSuppliedClientSecret.ActiveDirectoryClientSecret]", + "WindowsNodeVersion": "[steps('profisee').WindowsNodeVersion]", "KubernetesClusterName": "[steps('kubernetes').KubernetesClusterName]", "KubernetesVersion": "[steps('kubernetes').KubernetesVersion]", "KubenetesInfrastructureResourceGroupName": "[steps('kubernetes').KubenetesInfrastructureResourceGroupName]",