Merge branch 'feature/istio/bookinfo' into develop

Author: codejsha

istio/bookinfo/README.md

@@ -1,44 +1,16 @@
 # Istio Bookinfo
 
-- https://github.com/istio/istio/tree/master/samples/bookinfo
-- https://istio.io/latest/docs/examples/bookinfo/
-
-## Deploy
+## Deploy Resources
 
 ```bash
+### using kubectl apply:
 bash ./all.sh
 
-### kustomize
+### using kustomize:
 bash ./kustomize-install-bookinfo.sh
 ```
 
-## Traffic management
-
-### Virtual services
-
-- `bookinfo-vs-rewrite.yaml`
-- `bookinfo-vs.yaml`
-- `vs-all-v1.yaml`
-- `vs-all.yaml`
-- `vs-ratings-abort-fault.yaml`
-- `vs-ratings-delay-fault.yaml`
-- `vs-ratings-retry.yaml`
-- `vs-reviews-80-20.yaml`
-- `vs-reviews-match-v2.yaml`
-- `vs-reviews-match-v3.yaml`
-- `vs-reviews-retry.yaml`
-- `vs-reviews-v1.yaml`
-
-### Destination rules
-
-- `dr-all.yaml`
-- `dr-reviews-conn-pool.yaml`
-- `dr-reviews-least-conn.yaml`
-- `dr-reviews-outlier.yaml`
-- `dr-reviews-random.yaml`
-- `dr-reviews-round-robin.yaml`
-- `dr-reviews-timeout.yaml`
-
-### Gateways
+## References
 
-- `bookinfo-gw.yaml`
+- Bookinfo Sample - Istio GitHub: <https://github.com/istio/istio/tree/master/samples/bookinfo>
+- Bookinfo Application - Istio: <https://istio.io/latest/docs/examples/bookinfo/>

istio/bookinfo/all.sh

@@ -24,14 +24,16 @@ kubectl apply --filename https://raw.githubusercontent.com/istio/istio/master/sa
 #     -c ratings -- curl productpage:9080/productpage | grep -o "<title>.*</title>"
 
 ### deploy networking
-kubectl apply --filename https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/networking/destination-rule-all.yaml
-kubectl apply --filename https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/networking/bookinfo-gateway.yaml
+# kubectl apply --filename https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/networking/destination-rule-all.yaml
+# kubectl apply --filename https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/networking/bookinfo-gateway.yaml
 
 ### check bookinfo gateway
 # kubectl get gateways
 # istioctl analyze
 # kubectl get services istio-ingressgateway --namespace istio-system
 
+######################################################################
+
 ### delete
 # kubectl delete --filename https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/networking/bookinfo-gateway.yaml
 # kubectl delete --filename https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/platform/kube/bookinfo.yaml

istio/bookinfo/bookinfo.yaml

@@ -61,7 +61,7 @@ spec:
       serviceAccountName: bookinfo-details
       containers:
         - name: details
-          image: docker.io/istio/examples-bookinfo-details-v1:1.16.2
+          image: docker.io/istio/examples-bookinfo-details-v1:1.20.2
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 9080
@@ -112,7 +112,7 @@ spec:
       serviceAccountName: bookinfo-ratings
       containers:
         - name: ratings
-          image: docker.io/istio/examples-bookinfo-ratings-v1:1.16.2
+          image: docker.io/istio/examples-bookinfo-ratings-v1:1.20.2
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 9080
@@ -163,7 +163,7 @@ spec:
       serviceAccountName: bookinfo-reviews
       containers:
         - name: reviews
-          image: docker.io/istio/examples-bookinfo-reviews-v1:1.16.2
+          image: docker.io/istio/examples-bookinfo-reviews-v1:1.20.2
           imagePullPolicy: IfNotPresent
           env:
             - name: LOG_DIR
@@ -203,7 +203,7 @@ spec:
       serviceAccountName: bookinfo-reviews
       containers:
         - name: reviews
-          image: docker.io/istio/examples-bookinfo-reviews-v2:1.16.2
+          image: docker.io/istio/examples-bookinfo-reviews-v2:1.20.2
           imagePullPolicy: IfNotPresent
           env:
             - name: LOG_DIR
