Branch name change (to aks) prep

2018-07-20 09:31:26 -07:00 · 2018-07-20 09:31:26 -07:00 · a12ec3f93a
--- a/README.md
+++ b/README.md
@ -13,7 +13,7 @@ The following button will allow you to specify various configurations for your M
 deployment. The number of configuration options might be overwhelming, so some pre-defined/restricted deployment options for
 typical Moodle scenarios follow this.

-[![Deploy to Azure Fully Configurable](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Fhs-aks%2Fazuredeploy.json)  [![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.png)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Fhs-aks%2Fazuredeploy.json)
+[![Deploy to Azure Fully Configurable](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Faks%2Fazuredeploy.json)  [![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.png)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Faks%2Fazuredeploy.json)

 NOTE:  All of the deployment options require you to provide a valid SSH protocol 2 (SSH-2) RSA public-private key pairs with a minimum length of 2048 bits. Other key formats such as ED25519 and ECDSA are not supported. If you are unfamiliar with SSH then you should read this [article](https://docs.microsoft.com/en-us/azure/virtual-machines/linux/mac-create-ssh-keys) which will explain how to generate a key using the Windows Subsystem for Linux (it's easy and takes only a few minutes).  If you are new to SSH, remember SSH is a key pair solution. What this means is you have a public key and a private key, and the one you will be using to deploy your template is the public key.

--- a/azuredeploy.json
+++ b/azuredeploy.json
@ -7,7 +7,7 @@
            "metadata": {
                "description": "The base URI where artifacts required by this template are located. When the template is deployed using the accompanying scripts, a private location in the subscription will be used and this value will be automatically generated."
            },
-            "defaultValue": "https://raw.githubusercontent.com/Azure/Moodle/hs-aks/"
+            "defaultValue": "https://raw.githubusercontent.com/Azure/Moodle/aks/"
        },
        "_artifactsLocationSasToken": {
            "type": "securestring",
@ -667,7 +667,7 @@
            "defaultValue": "",
            "type": "securestring",
            "metadata": {
-                "description": "The Azure Active Directory app IP that'll be used to deploy dynamic AKS resources (applies only to AKS webClusterType). Must be pre-created (on the Azure Portal or through Azure CLI) and provided here manually."
+                "description": "The Azure Active Directory app ID that'll be used to deploy dynamic AKS resources (applies only to AKS webClusterType). Must be pre-created (on the Azure Portal or through Azure CLI) and provided here manually."
            }
        },
        "aksServicePrincipalClientSecret": {
--- a/docs/Parameters.md
+++ b/docs/Parameters.md
@ -31,7 +31,7 @@ Type: string

 Possible Values: null

-Default: https://raw.githubusercontent.com/Azure/Moodle/master/
+Default: https://raw.githubusercontent.com/Azure/Moodle/hs-aks/


 ### _artifactsLocationSasToken
@ -166,9 +166,20 @@ Possible Values: null
 Default: true


+### webClusterType
+
+Type of the Azure clustering technology for the web backend. AKS (Azure Kubernetes Service) is not available in all Azure regions, so do make sure that you are deploying AKS to one of the regions specified in https://docs.microsoft.com/en-us/azure/aks/container-service-quotas#region-availability
+
+Type: string
+
+Possible Values: ["VMSS","AKS"]
+
+Default: VMSS
+
+
 ### httpsTermination

-Indicates where https termination occurs. 'VMSS' is for https termination at the VMSS instance VMs (using nginx https proxy). 'AppGw' is for https termination with an Azure Application Gateway. When selecting this, you need to specify all appGw* parameters. 'None' is for testing only with no https. 'None' may not be used with a separately configured https termination layer. If you want to use the 'None' option with your separately configured https termination layer, you'll need to update your Moodle config.php manually for $cfg->wwwroot and $cfg->sslproxy.
+(Applies only to VMSS webClusterType. AKS webClusterType currently doesn't support AppGw or None httpsTermination) Indicates where https termination occurs. 'VMSS' is for https termination at the VMSS instance VMs (using nginx https proxy). 'AppGw' is for https termination with an Azure Application Gateway. When selecting this, you need to specify all appGw* parameters. 'None' is for testing only with no https. 'None' may not be used with a separately configured https termination layer. If you want to use the 'None' option with your separately configured https termination layer, you'll need to update your Moodle config.php manually for $cfg->wwwroot and $cfg->sslproxy.

 Type: string

@ -245,7 +256,7 @@ Default: apache

 ### autoscaleVmSku

-VM size for autoscaled web VMs
+VM size for autoscaled web VMs (applies only to VMSS webClusterType)

 Type: string

@ -256,7 +267,7 @@ Default: Standard_DS2_v2

 ### autoscaleVmCountMax

-Maximum number of autoscaled web VMs
+Maximum number of autoscaled web VMs (applies only to VMSS webClusterType)

 Type: int

@ -267,7 +278,7 @@ Default: 10

 ### autoscaleVmCountMin

-Minimum (also initial) number of autoscaled web VMs
+Minimum (also initial) number of autoscaled web VMs (applies only to VMSS webClusterType)

 Type: int

@ -707,13 +718,13 @@ Default:

 ### vNetAddressSpace

-Address range for the Moodle virtual network and various subnets - presumed /16 for a newly created vnet in case customVnetId is blank. Further subneting (a number of */24 subnets starting from the xxx.yyy.zzz.0/24 will be created on a newly created vnet or your BYO-vnet (specified in customVnetId parameter).
+Address range for the Moodle virtual network and various subnets - presumed /16 for a newly created vnet in case customVnetId is blank. Further subnets (a number of */24 subnets starting from the xxx.yyy.zzz.0/24) will be created on a newly created vnet or your BYO-vnet (specified in customVnetId parameter). Avoid 192.168.0.1/24 and 172.17.0.0/16 if you are choosing AKS webClusterType (these are used by AKS for the k8s service IPs and docker bridge IPs).

 Type: string

 Possible Values: null

-Default: 172.31.0.0
+Default: 172.16.0.0


 ### gatewayType
@ -749,6 +760,61 @@ Possible Values: ["Basic","Standard"]
 Default: Basic


+### aksAgentVMSize
+
+The size of the VMs for AKS agents (applies only to AKS webClusterType)
+
+Type: string
+
+Possible Values: null
+
+Default: Standard_DS2_v2
+
+
+### aksAgentCount
+
+The number of the AKS agent VMs (applies only to AKS webClusterType)
+
+Type: int
+
+Possible Values: null
+
+Default: 1
+
+
+### aksKubernetesVersion
+
+The version of Kubernetes that'll be deployed to the AKS cluster (applies only to AKS webClusterType)
+
+Type: string
+
+Possible Values: null
+
+Default: 1.10.3
+
+
+### aksServicePrincipalClientId
+
+The Azure Active Directory app ID that'll be used to deploy dynamic AKS resources (applies only to AKS webClusterType). Must be pre-created (on the Azure Portal or through Azure CLI) and provided here manually.
+
+Type: securestring
+
+Possible Values: null
+
+Default: 
+
+
+### aksServicePrincipalClientSecret
+
+The secret (password) corresponding to the aksServicePrincipalClientId above (applies only to AKS webClusterType). Must be pre-created (on the Azure Portal or through Azure CLI) together with the aksServicePrincipalClientId and provided here manually.
+
+Type: securestring
+
+Possible Values: null
+
+Default: 
+
+
 ### location

 Azure Location for all resources.