update istio 1.7.3

fluxcd · Oct 24, 2020 · f6163c3 · f6163c3
1 parent b90de6e
commit f6163c3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/kustomize/istio/kustomization.yaml b/kustomize/istio/kustomization.yaml
@@ -1,5 +1,6 @@
 namespace: istio-system
 bases:
   - ../base/flagger/
+  - ../base/prometheus/
 patchesStrategicMerge:
   - patch.yaml
diff --git a/kustomize/istio/patch.yaml b/kustomize/istio/patch.yaml
@@ -10,7 +10,7 @@ spec:
           args:
             - -log-level=info
             - -mesh-provider=istio
-            - -metrics-server=http://prometheus:9090
+            - -metrics-server=http://flagger-prometheus:9090
             - -slack-user=flagger
             - -slack-channel=
             - -slack-url=

diff --git a/test/e2e-istio-tests.sh b/test/e2e-istio-tests.sh
@@ -15,7 +15,7 @@ metadata:
 spec:
   provider:
     type: prometheus
-    address: http://prometheus.istio-system:9090
+    address: http://flagger-prometheus.istio-system:9090
   query: |
     histogram_quantile(
         0.99,

diff --git a/test/e2e-istio.sh b/test/e2e-istio.sh
@@ -2,20 +2,17 @@
 
 set -o errexit
 
-ISTIO_VER="1.6.7"
+ISTIO_VER="1.7.3"
 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 apply --set profile=default \
+${REPO_ROOT}/bin/istio-${ISTIO_VER}/bin/istioctl manifest install --set profile=default \
   --set values.pilot.resources.requests.cpu=100m \
-  --set values.pilot.resources.requests.memory=100Mi \
-  --set values.global.configValidation=false
-
-kubectl -n istio-system rollout status deployment/prometheus
+  --set values.pilot.resources.requests.memory=100Mi
 
 kubectl -n istio-system get all