@@ -243,7 +243,7 @@ spec:
       serviceAccountName: bookinfo-reviews
       containers:
         - name: reviews
-          image: docker.io/istio/examples-bookinfo-reviews-v3:1.16.2
+          image: docker.io/istio/examples-bookinfo-reviews-v3:1.20.2
           imagePullPolicy: IfNotPresent
           env:
             - name: LOG_DIR
@@ -300,14 +300,18 @@ spec:
       version: v1
   template:
     metadata:
+      annotations:
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "9080"
+        prometheus.io/path: "/metrics"
       labels:
         app: productpage
         version: v1
     spec:
       serviceAccountName: bookinfo-productpage
       containers:
         - name: productpage
-          image: docker.io/istio/examples-bookinfo-productpage-v1:1.16.2
+          image: docker.io/istio/examples-bookinfo-productpage-v1:1.20.2
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 9080

istio/bookinfo/kustomization.yaml

@@ -1,9 +1,11 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: bookinfo
-commonLabels:
-  owner: developer
-  app: bookinfo
+labels:
+  - includeSelectors: true
+    pairs:
+      app: bookinfo
+      owner: developer
 resources:
   - https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/platform/kube/bookinfo.yaml
   # - https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/platform/kube/bookinfo-details-v2.yaml

istio/bookinfo/dr-all.yaml renamed to istio/bookinfo/networking/dr-all.yaml

@@ -1,4 +1,4 @@
-apiVersion: networking.istio.io/v1alpha3
+apiVersion: networking.istio.io/v1
 kind: DestinationRule
 metadata:
   name: productpage
@@ -9,7 +9,7 @@ spec:
       labels:
         version: v1
 ---
-apiVersion: networking.istio.io/v1alpha3
+apiVersion: networking.istio.io/v1
 kind: DestinationRule
 metadata:
   name: reviews
@@ -26,7 +26,7 @@ spec:
       labels:
         version: v3
 ---
-apiVersion: networking.istio.io/v1alpha3
+apiVersion: networking.istio.io/v1
 kind: DestinationRule
 metadata:
   name: ratings
@@ -46,7 +46,7 @@ spec:
       labels:
         version: v2-mysql-vm
 ---
-apiVersion: networking.istio.io/v1alpha3
+apiVersion: networking.istio.io/v1
 kind: DestinationRule
 metadata:
   name: details

istio/bookinfo/dr-details-lb.yaml renamed to istio/bookinfo/networking/dr-details-lb.yaml

@@ -1,5 +1,4 @@
----
-apiVersion: networking.istio.io/v1alpha3
+apiVersion: networking.istio.io/v1
 kind: DestinationRule
 metadata:
   name: details

istio/bookinfo/dr-reviews-conn-pool.yaml renamed to istio/bookinfo/networking/dr-reviews-conn-pool.yaml

@@ -1,4 +1,4 @@
-apiVersion: networking.istio.io/v1alpha3
+apiVersion: networking.istio.io/v1
 kind: DestinationRule
 metadata:
   name: reviews

istio/bookinfo/dr-reviews-least-conn.yaml renamed to istio/bookinfo/networking/dr-reviews-least-conn.yaml

@@ -1,4 +1,4 @@
-apiVersion: networking.istio.io/v1alpha3
+apiVersion: networking.istio.io/v1
 kind: DestinationRule
 metadata:
   name: reviews

istio/bookinfo/dr-reviews-outlier.yaml renamed to istio/bookinfo/networking/dr-reviews-outlier.yaml

@@ -1,4 +1,4 @@
-apiVersion: networking.istio.io/v1alpha3
+apiVersion: networking.istio.io/v1
 kind: DestinationRule
 metadata:
   name: reviews

istio/bookinfo/dr-reviews-random.yaml renamed to istio/bookinfo/networking/dr-reviews-random.yaml

@@ -1,4 +1,4 @@
-apiVersion: networking.istio.io/v1alpha3
+apiVersion: networking.istio.io/v1
 kind: DestinationRule
 metadata:
   name: reviews