Merge pull request #733 from weaveworks/deps-update

Update Istio to v1.8.0
fluxcd · Nov 23, 2020 · 58de5ab · 58de5ab
2 parents 9b5b1a1 + 6a0ab87
commit 58de5ab
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/docs/gitbook/tutorials/istio-ab-testing.md b/docs/gitbook/tutorials/istio-ab-testing.md
@@ -10,15 +10,17 @@ This is particularly useful for frontend applications that require session affin
 
 ## Prerequisites
 
-Flagger requires a Kubernetes cluster **v1.11** or newer and Istio **v1.0** or newer.
+Flagger requires a Kubernetes cluster **v1.14** or newer and Istio **v1.0** or newer.
 
 Install Istio with telemetry support and Prometheus:
 
 ```bash
-istioctl manifest apply --set profile=default
+istioctl manifest install --set profile=default
+
+kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.8/samples/addons/prometheus.yaml
 ```
 
-Install Flagger using Kustomize (kubectl 1.14) in the `istio-system` namespace:
+Install Flagger in the `istio-system` namespace:
 
 ```bash
 kubectl apply -k github.com/weaveworks/flagger//kustomize/istio

diff --git a/docs/gitbook/tutorials/istio-progressive-delivery.md b/docs/gitbook/tutorials/istio-progressive-delivery.md
@@ -6,17 +6,17 @@ This guide shows you how to use Istio and Flagger to automate canary deployments
 
 ## Prerequisites
 
-Flagger requires a Kubernetes cluster **v1.11** or newer and Istio **v1.5** or newer.
+Flagger requires a Kubernetes cluster **v1.14** or newer and Istio **v1.5** or newer.
 
 Install Istio with telemetry support and Prometheus:
 
 ```bash
-istioctl manifest apply --set profile=default
-# istio 1.7 or newer
-istioctl install --set profile=default
+istioctl manifest install --set profile=default
+
+kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.8/samples/addons/prometheus.yaml
 ```
 
-Install Flagger using Kustomize (kubectl >= 1.14) in the `istio-system` namespace:
+Install Flagger in the `istio-system` namespace:
 
 ```bash
 kubectl apply -k github.com/weaveworks/flagger//kustomize/istio

diff --git a/test/e2e-istio.sh b/test/e2e-istio.sh
@@ -2,19 +2,19 @@
 
 set -o errexit
 
-ISTIO_VER="1.7.3"
+ISTIO_VER="1.8.0"
 REPO_ROOT=$(git rev-parse --show-toplevel)
 
 echo ">>> Downloading Istio ${ISTIO_VER}"
 cd ${REPO_ROOT}/bin && \
 curl -L https://istio.io/downloadIstio | ISTIO_VERSION=${ISTIO_VER} sh -
 
 echo ">>> Installing Istio ${ISTIO_VER}"
-${REPO_ROOT}/bin/istio-${ISTIO_VER}/bin/istioctl manifest install --set profile=default \
+${REPO_ROOT}/bin/istio-${ISTIO_VER}/bin/istioctl manifest install --set profile=default --skip-confirmation \
   --set values.pilot.resources.requests.cpu=100m \
   --set values.pilot.resources.requests.memory=100Mi
 
-kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.7/samples/addons/prometheus.yaml
+kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.8/samples/addons/prometheus.yaml
 kubectl -n istio-system rollout status deployment/prometheus
 
 kubectl -n istio-system get all