diff --git a/Deploy/Deploy-Unified-WinLinux.ps1 b/Deploy/Deploy-Unified-WinLinux.ps1 index e1517fbe..1349bc07 100644 --- a/Deploy/Deploy-Unified-WinLinux.ps1 +++ b/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 diff --git a/Deploy/Deploy-Unified.ps1 b/Deploy/Deploy-Unified.ps1 index ae91db8e..d8543532 100644 --- a/Deploy/Deploy-Unified.ps1 +++ b/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 diff --git a/Deploy/helm/cart-api/templates/configmap.yaml b/Deploy/helm/cart-api/templates/configmap.yaml index 7361cb78..8f6da2d0 100644 --- a/Deploy/helm/cart-api/templates/configmap.yaml +++ b/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 }} diff --git a/Deploy/helm/mobilebff/templates/configmap.yaml b/Deploy/helm/mobilebff/templates/configmap.yaml index be191a6b..8b4f14d0 100644 --- a/Deploy/helm/mobilebff/templates/configmap.yaml +++ b/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 }} diff --git a/Deploy/helm/webbff/templates/configmap.yaml b/Deploy/helm/webbff/templates/configmap.yaml index 479b5fd0..ca783f94 100644 --- a/Deploy/helm/webbff/templates/configmap.yaml +++ b/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 }} diff --git a/Deploy/powershell/Add-Tiller.ps1 b/Deploy/powershell/Add-Tiller.ps1 deleted file mode 100644 index e63cfba5..00000000 --- a/Deploy/powershell/Add-Tiller.ps1 +++ /dev/null @@ -1,20 +0,0 @@ -#! /usr/bin/pwsh - -Write-Host "------------------------------------------------------------" -ForegroundColor Yellow -Write-Host "Configuring RBAC for Tiller" -ForegroundColor Yellow -Write-Host "------------------------------------------------------------" -ForegroundColor Yellow -kubectl create serviceaccount --namespace kube-system tiller -kubectl create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller -Write-Host "------------------------------------------------------------" -ForegroundColor Yellow -Write-Host "Installing Helm" -ForegroundColor Yellow -Write-Host "------------------------------------------------------------" -ForegroundColor Yellow -helm list -q | Out-Null -if ($?) { - helm init -c --service-account tiller --node-selectors "kubernetes.io/os=linux" -} -else { - helm init --service-account tiller --node-selectors "kubernetes.io/os=linux" --wait -} - -helm list -q | Out-Null -exit $LastExitCode \ No newline at end of file diff --git a/Deploy/readme.md b/Deploy/readme.md index b333303e..82e21755 100644 --- a/Deploy/readme.md +++ b/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. diff --git a/README.md b/README.md index 1566a385..0e797502 100644 --- a/README.md +++ b/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.