MAISTRA-1367 Use maistra bookinfo images in bookinfo example (#237)

MAISTRA-1528 Update bookinfo to pick up CVE fixes (cherry picked from commit 230e9f2) MAISTRA-1783 maistra istio samples yaml files need sidecar injection for testing (#172) Co-authored-by: Marko Lukša <marko.luksa@gmail.com>
maistra · Jan 22, 2021 · 27f243c · 27f243c
1 parent dc7fccd
commit 27f243c
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 16 deletions.
diff --git a/samples/bookinfo/platform/kube/bookinfo-db.yaml b/samples/bookinfo/platform/kube/bookinfo-db.yaml
@@ -46,8 +46,8 @@ spec:
         version: v1
     spec:
       containers:
-      - name: mongodb 
-        image: docker.io/istio/examples-bookinfo-mongodb:1.16.2
+      - name: mongodb
+        image: maistra/examples-bookinfo-mongodb:2.0.0
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 27017

diff --git a/samples/bookinfo/platform/kube/bookinfo-details-v2.yaml b/samples/bookinfo/platform/kube/bookinfo-details-v2.yaml
@@ -36,7 +36,7 @@ spec:
     spec:
       containers:
       - name: details
-        image: docker.io/istio/examples-bookinfo-details-v2:1.16.2
+        image: maistra/examples-bookinfo-details-v2:2.0.0
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9080

diff --git a/samples/bookinfo/platform/kube/bookinfo-details.yaml b/samples/bookinfo/platform/kube/bookinfo-details.yaml
@@ -50,7 +50,7 @@ spec:
     spec:
       containers:
       - name: details
-        image: docker.io/istio/examples-bookinfo-details-v1:1.16.2
+        image: maistra/examples-bookinfo-details-v1:2.0.0
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9080

diff --git a/samples/bookinfo/platform/kube/bookinfo-mysql.yaml b/samples/bookinfo/platform/kube/bookinfo-mysql.yaml
@@ -59,7 +59,7 @@ spec:
     spec:
       containers:
       - name: mysqldb
-        image: docker.io/istio/examples-bookinfo-mysqldb:1.16.2
+        image: maistra/examples-bookinfo-mysqldb:2.0.0
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 3306

diff --git a/samples/bookinfo/platform/kube/bookinfo-ratings-v2-mysql-vm.yaml b/samples/bookinfo/platform/kube/bookinfo-ratings-v2-mysql-vm.yaml
@@ -33,7 +33,7 @@ spec:
     spec:
       containers:
       - name: ratings
-        image: docker.io/istio/examples-bookinfo-ratings-v2:1.16.2
+        image: maistra/examples-bookinfo-ratings-v2:2.0.0
         imagePullPolicy: IfNotPresent
         env:
           # This assumes you registered your mysql vm as

diff --git a/samples/bookinfo/platform/kube/bookinfo-ratings-v2-mysql.yaml b/samples/bookinfo/platform/kube/bookinfo-ratings-v2-mysql.yaml
@@ -33,7 +33,7 @@ spec:
     spec:
       containers:
       - name: ratings
-        image: docker.io/istio/examples-bookinfo-ratings-v2:1.16.2
+        image: maistra/examples-bookinfo-ratings-v2:2.0.0
         imagePullPolicy: IfNotPresent
         env:
           # ratings-v2 will use mongodb as the default db backend.

diff --git a/samples/bookinfo/platform/kube/bookinfo-ratings-v2.yaml b/samples/bookinfo/platform/kube/bookinfo-ratings-v2.yaml
@@ -39,7 +39,7 @@ spec:
       serviceAccountName: bookinfo-ratings-v2
       containers:
       - name: ratings
-        image: docker.io/istio/examples-bookinfo-ratings-v2:1.16.2
+        image: maistra/examples-bookinfo-ratings-v2:2.0.0
         imagePullPolicy: IfNotPresent
         env:
           # ratings-v2 will use mongodb as the default db backend.

diff --git a/samples/bookinfo/platform/kube/bookinfo-ratings.yaml b/samples/bookinfo/platform/kube/bookinfo-ratings.yaml
@@ -50,7 +50,7 @@ spec:
     spec:
       containers:
       - name: ratings
-        image: docker.io/istio/examples-bookinfo-ratings-v1:1.16.2
+        image: maistra/examples-bookinfo-ratings-v1:2.0.0
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9080

diff --git a/samples/bookinfo/platform/kube/bookinfo-reviews-v2.yaml b/samples/bookinfo/platform/kube/bookinfo-reviews-v2.yaml
@@ -36,7 +36,7 @@ spec:
     spec:
       containers:
       - name: reviews
-        image: docker.io/istio/examples-bookinfo-reviews-v2:1.16.2
+        image: maistra/examples-bookinfo-reviews-v2:2.0.0
         imagePullPolicy: IfNotPresent
         env:
         - name: LOG_DIR

diff --git a/samples/bookinfo/platform/kube/bookinfo.yaml b/samples/bookinfo/platform/kube/bookinfo.yaml
@@ -72,7 +72,7 @@ spec:
       serviceAccountName: bookinfo-details
       containers:
       - name: details
-        image: docker.io/istio/examples-bookinfo-details-v1:1.16.2
+        image: maistra/examples-bookinfo-details-v1:2.0.0
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9080
@@ -123,7 +123,7 @@ spec:
       serviceAccountName: bookinfo-ratings
       containers:
       - name: ratings
-        image: docker.io/istio/examples-bookinfo-ratings-v1:1.16.2
+        image: maistra/examples-bookinfo-ratings-v1:2.0.0
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9080
@@ -174,7 +174,7 @@ spec:
       serviceAccountName: bookinfo-reviews
       containers:
       - name: reviews
-        image: docker.io/istio/examples-bookinfo-reviews-v1:1.16.2
+        image: maistra/examples-bookinfo-reviews-v1:2.0.0
         imagePullPolicy: IfNotPresent
         env:
         - name: LOG_DIR
@@ -214,7 +214,7 @@ spec:
       serviceAccountName: bookinfo-reviews
       containers:
       - name: reviews
-        image: docker.io/istio/examples-bookinfo-reviews-v2:1.16.2
+        image: maistra/examples-bookinfo-reviews-v2:2.0.0
         imagePullPolicy: IfNotPresent
         env:
         - name: LOG_DIR
@@ -254,7 +254,7 @@ spec:
       serviceAccountName: bookinfo-reviews
       containers:
       - name: reviews
-        image: docker.io/istio/examples-bookinfo-reviews-v3:1.16.2
+        image: maistra/examples-bookinfo-reviews-v3:2.0.0
         imagePullPolicy: IfNotPresent
         env:
         - name: LOG_DIR
@@ -318,7 +318,7 @@ spec:
       serviceAccountName: bookinfo-productpage
       containers:
       - name: productpage
-        image: docker.io/istio/examples-bookinfo-productpage-v1:1.16.2
+        image: maistra/examples-bookinfo-productpage-v1:2.0.0
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9080

diff --git a/samples/httpbin/httpbin.yaml b/samples/httpbin/httpbin.yaml
@@ -47,6 +47,8 @@ spec:
       version: v1
   template:
     metadata:
+      annotations:
+        sidecar.istio.io/inject: "true"
       labels:
         app: httpbin
         version: v1

diff --git a/samples/httpbin/sample-client/fortio-deploy.yaml b/samples/httpbin/sample-client/fortio-deploy.yaml
@@ -27,6 +27,7 @@ spec:
         # This annotation causes Envoy to serve cluster.outbound statistics via 15000/stats
         # in addition to the stats normally served by Istio.  The Circuit Breaking example task
         # gives an example of inspecting Envoy stats.
+        sidecar.istio.io/inject: "true"
         sidecar.istio.io/statsInclusionPrefixes: cluster.outbound,cluster_manager,listener_manager,http_mixer_filter,tcp_mixer_filter,server,cluster.xds-grpc
       labels:
         app: fortio

diff --git a/samples/https/nginx-app.yaml b/samples/https/nginx-app.yaml
@@ -21,6 +21,8 @@ spec:
   replicas: 1
   template:
     metadata:
+      annotations:
+        sidecar.istio.io/inject: "true"
       labels:
         app: nginx
     spec:

diff --git a/samples/sleep/sleep.yaml b/samples/sleep/sleep.yaml
@@ -45,6 +45,8 @@ spec:
       app: sleep
   template:
     metadata:
+      annotations:
+        sidecar.istio.io/inject: "true"
       labels:
         app: sleep
     spec: