Bump Istio to 1.0.0

ContainerSolutions · Aug 2, 2018 · 85670a0 · 85670a0
1 parent 9bdb960
commit 85670a0
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 36 deletions.
diff --git a/ab-testing/README.md b/ab-testing/README.md
@@ -39,21 +39,15 @@ Before starting, it is recommended to know the basic concept of the
 
 ### Deploy Istio
 
-In this example, Istio 0.8.0 is used.
+In this example, Istio 1.0.0 is used. To install Istio, follow the
+[instructions](https://istio.io/docs/setup/kubernetes/helm-install/) from the
+Istio website.
 
-```
-$ curl -L https://git.io/getLatestIstio | sh -
-$ cd istio-0.8.0
-$ export PATH=$PWD/bin:$PATH
-$ kubectl apply -f install/kubernetes/istio-demo.yaml
-```
-
-It might take a while to download images from the Docker registry, you can watch
-the progress using the command below and when all containers are showing with
-status "Ready" or "Completed", then you can go to the next step.
+Automatic sidecar injection should be enabled by default. Then annotate the
+default namespace to enable it.
 
 ```
-$ watch kubectl get pods -n istio-system
+$ kubectl label namespace default istio-injection=enabled
 ```
 
 ### Deploy both applications
@@ -63,8 +57,7 @@ the istioctl command to inject the Istio sidecar container which is used to
 proxy requests:
 
 ```
-$ kubectl apply -f <(istioctl kube-inject -f app-v1.yaml)
-$ kubectl apply -f <(istioctl kube-inject -f app-v2.yaml)
+$ kubectl apply -f app-v1.yaml -f app-v2.yaml
 ```
 
 Expose both services via the Istio Gateway and create a VirtualService to match

diff --git a/ab-testing/app-v1.yaml b/ab-testing/app-v1.yaml
@@ -21,6 +21,10 @@ metadata:
     app: my-app
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: my-app
+      version: v1.0.0
   template:
     metadata:
       labels:
@@ -38,8 +42,6 @@ spec:
           containerPort: 8080
         - name: probe
           containerPort: 8086
-        - name: metrics
-          containerPort: 9101
         env:
         - name: VERSION
           value: v1.0.0

diff --git a/ab-testing/app-v2.yaml b/ab-testing/app-v2.yaml
@@ -21,6 +21,10 @@ metadata:
     app: my-app
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: my-app
+      version: v2.0.0
   template:
     metadata:
       labels:
@@ -38,8 +42,6 @@ spec:
           containerPort: 8080
         - name: probe
           containerPort: 8086
-        - name: metrics
-          containerPort: 9101
         env:
         - name: VERSION
           value: v2.0.0

diff --git a/shadow/README.md b/shadow/README.md
@@ -37,21 +37,15 @@ Before starting, it is recommended to know the basic concept of the
 
 ### Deploy Istio
 
-In this example, Istio 0.8.0 is used.
+In this example, Istio 1.0.0 is used. To install Istio, follow the
+[instructions](https://istio.io/docs/setup/kubernetes/helm-install/) from the
+Istio website.
 
-```
-$ curl -L https://git.io/getLatestIstio | sh -
-$ cd istio-0.8.0
-$ export PATH=$PWD/bin:$PATH
-$ kubectl apply -f install/kubernetes/istio-demo.yaml
-```
-
-It might take a while to download images from the Docker registry, you can watch
-the progress using the command below and when all containers are showing with
-status "Ready" or "Completed", then you can go to the next step.
+Automatic sidecar injection should be enabled by default. Then annotate the
+default namespace to enable it.
 
 ```
-$ watch kubectl get pods -n istio-system
+$ kubectl label namespace default istio-injection=enabled
 ```
 
 ### Deploy both applications
@@ -61,8 +55,7 @@ istioctl command to inject the Istio sidecar container which is used to proxy
 requests:
 
 ```
-$ kubectl apply -f <(istioctl kube-inject -f app-v1.yaml)
-$ kubectl apply -f <(istioctl kube-inject -f app-v2.yaml)
+$ kubectl apply -f app-v1.yaml -f app-v2.yaml
 ```
 
 Expose both services via the Istio Gateway and create a VirtualService to match

diff --git a/shadow/app-v1.yaml b/shadow/app-v1.yaml
@@ -21,6 +21,10 @@ metadata:
     app: my-app
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: my-app
+      version: v1.0.0
   template:
     metadata:
       labels:
@@ -38,8 +42,6 @@ spec:
           containerPort: 8080
         - name: probe
           containerPort: 8086
-        - name: metrics
-          containerPort: 9101
         env:
         - name: VERSION
           value: v1.0.0

diff --git a/shadow/app-v2.yaml b/shadow/app-v2.yaml
@@ -21,6 +21,10 @@ metadata:
     app: my-app
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: my-app
+      version: v2.0.0
   template:
     metadata:
       labels:
@@ -38,8 +42,6 @@ spec:
           containerPort: 8080
         - name: probe
           containerPort: 8086
-        - name: metrics
-          containerPort: 9101
         env:
         - name: VERSION
           value: v2.0.0