Release v0.4.2

GoogleCloudPlatform · Nov 22, 2022 · 4e53561 · 4e53561
1 parent 0974cec
commit 4e53561
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 78 deletions.
diff --git a/kustomize/base/adservice.yaml b/kustomize/base/adservice.yaml
@@ -41,16 +41,12 @@ spec:
               - all
           privileged: false
           readOnlyRootFilesystem: true
-        image: gcr.io/google-samples/microservices-demo/adservice:v0.4.1
+        image: gcr.io/google-samples/microservices-demo/adservice:v0.4.2
         ports:
         - containerPort: 9555
         env:
         - name: PORT
           value: "9555"
-        - name: DISABLE_STATS
-          value: "1"
-        - name: DISABLE_TRACING
-          value: "1"
         resources:
           requests:
             cpu: 200m

diff --git a/kustomize/base/cartservice.yaml b/kustomize/base/cartservice.yaml
@@ -41,7 +41,7 @@ spec:
               - all
           privileged: false
           readOnlyRootFilesystem: true
-        image: gcr.io/google-samples/microservices-demo/cartservice:v0.4.1
+        image: gcr.io/google-samples/microservices-demo/cartservice:v0.4.2
         ports:
         - containerPort: 7070
         env:

diff --git a/kustomize/base/checkoutservice.yaml b/kustomize/base/checkoutservice.yaml
@@ -40,7 +40,7 @@ spec:
                 - all
             privileged: false
             readOnlyRootFilesystem: true
-          image: gcr.io/google-samples/microservices-demo/checkoutservice:v0.4.1
+          image: gcr.io/google-samples/microservices-demo/checkoutservice:v0.4.2
           ports:
           - containerPort: 5050
           readinessProbe:
@@ -64,10 +64,6 @@ spec:
             value: "currencyservice:7000"
           - name: CART_SERVICE_ADDR
             value: "cartservice:7070"
-          - name: DISABLE_STATS
-            value: "1"
-          - name: DISABLE_TRACING
-            value: "1"
           - name: DISABLE_PROFILER
             value: "1"
           resources:

diff --git a/kustomize/base/currencyservice.yaml b/kustomize/base/currencyservice.yaml
@@ -41,15 +41,13 @@ spec:
               - all
           privileged: false
           readOnlyRootFilesystem: true
-        image: gcr.io/google-samples/microservices-demo/currencyservice:v0.4.1
+        image: gcr.io/google-samples/microservices-demo/currencyservice:v0.4.2
         ports:
         - name: grpc
           containerPort: 7000
         env:
         - name: PORT
           value: "7000"
-        - name: DISABLE_TRACING
-          value: "1"
         - name: DISABLE_PROFILER
           value: "1"
         - name: DISABLE_DEBUGGER

diff --git a/kustomize/base/emailservice.yaml b/kustomize/base/emailservice.yaml
@@ -41,14 +41,12 @@ spec:
               - all
           privileged: false
           readOnlyRootFilesystem: true
-        image: gcr.io/google-samples/microservices-demo/emailservice:v0.4.1
+        image: gcr.io/google-samples/microservices-demo/emailservice:v0.4.2
         ports:
         - containerPort: 8080
         env:
         - name: PORT
           value: "8080"
-        - name: DISABLE_TRACING
-          value: "1"
         - name: DISABLE_PROFILER
           value: "1"
         readinessProbe:

diff --git a/kustomize/base/frontend.yaml b/kustomize/base/frontend.yaml
@@ -42,7 +42,7 @@ spec:
                 - all
             privileged: false
             readOnlyRootFilesystem: true
-          image: gcr.io/google-samples/microservices-demo/frontend:v0.4.1
+          image: gcr.io/google-samples/microservices-demo/frontend:v0.4.2
           ports:
           - containerPort: 8080
           readinessProbe:
@@ -82,10 +82,8 @@ spec:
           # # When not set, defaults to "local" unless running in GKE, otherwies auto-sets to gcp 
           # - name: ENV_PLATFORM 
           #   value: "aws"
-          - name: DISABLE_TRACING
-            value: "1"
-          - name: DISABLE_PROFILER
-            value: "1"
+          - name: ENABLE_PROFILER
+            value: "0"
           # - name: CYMBAL_BRANDING
           #   value: "true"
           resources:

diff --git a/kustomize/base/loadgenerator.yaml b/kustomize/base/loadgenerator.yaml
@@ -67,7 +67,7 @@ spec:
               - all
           privileged: false
           readOnlyRootFilesystem: true
-        image: gcr.io/google-samples/microservices-demo/loadgenerator:v0.4.1
+        image: gcr.io/google-samples/microservices-demo/loadgenerator:v0.4.2
         env:
         - name: FRONTEND_ADDR
           value: "frontend:80"

diff --git a/kustomize/base/paymentservice.yaml b/kustomize/base/paymentservice.yaml
@@ -41,14 +41,12 @@ spec:
               - all
           privileged: false
           readOnlyRootFilesystem: true
