update Kuma version and docs

docs/gitbook/tutorials/kuma-progressive-delivery.md

@@ -6,13 +6,13 @@ This guide shows you how to use Kuma and Flagger to automate canary deployments.
 
 ## Prerequisites
 
-Flagger requires a Kubernetes cluster **v1.16** or newer and Kuma **1.3** or newer.
+Flagger requires a Kubernetes cluster **v1.19** or newer and Kuma **1.7** or newer.
 
 Install Kuma and Prometheus (part of Kuma Metrics):
 
 ```bash
 kumactl install control-plane | kubectl apply -f -
-kumactl install metrics | kubectl apply -f -
+kumactl install observability --components "grafana,prometheus" | kubectl apply -f -
 ```
 
 Install Flagger in the `kuma-system` namespace:

kustomize/kuma/kustomization.yaml

@@ -3,3 +3,5 @@ bases:
  - ../base/flagger/
 patchesStrategicMerge:
  - patch.yaml
+resources:
+ - mesh.yaml

kustomize/kuma/mesh.yaml

@@ -0,0 +1,10 @@
+apiVersion: kuma.io/v1alpha1
+kind: Mesh
+metadata:
+ name: default
+spec:
+ metrics:
+ enabledBackend: prometheus-1
+ backends:
+ - name: prometheus-1
+ type: prometheus

kustomize/kuma/patch.yaml

@@ -11,4 +11,4 @@ spec:
  - -log-level=info
  - -include-label-prefix=app.kubernetes.io
  - -mesh-provider=kuma
- - -metrics-server=http://prometheus-server.kuma-metrics:80
+ - -metrics-server=http://prometheus-server.mesh-observability:80

test/kuma/install.sh

@@ -2,9 +2,8 @@
 
 set -o errexit
 
-KUMA_VER="1.6.0"
+KUMA_VER="2.1.0"
 REPO_ROOT=$(git rev-parse --show-toplevel)
-KUSTOMIZE_VERSION=3.8.2
 mkdir -p ${REPO_ROOT}/bin
 
 echo ">>> Downloading Kuma ${KUMA_VER}"
@@ -20,46 +19,12 @@ echo ">>> Waiting for Kuma Control Plane to be ready"
 kubectl wait --for condition=established crd/meshes.kuma.io
 kubectl -n kuma-system rollout status deployment/kuma-control-plane
 
-echo ">>> Configuring Default Kuma Mesh"
-cat <<EOF | kubectl apply -f -
-apiVersion: kuma.io/v1alpha1
-kind: Mesh
-metadata:
- name: default
-spec:
- metrics:
- enabledBackend: prometheus-1
- backends:
- - name: prometheus-1
- type: prometheus
- conf:
- skipMTLS: true
- port: 5670
- path: /metrics
- tags:
- kuma.io/service: dataplane-metrics
- mtls:
- enabledBackend: ca-1
- backends:
- - name: ca-1
- type: builtin
- mode: PERMISSIVE
- dpCert:
- rotation:
- expiration: 1d
- conf:
- caCert:
- RSAbits: 2048
- expiration: 10y
-EOF
-
-echo '>>> Installing Kustomize'
-cd ${REPO_ROOT}/bin && kustomize_url=https://github.com/kubernetes-sigs/kustomize/releases/download && \
-curl -sL ${kustomize_url}/kustomize%2Fv${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_amd64.tar.gz | \
-tar xz
+echo ">>> Installing Prometheus"
+${REPO_ROOT}/bin/kumactl install observability --components "prometheus" | kubectl apply -f -
+kubectl -n mesh-observability rollout status deployment/prometheus-server
 
 echo '>>> Installing Flagger'
-${REPO_ROOT}/bin/kustomize build ${REPO_ROOT}/test/kuma | kubectl apply -f -
+kubectl apply -k ${REPO_ROOT}/kustomize/kuma
 
 kubectl -n kuma-system set image deployment/flagger flagger=test/flagger:latest
 kubectl -n kuma-system rollout status deployment/flagger