Upgrade to Helm 3. (microsoft#1)

Deploy/Deploy-Unified-WinLinux.ps1

@@ -35,9 +35,6 @@ Write-Host "The name of your AKS: $aksName" -ForegroundColor Yellow
 Write-Host "Retrieving credentials" -ForegroundColor Yellow
 az aks get-credentials -n $aksName -g $resourceGroup
 
-# ## Add Tiller
-.\powershell\Add-Tiller.ps1
-
 ## Generate Config
 .\powershell\Generate-Config.ps1 -resourceGroup $resourceGroup -outputFile "..\helm\__values\$gValuesFile" -rewardsResourceGroup $rewardsResourceGroup -rewardsDbPassword $rewardsDbPassword
 

Deploy/Deploy-Unified.ps1

@@ -35,9 +35,6 @@ Write-Host "The name of your AKS: $aksName" -ForegroundColor Yellow
 # Write-Host "Retrieving credentials" -ForegroundColor Yellow
 az aks get-credentials -n $aksName -g $resourceGroup
 
-# Add Tiller
-& ./Add-Tiller.ps1
-
 # Generate Config
 $gValuesLocation=$(./Join-Path-Recursively.ps1 -pathParts ..,helm,__values,$gValuesFile)
 & ./Generate-Config.ps1 -resourceGroup $resourceGroup -outputFile $gValuesLocation

Deploy/helm/cart-api/templates/configmap.yaml

@@ -16,11 +16,11 @@ data:
   ISSUER: {{ .Values.sec.issuer }}
   SECURITYKEY: {{ .Values.sec.securityKey }}
   UseB2C: {{ .Values.B2C.UseB2C | quote }}
-  tenantID: {{ .Values.B2C.tenantID }}
-  clientID: {{ .Values.B2C.clientID }}
-  policyName: {{ .Values.B2C.policyName }}
-  identityMetadata: {{ .Values.B2C.identityMetadata }}
-  issuer: {{ .Values.B2C.issuer }}
+  tenantID: {{ .Values.B2C.tenantID | quote }}
+  clientID: {{ .Values.B2C.clientID | quote }}
+  policyName: {{ .Values.B2C.policyName | quote }}
+  identityMetadata: {{ .Values.B2C.identityMetadata | quote }}
+  issuer: {{ .Values.B2C.issuer | quote }}
   APPLICATIONINSIGHTSIK:  {{ .Values.inf.appinsights.id }} 
 
 

Deploy/helm/mobilebff/templates/configmap.yaml

@@ -21,8 +21,8 @@ data:
   ISSUER: {{ .Values.sec.issuer }}
   SECURITYKEY: {{ .Values.sec.securityKey }}
   UseB2C: {{ .Values.B2C.UseB2C | quote }}
-  B2CIssuer: {{ .Values.B2C.B2CIssuer }}
-  Authority: {{ .Values.B2C.Authority }}
+  B2CIssuer: {{ .Values.B2C.B2CIssuer | quote }}
+  Authority: {{ .Values.B2C.Authority | quote }}
   RegisterUsers: {{ .Values.inf.registrationusers.registerusers | quote }}
   RegistrationUsersEndpoint: {{ .Values.inf.registrationusers.registrationusersurl }}
 

Deploy/helm/webbff/templates/configmap.yaml

@@ -21,8 +21,8 @@ data:
   ISSUER: {{ .Values.sec.issuer }}
   SECURITYKEY: {{ .Values.sec.securityKey }}
   UseB2C: {{ .Values.B2C.UseB2C | quote }}
-  B2CIssuer: {{ .Values.B2C.B2CIssuer }}
-  Authority: {{ .Values.B2C.Authority }}
+  B2CIssuer: {{ .Values.B2C.B2CIssuer | quote }}
+  Authority: {{ .Values.B2C.Authority | quote }}
   RegisterUsers: {{ .Values.inf.registrationusers.registerusers | quote }}
   RegistrationUsersEndpoint: {{ .Values.inf.registrationusers.registrationusersurl }}
 

Deploy/readme.md

@@ -5,7 +5,6 @@ This folder contains a set of deployment scripts to cover various scenarios
 ## Powershell scripts inside powershell folder
 
 - `Add-Cert-Manager.ps1`: Adds cert manager to AKS.
-- `Add-Tiller.ps1`: Installs and configure Tiller.
 - `Build-Push.ps1`: Build and pushes all Docker images to ACR.
 - `Create-Secret.ps1`: Create the secret `acr-auth` in AKS used to allow pulling images from ACR.
 - `Deploy-Arm-Azure.ps1`: Deploys the ARM script to Azure and configure resources.

README.md

@@ -121,6 +121,7 @@ Pre-requisites for this deployment are to have:
 - A terminal with Powershell environment
 - [Azure CLI 2.0](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest) installed.
 - [Kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) installed with the last version (v1.15.0 at this moment).
+- [Helm 3](https://helm.sh/docs/intro/install/) installed with 3.0 or superior version (v3.0.0 at this moment).
 - Docker installed
 
 #### Service Principal
@@ -139,14 +140,6 @@ From the terminal type:
 
 At this point if you type `kubectl config current-context` the name of your AKS cluster should be displayed. That means that `kubectl` is ready to use your AKS
 
-#### Installing Tiller on AKS
-
-Helm is a tool to deploy resources in a Kubernetes cluster in a clean and simple manner. It is composed of two tools, one client-side (the Helm client) that needs to be installed on your machine, and a server component called _Tiller_ that has to be installed on the Kubernetes cluster.
-
-To install Helm, refer to its [installation page](https://docs.helm.sh/using_helm/#installing-helm). Once Helm is installed, _Tiller_ must be deployed on the cluster. For deploying _Tiller_ run the `./Add-Tiller.ps1` (from Powershell).
-
-Once installed, helm commands like `helm ls` should work without any error.
-
 #### Configuring services
 
 Before deploying services using Helm, you need to setup the configuration. We refer to the configuration file with the name of _gvalues_ file. This file **contains all secrets and connection strings** so beware to not commit in your repo accidentally.