-        image: gcr.io/google-samples/microservices-demo/paymentservice:v0.4.1
+        image: gcr.io/google-samples/microservices-demo/paymentservice:v0.4.2
         ports:
         - containerPort: 50051
         env:
         - name: PORT
           value: "50051"
-        - name: DISABLE_TRACING
-          value: "1"
         - name: DISABLE_PROFILER
           value: "1"
         - name: DISABLE_DEBUGGER

diff --git a/kustomize/base/productcatalogservice.yaml b/kustomize/base/productcatalogservice.yaml
@@ -41,16 +41,14 @@ spec:
               - all
           privileged: false
           readOnlyRootFilesystem: true
-        image: gcr.io/google-samples/microservices-demo/productcatalogservice:v0.4.1
+        image: gcr.io/google-samples/microservices-demo/productcatalogservice:v0.4.2
         ports:
         - containerPort: 3550
         env:
+        - name: COLLECTOR_SERVICE_ADDR
+          value: "opentelemetrycollector:4317"
         - name: PORT
           value: "3550"
-        - name: DISABLE_STATS
-          value: "1"
-        - name: DISABLE_TRACING
-          value: "1"
         - name: DISABLE_PROFILER
           value: "1"
         readinessProbe:

diff --git a/kustomize/base/recommendationservice.yaml b/kustomize/base/recommendationservice.yaml
@@ -41,7 +41,7 @@ spec:
               - all
           privileged: false
           readOnlyRootFilesystem: true
-        image: gcr.io/google-samples/microservices-demo/recommendationservice:v0.4.1
+        image: gcr.io/google-samples/microservices-demo/recommendationservice:v0.4.2
         ports:
         - containerPort: 8080
         readinessProbe:
@@ -57,8 +57,6 @@ spec:
           value: "8080"
         - name: PRODUCT_CATALOG_SERVICE_ADDR
           value: "productcatalogservice:3550"
-        - name: DISABLE_TRACING
-          value: "1"
         - name: DISABLE_PROFILER
           value: "1"
         - name: DISABLE_DEBUGGER

diff --git a/kustomize/base/shippingservice.yaml b/kustomize/base/shippingservice.yaml
@@ -40,16 +40,12 @@ spec:
               - all
           privileged: false
           readOnlyRootFilesystem: true
-        image: gcr.io/google-samples/microservices-demo/shippingservice:v0.4.1
+        image: gcr.io/google-samples/microservices-demo/shippingservice:v0.4.2
         ports:
         - containerPort: 50051
         env:
         - name: PORT
           value: "50051"
-        - name: DISABLE_STATS
-          value: "1"
-        - name: DISABLE_TRACING
-          value: "1"
         - name: DISABLE_PROFILER
           value: "1"
         readinessProbe:

diff --git a/release/kubernetes-manifests.yaml b/release/kubernetes-manifests.yaml
@@ -47,14 +47,12 @@ spec:
               - all
           privileged: false
           readOnlyRootFilesystem: true
-        image: gcr.io/google-samples/microservices-demo/emailservice:v0.4.1
+        image: gcr.io/google-samples/microservices-demo/emailservice:v0.4.2
         ports:
         - containerPort: 8080
         env:
         - name: PORT
           value: "8080"
-        - name: DISABLE_TRACING
-          value: "1"
         - name: DISABLE_PROFILER
           value: "1"
         readinessProbe:
@@ -114,7 +112,7 @@ spec:
                 - all
             privileged: false
             readOnlyRootFilesystem: true
-          image: gcr.io/google-samples/microservices-demo/checkoutservice:v0.4.1
+          image: gcr.io/google-samples/microservices-demo/checkoutservice:v0.4.2
           ports:
           - containerPort: 5050
           readinessProbe:
@@ -138,10 +136,6 @@ spec:
             value: "currencyservice:7000"
           - name: CART_SERVICE_ADDR
             value: "cartservice:7070"
-          - name: DISABLE_STATS
-            value: "1"
-          - name: DISABLE_TRACING
-            value: "1"
           - name: DISABLE_PROFILER
             value: "1"
           resources:
@@ -194,7 +188,7 @@ spec:
               - all
           privileged: false
           readOnlyRootFilesystem: true
-        image: gcr.io/google-samples/microservices-demo/recommendationservice:v0.4.1
+        image: gcr.io/google-samples/microservices-demo/recommendationservice:v0.4.2
         ports:
         - containerPort: 8080
         readinessProbe:
@@ -210,8 +204,6 @@ spec:
           value: "8080"
         - name: PRODUCT_CATALOG_SERVICE_ADDR
           value: "productcatalogservice:3550"
-        - name: DISABLE_TRACING
-          value: "1"
         - name: DISABLE_PROFILER
           value: "1"
         - name: DISABLE_DEBUGGER
@@ -237,6 +229,33 @@ spec:
     port: 8080
     targetPort: 8080
 ---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+ - adservice.yaml
