Update docs to Helm v3

Author: stefanprodan

docs/canary/README.md

@@ -40,12 +40,14 @@ fluxctl sync
 
 Create a canary release for podinfo:
 
-```yaml
+```yaml{7}
 apiVersion: flagger.app/v1alpha3
 kind: Canary
 metadata:
   name: podinfo
   namespace: prod
+  annotations:
+    fluxcd.io/ignore: "false"
 spec:
   targetRef:
     apiVersion: apps/v1
@@ -90,7 +92,7 @@ kubectl -n prod get canary
 
 Install the load testing service to generate traffic during the canary analysis:
 
-```yaml
+```yaml{7}
 apiVersion: helm.fluxcd.io/v1
 kind: HelmRelease
 metadata:

docs/helm/README.md

@@ -17,7 +17,7 @@ The controller will run inside the Linkerd mesh.
 
 Create a namespace with linkerd injection enabled:
 
-```yaml
+```yaml{5}
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -29,7 +29,7 @@ metadata:
 
 Create a Helm release to install the NGINX ingress controller:
 
-```yaml
+```yaml{7}
 apiVersion: helm.fluxcd.io/v1
 kind: HelmRelease
 metadata:
@@ -77,7 +77,7 @@ You'll be installing podinfo using a Helm chart stored in the git repository at
 
 Create the `prod` namespace with linkerd injection enabled:
 
-```yaml
+```yaml{5}
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -87,9 +87,10 @@ metadata:
   name: prod
 ```
 
-Create a Helm release to install the podinfo chart (replace `GHUSER` with your GitHub username):
+Create a Helm release to install the podinfo chart
+(replace `GHUSER` with your GitHub username and `LB-PUBLIC-IP` with your ingress IP):
 
-```yaml
+```yaml{7,11,31}
 apiVersion: helm.fluxcd.io/v1
 kind: HelmRelease
 metadata:
@@ -118,6 +119,15 @@ spec:
           proxy_set_header l5d-dst-override $service_name.$namespace.svc.cluster.local:9898;
           proxy_hide_header l5d-remote-ip;
           proxy_hide_header l5d-server-id;
+      path: /
+      hosts:
+        - LB-PUBLIC-IP.nip.io
+```
+
+Note that if you are on EKS, the host should be set to the `elb.amazonaws.com` address:
+
+```sh
+kubectl ingress-nginx get svc | grep Ingress
 ```
 
 Apply changes:
@@ -135,7 +145,7 @@ Validate that the Helm operator has installed podinfo:
 kubectl -n prod get hr
 ```
 
-Open your browser and navigate to `http://<LB-IP>/`, you should see podinfo v3.0.0 UI.
+Open your browser and navigate to `http://LB-PUBLIC-IP.nip.io/`, you should see podinfo v3.0.0 UI.
 
 ![podinfo](/podinfo-3.0.0.png)
 
@@ -157,15 +167,12 @@ metadata:
     fluxcd.io/tag.chart-image: semver:~3.0
 ```
 
-Commit and push the changes to GitHub:
-
-```sh
-git add -A && git commit -m "automate podinfo" && git push origin master
-```
-
-Sync the the changes on the cluster:
+Apply changes:
 
 ```sh
+git add -A && \
+git commit -m "automate podinfo" && \
+git push origin master && \
 fluxctl sync
 ```
 
@@ -181,7 +188,7 @@ Pull the changes made by Flux locally:
 git pull origin master
 ```
 
-Open your browser and navigate to `http://<LB-IP>/`, you should see podinfo v3.0.5 UI.
+Open your browser and navigate to `http://LB-PUBLIC-IP.nip.io/`, you should see podinfo v3.0.5 UI.
 
 ![podinfo](/podinfo-3.0.5.png)
 
@@ -194,7 +201,7 @@ The sealed secret can be decrypted only by the controller running in your cluste
 
 Create the Sealed Secrets Helm release:
 
-```yaml
+```yaml{7}
 apiVersion: helm.fluxcd.io/v1
 kind: HelmRelease
 metadata:
@@ -207,7 +214,7 @@ spec:
   chart:
     repository: https://kubernetes-charts.storage.googleapis.com/
     name: sealed-secrets
-    version: 1.3.4
+    version: 1.4.0
 ```
 
 Apply changes:
@@ -241,7 +248,7 @@ kubeseal --fetch-cert \
 You can generate a Kubernetes secret locally with kubectl and encrypt it with kubeseal:
 
 ```sh
-kubectl -n dev create secret generic basic-auth \
+kubectl -n prod create secret generic basic-auth \
 --from-literal=user=admin \
 --from-literal=password=admin \
 --dry-run \
@@ -258,7 +265,8 @@ then decrypt it into a Kubernetes secret.
 To prepare for disaster recovery you should backup the Sealed Secrets controller private key with:
 
 ```sh
-kubectl get secret -n fluxcd sealed-secrets-key -o yaml --export > sealed-secrets-key.yaml
+kubectl get secret -n fluxcd sealed-secrets-key -o yaml \
+--export > sealed-secrets-key.yaml
 ```
 
 To restore from backup after a disaster, replace the newly-created secret and restart the controller:

docs/prerequisites/README.md

@@ -5,12 +5,22 @@ title: Prerequisites
 # Prerequisites
 
 In order to install the workshop prerequisites you'll need a Kubernetes cluster **1.13**
-or newer with **Load Balancer** support.
+or newer with **Load Balancer** support and **RBAC** enabled.
 Make sure you have the following tools installed locally:
 * kubectl 1.14
-* helm 3.0
 * git 2.20
 
+## Helm v3
+
+Download the Helm v3 CLI:
+
+```sh
+OS=darwin-amd64 && \
+mkdir -p $HOME/.helm3/bin && \
+curl -sSL "https://get.helm.sh/helm-v3.0.0-beta.3-${OS}.tar.gz" | tar xvz && \
+chmod +x ${OS}/helm && mv ${OS}/helm $HOME/.helm3/bin/helmv3
+```
+
 ## Git
 
 Fork the [workshop](https://github.com/stefanprodan/gitops-helm-workshop) repository
@@ -45,14 +55,22 @@ Cluster state directory structure:
 Add FluxCD repository to Helm repos:
 
 ```sh
-helm repo add fluxcd https://charts.fluxcd.io
+helmv3 repo add fluxcd https://charts.fluxcd.io
+```
+
+Create the fluxcd namespace:
+
+```sh
+kubectl create ns fluxcd
 ```
 
 Install Flux by providing your GitHub repository URL:
 
 ```sh
-helm upgrade -i flux fluxcd/flux --wait \
+helmv3 upgrade -i flux fluxcd/flux --wait \
 --namespace fluxcd \
+--set registry.pollInterval=1m \
+--set git.pollInterval=1m \
 --set git.url=git@github.com:${GHUSER}/gitops-helm-workshop
 ```
 
@@ -81,13 +99,27 @@ paste the Flux public key and click `Add key`.
 
 ## Helm Operator
 
+Install the HelmRelease CRD:
+
+```sh
+kubectl apply -f https://raw.githubusercontent.com/fluxcd/helm-operator/helm-v3/deploy/flux-helm-release-crd.yaml
+```
+
 Install Flux Helm Operator in the `fluxcd` namespace:
 
 ```sh
-helm upgrade -i helm-operator fluxcd/helm-operator --wait \
+helmv3 upgrade -i helm-operator fluxcd/helm-operator --wait \
 --namespace fluxcd \
---set createCRD=true \
---set git.ssh.secretName=flux-git-deploy
+--set git.ssh.secretName=flux-git-deploy \
+--set git.pollInterval=1m \
+--set chartsSyncInterval=1m \
+--set configureRepositories.enable=true \
+--set configureRepositories.repositories[0].name=stable \
+--set configureRepositories.repositories[0].url=https://kubernetes-charts.storage.googleapis.com \
+--set extraEnvs[0].name=HELM_VERSION \
+--set extraEnvs[0].value=v3 \
+--set image.repository=docker.io/fluxcd/helm-operator-prerelease \
+--set image.tag=helm-v3-3f3ca506
 ```
 
 ## Linkerd
@@ -116,13 +148,19 @@ linkerd check
 Add Flagger Helm repository:
 
 ```sh
-helm repo add flagger https://flagger.app
+helmv3 repo add flagger https://flagger.app
+```
+
+Install Flagger's Canary CRD:
+
+```sh
+kubectl apply -f https://raw.githubusercontent.com/weaveworks/flagger/master/artifacts/flagger/crd.yaml
 ```
 
 Install Flagger in the `linkerd` namespace:
 
 ```sh
-helm upgrade -i flagger flagger/flagger --wait \
+helmv3 upgrade -i flagger flagger/flagger --wait \
 --namespace linkerd \
 --set crd.create=true \
 --set metricsServer=http://linkerd-prometheus:9090 \