Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev

Author: ramon-tomas-c

README.md

@@ -33,7 +33,7 @@ The microservices are different in type, meaning different internal architecture
 <img src="img/eShopOnContainers_Types_Of_Microservices.png">
 <p>
 <p>
-Additional miroservice styles with other frameworks and No-SQL databases will be added, eventually. This is a great opportunity for pull requests from the community, like a new microservice using Nancy, or even other languages like Node, Go, Python or data containers with MongoDB with Azure DocDB compatibility, PostgreSQL, RavenDB, Event Store, MySql, etc. You name it! :)
+Additional microservice styles with other frameworks and No-SQL databases will be added, eventually. This is a great opportunity for pull requests from the community, like a new microservice using Nancy, or even other languages like Node, Go, Python or data containers with MongoDB with Azure DocDB compatibility, PostgreSQL, RavenDB, Event Store, MySql, etc. You name it! :)
 
 > ### Important Note on Database Servers/Containers
 > In this solution's current configuration for a development environment, the SQL databases are automatically deployed with sample data into a single SQL Server for Linux container (a single shared Docker container for SQL databases) so the whole solution can be up and running without any dependency to any cloud or specific server. Each database could also be deployed as a single Docker container, but then you'd need more then 8GB or memory RAM assigned to Docker in your development machine in order to be able to run 3 SQL Server Docker containers in your Docker Linux host in "Docker for Windows" or "Docker for Mac" development environments.

k8s/gen-k8s-env.ps1

@@ -4,7 +4,10 @@
     [parameter(Mandatory=$false)][string]$registryName,
     [parameter(Mandatory=$true)][string]$orchestratorName,
     [parameter(Mandatory=$true)][string]$dnsName,
-    [parameter(Mandatory=$true)][string]$createAcr=$true
+    [parameter(Mandatory=$true)][string]$createAcr=$true,
+    [parameter(Mandatory=$false)][int]$agentCount=2,
+    [parameter(Mandatory=$false)][string]$agentVMSize="Standard_D2_v2",
+    [parameter(Mandatory=$false)][int]$masterCount=1
 )
 
 # Create resource group
@@ -19,7 +22,7 @@ if ($createAcr -eq $true) {
 
 # Create kubernetes orchestrator
 Write-Host "Creating kubernetes orchestrator..." -ForegroundColor Yellow
-az acs create --orchestrator-type=kubernetes --resource-group $resourceGroupName --name=$orchestratorName --dns-prefix=$dnsName --generate-ssh-keys
+az acs create --orchestrator-type=kubernetes --resource-group $resourceGroupName --name=$orchestratorName --dns-prefix=$dnsName --generate-ssh-keys --agent-count=$agentCount --agent-vm-size=$agentVMSize --master-count=$masterCount
 
 # Retrieve kubernetes cluster configuration and save it under ~/.kube/config 
 az acs kubernetes get-credentials --resource-group=$resourceGroupName --name=$orchestratorName

src/Mobile/README.md

@@ -10,7 +10,7 @@ eShopOnContainers is a reference app whose imagined purpose is to serve the mobi
   1. A Xamarin.Forms mobile app for iOS, Android and Windows.
   2. Several .NET Web API microservices deployed as Docker containers.
 
-##Xamarin.Forms App (eShopOnContainers)
+### Xamarin.Forms App (eShopOnContainers)
 
 This project exercises the following platforms, frameworks or features: