From 4255d64f796b7bc7f9aa03ecca6fd55dac19802c Mon Sep 17 00:00:00 2001 From: deaborch <44680211+deaborch@users.noreply.github.com> Date: Fri, 9 Aug 2019 14:20:54 -0700 Subject: [PATCH 1/7] enabled telemetry --- kubernetes/template/DeploymentTemplates/MainTemplate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/template/DeploymentTemplates/MainTemplate.json b/kubernetes/template/DeploymentTemplates/MainTemplate.json index 8cdd9aa..f95372a 100644 --- a/kubernetes/template/DeploymentTemplates/MainTemplate.json +++ b/kubernetes/template/DeploymentTemplates/MainTemplate.json @@ -231,8 +231,8 @@ }, "resources": [ { - "apiVersion": "2015-01-01", - "name": "dvmdeployment", + "apiVersion": "2017-05-10", + "name": "pid-30ce5998-43ae-4ba0-86b4-62bfc6da5e67", "type": "Microsoft.Resources/deployments", "properties": { "mode": "Incremental", From 6f2e51049bb68fa301de208a8b5c647e48e5da54 Mon Sep 17 00:00:00 2001 From: deaborch <44680211+deaborch@users.noreply.github.com> Date: Wed, 21 Aug 2019 11:32:31 -0700 Subject: [PATCH 2/7] enabled telemetry first pass --- .../DeploymentTemplates/MainTemplate.json | 90 +++++++++++++++++-- 1 file changed, 82 insertions(+), 8 deletions(-) diff --git a/kubernetes/template/DeploymentTemplates/MainTemplate.json b/kubernetes/template/DeploymentTemplates/MainTemplate.json index f95372a..82e5b54 100644 --- a/kubernetes/template/DeploymentTemplates/MainTemplate.json +++ b/kubernetes/template/DeploymentTemplates/MainTemplate.json @@ -6,7 +6,7 @@ "type": "string", "defaultValue": "azureuser", "metadata": { - "description": "User name for the Linux Virtual Machines that are part of the Kubernetes cluster and DVM." + "description": "User name for the Linux virtual machines that are part of the Kubernetes cluster and DVM." } }, "sshPublicKey": { @@ -24,14 +24,14 @@ "agentPoolProfileCount": { "defaultValue": 3, "metadata": { - "description": "Kubernetes Node Pool Profile Count" + "description": "Kubernetes linux node pool profile count" }, "type": "int" }, "agentPoolProfileVMSize": { "defaultValue": "Standard_D2_v2", "metadata": { - "description": "The VMSize of Kubernetes node VMs" + "description": "The virtual machine size of the Kubernetes linux agent nodes" }, "type": "string" }, @@ -45,7 +45,7 @@ "masterPoolProfileVMSize": { "defaultValue": "Standard_D2_v2", "metadata": { - "description": "The VMSize of Kubernetes master VMs" + "description": "The virtual machine size of the Kubernetes master nodes" }, "type": "string" }, @@ -103,7 +103,7 @@ }, "aksEngineReleaseVersion": { "type": "string", - "defaultValue": "v0.38.5", + "defaultValue": "v0.39.1", "metadata": { "description": "The version of AKS Engine to download" } @@ -147,6 +147,48 @@ "description": "Network plugin which will deployed in Kubernetes cluster" }, "type": "string" + }, + "windowsAdminUsername": { + "defaultValue": "azureuser", + "metadata": { + "description": "User name for the Windows virtual machines that are part of the Kubernetes cluster." + }, + "type": "string" + }, + "windowsAdminPassword": { + "defaultValue": "", + "metadata": { + "description": "User password for the Windows virtual machines that are part of the Kubernetes cluster." + }, + "type": "securestring" + }, + "windowsPackageBaseURL": { + "defaultValue": "", + "metadata": { + "description": "URL path from where Windows binaries will be downloaded." + }, + "type": "string" + }, + "windowsPackageName": { + "defaultValue": "", + "metadata": { + "description": "Name of the Windows package which will be installed." + }, + "type": "string" + }, + "windowsAgentPoolProfileCount": { + "defaultValue": "0", + "metadata": { + "description": "Kubernetes Windows node pool profile count" + }, + "type": "string" + }, + "windowsAgentPoolProfileVMSize": { + "defaultValue": "Standard_D2_v2", + "metadata": { + "description": "The virtual machine size of the Kubernetes Windows nodes" + }, + "type": "string" }, "availabilityProfile": { "defaultValue": "AvailabilitySet", @@ -227,12 +269,26 @@ "tenantSubscriptionId": "[subscription().subscriptionId]", "scriptName": "script", "singleQuote": "'", - "scriptParameters": "[concat('IDENTITY_SYSTEM=','\"',parameters('identitySystem'),'\"',' NETWORK_PLUGIN=','\"',parameters('networkPlugin'),'\"',' AVAILABILITY_PROFILE=','\"',parameters('availabilityProfile'),'\"',' FIRST_CONSECUTIVE_STATIC_IP=','\"',parameters('firstConsecutiveStaticIP'),'\"',' AGENT_SUBNET_NAME=','\"',parameters('agentSubnetName'),'\"',' MASTER_SUBNET_NAME=','\"',parameters('masterSubnetName'),'\"',' CUSTOM_VNET_NAME=','\"',parameters('customVnetName'),'\"',' NODE_DISTRO=','\"',parameters('nodeDistro'),'\"',' RESOURCE_GROUP_NAME=','\"',variables('resourceGroupName'),'\"',' PUBLICIP_DNS=','\"',variables('dnsNameForPublicIP'),'\"' ,' TENANT_ID=','\"',subscription().tenantId,'\"' ,' TENANT_SUBSCRIPTION_ID=','\"',variables('tenantSubscriptionId'),'\"',' ADMIN_USERNAME=','\"',parameters('linuxAdminUsername'),'\"',' MASTER_DNS_PREFIX=','\"',parameters('masterProfileDnsPrefix'),'\"' ,' AGENT_COUNT=','\"',parameters('agentPoolProfileCount'),'\"' ,' AGENT_SIZE=','\"',parameters('agentPoolProfileVMSize'),'\"' ,' MASTER_COUNT=','\"',parameters('masterPoolProfileCount'),'\"',' MASTER_SIZE=','\"',parameters('masterPoolProfileVMSize'),'\"' ,' SPN_CLIENT_ID=','\"',parameters('servicePrincipalClientId'),'\"' ,' SPN_CLIENT_SECRET=','\"',parameters('servicePrincipalClientSecret'),'\"' ,' K8S_AZURE_CLOUDPROVIDER_VERSION=','\"',parameters('kubernetesAzureCloudProviderVersion'),'\"' ,' REGION_NAME=','\"',variables('location'),'\"' ,' SSH_PUBLICKEY=','\"',parameters('sshPublicKey'),'\"' ,' STORAGE_PROFILE=','\"',parameters('storageProfile'),'\"')]" + "scriptParameters": "[concat('IDENTITY_SYSTEM=','\"',parameters('identitySystem'),'\"',' WINDOWS_PACKAGE_NAME=','\"',parameters('windowsPackageName'),'\"' ,' WINDOWS_PACKAGE_URL=','\"',parameters('windowsPackageBaseURL'),'\"' ,' WINDOWS_AGENT_COUNT=','\"',parameters('windowsAgentPoolProfileCount'),'\"' ,' WINDOWS_AGENT_SIZE=','\"',parameters('windowsAgentPoolProfileVMSize'),'\"',' WINDOWS_ADMIN_USERNAME=','\"',parameters('windowsAdminUsername'),'\"',' WINDOWS_ADMIN_PASSWORD=','\"',parameters('windowsAdminPassword'),'\"',' NETWORK_PLUGIN=','\"',parameters('networkPlugin'),'\"',' AVAILABILITY_PROFILE=','\"',parameters('availabilityProfile'),'\"',' FIRST_CONSECUTIVE_STATIC_IP=','\"',parameters('firstConsecutiveStaticIP'),'\"',' AGENT_SUBNET_NAME=','\"',parameters('agentSubnetName'),'\"',' MASTER_SUBNET_NAME=','\"',parameters('masterSubnetName'),'\"',' CUSTOM_VNET_NAME=','\"',parameters('customVnetName'),'\"',' NODE_DISTRO=','\"',parameters('nodeDistro'),'\"',' RESOURCE_GROUP_NAME=','\"',variables('resourceGroupName'),'\"',' PUBLICIP_DNS=','\"',variables('dnsNameForPublicIP'),'\"' ,' TENANT_ID=','\"',subscription().tenantId,'\"' ,' TENANT_SUBSCRIPTION_ID=','\"',variables('tenantSubscriptionId'),'\"',' ADMIN_USERNAME=','\"',parameters('linuxAdminUsername'),'\"',' MASTER_DNS_PREFIX=','\"',parameters('masterProfileDnsPrefix'),'\"' ,' AGENT_COUNT=','\"',parameters('agentPoolProfileCount'),'\"' ,' AGENT_SIZE=','\"',parameters('agentPoolProfileVMSize'),'\"' ,' MASTER_COUNT=','\"',parameters('masterPoolProfileCount'),'\"',' MASTER_SIZE=','\"',parameters('masterPoolProfileVMSize'),'\"' ,' SPN_CLIENT_ID=','\"',parameters('servicePrincipalClientId'),'\"' ,' SPN_CLIENT_SECRET=','\"',parameters('servicePrincipalClientSecret'),'\"' ,' K8S_AZURE_CLOUDPROVIDER_VERSION=','\"',parameters('kubernetesAzureCloudProviderVersion'),'\"' ,' REGION_NAME=','\"',variables('location'),'\"' ,' SSH_PUBLICKEY=','\"',parameters('sshPublicKey'),'\"' ,' STORAGE_PROFILE=','\"',parameters('storageProfile'),'\"')]" }, "resources": [ { - "apiVersion": "2017-05-10", - "name": "pid-30ce5998-43ae-4ba0-86b4-62bfc6da5e67", + "apiVersion": "[variables('apiVersionDeployments')]", + "location": "[variables('location')]", + "name": "pid-b8a190d4-9ecc-4bd5-a9ba-3cc60c6e0c1f", + "properties": { + "mode": "Incremental", + "template": { + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "resources": [] + } + }, + "type": "Microsoft.Resources/deployments" + }, + { + "apiVersion": "2015-01-01", + "name": "dvmdeployment", "type": "Microsoft.Resources/deployments", "properties": { "mode": "Incremental", @@ -313,6 +369,24 @@ "clusterDefinitionFileName": { "value": "[parameters('clusterDefinitionFileName')]" }, + "windowsAgentPoolProfileCount": { + "value": "[parameters('windowsAgentPoolProfileCount')]" + }, + "windowsAgentPoolProfileVMSize": { + "value": "[parameters('windowsAgentPoolProfileVMSize')]" + }, + "windowsAdminUsername": { + "value": "[parameters('windowsAdminUsername')]" + }, + "windowsAdminPassword": { + "value": "[parameters('windowsAdminPassword')]" + }, + "windowsPackageBaseURL": { + "value": "[parameters('windowsPackageBaseURL')]" + }, + "windowsPackageName": { + "value": "[parameters('windowsPackageName')]" + }, "kubernetesImageBase": { "value": "[parameters('kubernetesImageBase')]" } From fc9f13134a9301eb0993e158c04e7d7b5e1c7654 Mon Sep 17 00:00:00 2001 From: deaborch <44680211+deaborch@users.noreply.github.com> Date: Fri, 9 Aug 2019 14:20:54 -0700 Subject: [PATCH 3/7] enabled telemetry --- kubernetes/template/DeploymentTemplates/MainTemplate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/template/DeploymentTemplates/MainTemplate.json b/kubernetes/template/DeploymentTemplates/MainTemplate.json index d054eb5..4679eee 100644 --- a/kubernetes/template/DeploymentTemplates/MainTemplate.json +++ b/kubernetes/template/DeploymentTemplates/MainTemplate.json @@ -273,8 +273,8 @@ }, "resources": [ { - "apiVersion": "2015-01-01", - "name": "dvmdeployment", + "apiVersion": "2017-05-10", + "name": "pid-30ce5998-43ae-4ba0-86b4-62bfc6da5e67", "type": "Microsoft.Resources/deployments", "properties": { "mode": "Incremental", From 5494ccec0425b032c33333bba699686e9cdfb250 Mon Sep 17 00:00:00 2001 From: deaborch <44680211+deaborch@users.noreply.github.com> Date: Wed, 21 Aug 2019 11:32:31 -0700 Subject: [PATCH 4/7] enabled telemetry first pass --- .../DeploymentTemplates/MainTemplate.json | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/kubernetes/template/DeploymentTemplates/MainTemplate.json b/kubernetes/template/DeploymentTemplates/MainTemplate.json index 4679eee..82e5b54 100644 --- a/kubernetes/template/DeploymentTemplates/MainTemplate.json +++ b/kubernetes/template/DeploymentTemplates/MainTemplate.json @@ -273,8 +273,22 @@ }, "resources": [ { - "apiVersion": "2017-05-10", - "name": "pid-30ce5998-43ae-4ba0-86b4-62bfc6da5e67", + "apiVersion": "[variables('apiVersionDeployments')]", + "location": "[variables('location')]", + "name": "pid-b8a190d4-9ecc-4bd5-a9ba-3cc60c6e0c1f", + "properties": { + "mode": "Incremental", + "template": { + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "resources": [] + } + }, + "type": "Microsoft.Resources/deployments" + }, + { + "apiVersion": "2015-01-01", + "name": "dvmdeployment", "type": "Microsoft.Resources/deployments", "properties": { "mode": "Incremental", From 4bc484019bbd3d76c5aa76e99449bdbf546fc93f Mon Sep 17 00:00:00 2001 From: deaborch <44680211+deaborch@users.noreply.github.com> Date: Wed, 21 Aug 2019 12:55:01 -0700 Subject: [PATCH 5/7] deployment api version fix --- kubernetes/template/DeploymentTemplates/MainTemplate.json | 1 + 1 file changed, 1 insertion(+) diff --git a/kubernetes/template/DeploymentTemplates/MainTemplate.json b/kubernetes/template/DeploymentTemplates/MainTemplate.json index 82e5b54..705ee2d 100644 --- a/kubernetes/template/DeploymentTemplates/MainTemplate.json +++ b/kubernetes/template/DeploymentTemplates/MainTemplate.json @@ -242,6 +242,7 @@ } }, "variables": { + "apiVersionDeployments": "2018-06-01", "resourceGroupName": "[resourceGroup().name]", "dnsNameForPublicIP": "[toLower(concat('vmd-dns', parameters('masterProfileDnsPrefix')))]", "location": "[resourceGroup().location]", From 745910e2221cd9c26060219dc147baea74d0799e Mon Sep 17 00:00:00 2001 From: deaborch <44680211+deaborch@users.noreply.github.com> Date: Wed, 21 Aug 2019 14:09:50 -0700 Subject: [PATCH 6/7] changed API version --- kubernetes/template/DeploymentTemplates/MainTemplate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/template/DeploymentTemplates/MainTemplate.json b/kubernetes/template/DeploymentTemplates/MainTemplate.json index 705ee2d..c93de72 100644 --- a/kubernetes/template/DeploymentTemplates/MainTemplate.json +++ b/kubernetes/template/DeploymentTemplates/MainTemplate.json @@ -242,7 +242,7 @@ } }, "variables": { - "apiVersionDeployments": "2018-06-01", + "apiVersionDeployments": "2015-11-01", "resourceGroupName": "[resourceGroup().name]", "dnsNameForPublicIP": "[toLower(concat('vmd-dns', parameters('masterProfileDnsPrefix')))]", "location": "[resourceGroup().location]", From 63b15a37eb5154527a962eb341419d7103870d18 Mon Sep 17 00:00:00 2001 From: deaborch <44680211+deaborch@users.noreply.github.com> Date: Wed, 21 Aug 2019 14:18:48 -0700 Subject: [PATCH 7/7] Reformated to code sample --- kubernetes/template/DeploymentTemplates/MainTemplate.json | 1 - 1 file changed, 1 deletion(-) diff --git a/kubernetes/template/DeploymentTemplates/MainTemplate.json b/kubernetes/template/DeploymentTemplates/MainTemplate.json index c93de72..1859134 100644 --- a/kubernetes/template/DeploymentTemplates/MainTemplate.json +++ b/kubernetes/template/DeploymentTemplates/MainTemplate.json @@ -275,7 +275,6 @@ "resources": [ { "apiVersion": "[variables('apiVersionDeployments')]", - "location": "[variables('location')]", "name": "pid-b8a190d4-9ecc-4bd5-a9ba-3cc60c6e0c1f", "properties": { "mode": "Incremental",