+ - cartservice.yaml
+ - checkoutservice.yaml
+ - currencyservice.yaml
+ - emailservice.yaml
+ - frontend.yaml
+# - loadgenerator.yaml # During development, the loadgenerator module inside skaffold.yaml will be used.
+ - paymentservice.yaml
+ - productcatalogservice.yaml
+ - recommendationservice.yaml
+ - redis.yaml
+ - shippingservice.yaml
+components:
+# - ../kustomize/components/cymbal-branding
+# - ../kustomize/components/google-cloud-operations
+# - ../kustomize/components/memorystore
+# - ../kustomize/components/network-policies
+# - ../kustomize/components/service-accounts
+# - ../kustomize/components/spanner
+# - ../kustomize/components/container-images-tag
+# - ../kustomize/components/container-images-tag-suffix
+# - ../kustomize/components/container-images-registry
+# - ../kustomize/components/native-grpc-health-check
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -267,7 +286,7 @@ spec:
                 - all
             privileged: false
             readOnlyRootFilesystem: true
-          image: gcr.io/google-samples/microservices-demo/frontend:v0.4.1
+          image: gcr.io/google-samples/microservices-demo/frontend:v0.4.2
           ports:
           - containerPort: 8080
           readinessProbe:
@@ -307,10 +326,8 @@ spec:
           # # When not set, defaults to "local" unless running in GKE, otherwies auto-sets to gcp 
           # - name: ENV_PLATFORM 
           #   value: "aws"
-          - name: DISABLE_TRACING
-            value: "1"
-          - name: DISABLE_PROFILER
-            value: "1"
+          - name: ENABLE_PROFILER
+            value: "0"
           # - name: CYMBAL_BRANDING
           #   value: "true"
           resources:
@@ -376,14 +393,12 @@ spec:
               - all
           privileged: false
           readOnlyRootFilesystem: true
-        image: gcr.io/google-samples/microservices-demo/paymentservice:v0.4.1
+        image: gcr.io/google-samples/microservices-demo/paymentservice:v0.4.2
         ports:
         - containerPort: 50051
         env:
         - name: PORT
           value: "50051"
-        - name: DISABLE_TRACING
-          value: "1"
         - name: DISABLE_PROFILER
           value: "1"
         - name: DISABLE_DEBUGGER
@@ -444,16 +459,14 @@ spec:
               - all
           privileged: false
           readOnlyRootFilesystem: true
-        image: gcr.io/google-samples/microservices-demo/productcatalogservice:v0.4.1
+        image: gcr.io/google-samples/microservices-demo/productcatalogservice:v0.4.2
         ports:
         - containerPort: 3550
         env:
+        - name: COLLECTOR_SERVICE_ADDR
+          value: "opentelemetrycollector:4317"
         - name: PORT
           value: "3550"
-        - name: DISABLE_STATS
-          value: "1"
-        - name: DISABLE_TRACING
-          value: "1"
         - name: DISABLE_PROFILER
           value: "1"
         readinessProbe:
@@ -512,7 +525,7 @@ spec:
               - all
           privileged: false
           readOnlyRootFilesystem: true
-        image: gcr.io/google-samples/microservices-demo/cartservice:v0.4.1
+        image: gcr.io/google-samples/microservices-demo/cartservice:v0.4.2
         ports:
         - containerPort: 7070
         env:
@@ -604,7 +617,7 @@ spec:
               - all
           privileged: false
           readOnlyRootFilesystem: true
-        image: gcr.io/google-samples/microservices-demo/loadgenerator:v0.4.1
+        image: gcr.io/google-samples/microservices-demo/loadgenerator:v0.4.2
         env:
         - name: FRONTEND_ADDR
           value: "frontend:80"
@@ -647,15 +660,13 @@ spec:
               - all
           privileged: false
           readOnlyRootFilesystem: true
-        image: gcr.io/google-samples/microservices-demo/currencyservice:v0.4.1
+        image: gcr.io/google-samples/microservices-demo/currencyservice:v0.4.2
         ports:
         - name: grpc
           containerPort: 7000
         env:
         - name: PORT
           value: "7000"
-        - name: DISABLE_TRACING
-          value: "1"
         - name: DISABLE_PROFILER
           value: "1"
         - name: DISABLE_DEBUGGER
@@ -715,16 +726,12 @@ spec:
               - all
           privileged: false
           readOnlyRootFilesystem: true
-        image: gcr.io/google-samples/microservices-demo/shippingservice:v0.4.1
+        image: gcr.io/google-samples/microservices-demo/shippingservice:v0.4.2
         ports:
         - containerPort: 50051
         env:
         - name: PORT
           value: "50051"
-        - name: DISABLE_STATS
-          value: "1"
-        - name: DISABLE_TRACING
-          value: "1"
         - name: DISABLE_PROFILER
           value: "1"
         readinessProbe:
@@ -849,16 +856,12 @@ spec:
               - all
           privileged: false
           readOnlyRootFilesystem: true
-        image: gcr.io/google-samples/microservices-demo/adservice:v0.4.1
+        image: gcr.io/google-samples/microservices-demo/adservice:v0.4.2
         ports:
         - containerPort: 9555
         env:
         - name: PORT
           value: "9555"
-        - name: DISABLE_STATS
-          value: "1"
-        - name: DISABLE_TRACING
-          value: "1"
         resources:
           requests:
             cpu: 200m