Merge branch 'main' into release/v0.7.2

GoogleCloudPlatform · Nov 3, 2021 · 03dfad6 · 03dfad6
2 parents 2d8bffb + ddfae85
commit 03dfad6
Show file tree

Hide file tree

Showing 18 changed files with 34 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ With Sandbox, we provide a tool that automatically provisions a new demo cluster
 
 Click the Cloud Shell button for automated one-click installation of a new Sandbox cluster in a new Google Cloud Project.
 
-[![Open in Cloud Shell](http://www.gstatic.com/cloudssh/images/open-btn.svg)](https://console.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https://github.com/GoogleCloudPlatform/cloud-ops-sandbox.git&cloudshell_git_branch=develop&shellonly=true&cloudshell_image=gcr.io/stackdriver-sandbox-230822/cloudshell-image/uncertified:latest&cloudshell_tutorial=docs/tutorial.md)
+[![Open in Cloud Shell](http://www.gstatic.com/cloudssh/images/open-btn.svg)](https://console.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https://github.com/GoogleCloudPlatform/cloud-ops-sandbox.git&cloudshell_git_branch=v0.7.1&shellonly=true&cloudshell_image=gcr.io/stackdriver-sandbox-230822/cloudshell-image/uncertified:v0.7.1&cloudshell_tutorial=docs/tutorial.md)
 
 __Note__: If installation stops due to billing account errors, set up the billing account and type: `sandboxctl create`.
 

diff --git a/cloud-shell/Dockerfile b/cloud-shell/Dockerfile
@@ -29,7 +29,7 @@ RUN python3 -m pip install click==8.0.1
 RUN python3 -m pip install google-cloud-monitoring==2.4.0
 
 # set env var
-RUN echo "VERSION=develop" >> /etc/environment
+RUN echo "VERSION=v0.7.1" >> /etc/environment
 
 # Change "Open in Cloudshell" script to run `sandboxctl create` using local file and changing it
 COPY cloudshell_open_cp.sh /google/devshell/bashrc.google.d/cloudshell_open.sh
diff --git a/kubernetes-manifests/adservice.yaml b/kubernetes-manifests/adservice.yaml
@@ -27,8 +27,8 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: adservice
-        image: gcr.io/stackdriver-sandbox-230822/sandbox/adservice:latest
+      - name: server
+        image: gcr.io/stackdriver-sandbox-230822/sandbox/adservice:v0.7.1
         ports:
         - containerPort: 9555
         env:

diff --git a/kubernetes-manifests/cartservice.yaml b/kubernetes-manifests/cartservice.yaml
@@ -31,8 +31,8 @@ spec:
           image: busybox
           command: ['bin/sh', '-c', 'until nslookup redis-cart; do echo waiting for redis; sleep 2; done;']
       containers:
-      - name: cartservice
-        image: gcr.io/stackdriver-sandbox-230822/sandbox/cartservice:latest
+      - name: server
+        image: gcr.io/stackdriver-sandbox-230822/sandbox/cartservice:v0.7.1
         ports:
         - containerPort: 7070
         env:
@@ -109,4 +109,4 @@ data:
       pipelines:
         traces:
           receivers: [otlp] # Receive otlp-formatted data from microservice using OpenTelemetry SDK
-          exporters: [otlp] # Export to OpenTelemtry collector agent on same host
+          exporters: [otlp] # Export to OpenTelemtry collector agent on same host
diff --git a/kubernetes-manifests/checkoutservice.yaml b/kubernetes-manifests/checkoutservice.yaml
@@ -26,8 +26,8 @@ spec:
         app: checkoutservice
     spec:
       containers:
-        - name: checkoutservice
-          image: gcr.io/stackdriver-sandbox-230822/sandbox/checkoutservice:latest
+        - name: server
+          image: gcr.io/stackdriver-sandbox-230822/sandbox/checkoutservice:v0.7.1
           ports:
           - containerPort: 5050
           readinessProbe:

diff --git a/kubernetes-manifests/currencyservice.yaml b/kubernetes-manifests/currencyservice.yaml
@@ -27,8 +27,8 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: currencyservice
-        image: gcr.io/stackdriver-sandbox-230822/sandbox/currencyservice:latest
+      - name: server
+        image: gcr.io/stackdriver-sandbox-230822/sandbox/currencyservice:v0.7.1
         ports:
         - name: grpc
           containerPort: 7000

diff --git a/kubernetes-manifests/emailservice.yaml b/kubernetes-manifests/emailservice.yaml
@@ -27,8 +27,8 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: emailservice
-        image: gcr.io/stackdriver-sandbox-230822/sandbox/emailservice:latest
+      - name: server
+        image: gcr.io/stackdriver-sandbox-230822/sandbox/emailservice:v0.7.1
         ports:
         - containerPort: 8080
         readinessProbe:

diff --git a/kubernetes-manifests/frontend.yaml b/kubernetes-manifests/frontend.yaml
@@ -26,8 +26,8 @@ spec:
         app: frontend
     spec:
       containers:
-        - name: frontend
-          image: gcr.io/stackdriver-sandbox-230822/sandbox/frontend:latest
+        - name: server
+          image: gcr.io/stackdriver-sandbox-230822/sandbox/frontend:v0.7.1
           ports:
           - containerPort: 8080
           readinessProbe:

diff --git a/kubernetes-manifests/opentelemetrycollector.yaml b/kubernetes-manifests/opentelemetrycollector.yaml
@@ -100,4 +100,4 @@ data:
         traces:
           receivers: [otlp] # Receive otlp-formatted data from other collector instances
           processors: []
-          exporters: [googlecloud] # Export directly to Google Cloud
+          exporters: [googlecloud] # Export directly to Google Cloud
diff --git a/kubernetes-manifests/paymentservice.yaml b/kubernetes-manifests/paymentservice.yaml
@@ -27,8 +27,8 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: paymentservice
-        image: gcr.io/stackdriver-sandbox-230822/sandbox/paymentservice:latest
+      - name: server
+        image: gcr.io/stackdriver-sandbox-230822/sandbox/paymentservice:v0.7.1
         ports:
         - containerPort: 50051
         readinessProbe:

diff --git a/kubernetes-manifests/productcatalogservice.yaml b/kubernetes-manifests/productcatalogservice.yaml
@@ -27,8 +27,8 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: productcatalogservice
-        image: gcr.io/stackdriver-sandbox-230822/sandbox/productcatalogservice:latest
+      - name: server
+        image: gcr.io/stackdriver-sandbox-230822/sandbox/productcatalogservice:v0.7.1
         ports:
         - containerPort: 3550
         readinessProbe:

diff --git a/kubernetes-manifests/recommendationservice.yaml b/kubernetes-manifests/recommendationservice.yaml
@@ -27,8 +27,8 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: recommendationservice
-        image: gcr.io/stackdriver-sandbox-230822/sandbox/recommendationservice:latest
+      - name: server
+        image: gcr.io/stackdriver-sandbox-230822/sandbox/recommendationservice:v0.7.1
         ports:
         - containerPort: 8080
         env:

diff --git a/kubernetes-manifests/shippingservice.yaml b/kubernetes-manifests/shippingservice.yaml
@@ -26,8 +26,8 @@ spec:
         app: shippingservice
     spec:
       containers:
-      - name: shippingservice
-        image: gcr.io/stackdriver-sandbox-230822/sandbox/shippingservice:latest
+      - name: server
+        image: gcr.io/stackdriver-sandbox-230822/sandbox/shippingservice:v0.7.1
         ports:
         - containerPort: 50051
         readinessProbe:

diff --git a/loadgenerator-manifests/loadgenerator.yaml b/loadgenerator-manifests/loadgenerator.yaml
@@ -30,7 +30,7 @@ spec:
     spec:
       containers:
         - name: locust-main
-          image: gcr.io/stackdriver-sandbox-230822/sandbox/loadgenerator/gke:latest
+          image: gcr.io/stackdriver-sandbox-230822/sandbox/loadgenerator/gke:v0.7.1
           imagePullPolicy: Always
           env:
             - name: LOCUST_MODE

diff --git a/terraform/telemetry.py b/terraform/telemetry.py
@@ -90,7 +90,7 @@ def send_telemetry_message(session, project_id, event, version):
 
     # connect to pubsub and send message
     project_id = "stackdriver-sandbox-230822"
-    topic_id = "telemetry_test"
+    topic_id = "telemetry_prod"
     publisher = pubsub_v1.PublisherClient()
     topic_path = publisher.topic_path(project_id, topic_id)
 

diff --git a/website/config.toml b/website/config.toml
@@ -96,7 +96,7 @@ archived_version = false
 # The version number for the version of the docs represented in this doc set.
 # Used in the "version-banner" partial to display a version number for the 
 # current doc set.
-version = "v0.7.0"
+version = "v0.7.1"
 
 # A link to latest version of the docs. Used in the "version-banner" partial to
 # point people to the main doc site.

diff --git a/website/deploy/index.html b/website/deploy/index.html
@@ -59,7 +59,8 @@ <h3>Cloud Operations Sandbox is an open source tool* that helps practitioners to
       <h2>Get started now</h2>
       <div class="steps">
         <div class="step step-1">
-          <a class="console-btn" href="https://console.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https://github.com/GoogleCloudPlatform/cloud-ops-sandbox.git&cloudshell_git_branch=develop&shellonly=true&cloudshell_image=gcr.io/stackdriver-sandbox-230822/cloudshell-image/uncertified:latest&cloudshell_tutorial=docs/tutorial.md"
+
+          <a class="console-btn" href="https://console.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https://github.com/GoogleCloudPlatform/cloud-ops-sandbox.git&cloudshell_git_branch=v0.7.1&shellonly=true&cloudshell_image=gcr.io/stackdriver-sandbox-230822/cloudshell-image/uncertified:v0.7.1&cloudshell_tutorial=docs/tutorial.md"
              target="_blank">Open in Google Cloud Shell</a>
         </div>
         <img src="images/bg_02.png" class="cloud-shell" alt="cloud shell">
@@ -77,9 +78,9 @@ <h2>Next steps</h2>
   </section>
 
   <footer>
-    <p class="fineprint">* Note: This is <b>NOT</b> an official Google product. Customers will be billed for using cloud resources when creating a sandbox cluster.
-      <button onclick="userfeedback.api.startFeedback({ 'productId': '5235454', 'productVersion': 'develop' });">Submit Feedback</button>
-    </p>
+    <p class="fineprint">* Note: This is <b>NOT</b> an official Google product. Customers will be billed for using cloud resources when creating a sandbox cluster. 
+    <button onclick="userfeedback.api.startFeedback({ 'productId': '5235454', 'productVersion': 'v0.7.1' });">Submit Feedback</button>
+      </p>
   </footer>
 </body>
 </html>
diff --git a/website/layouts/index.html b/website/layouts/index.html
@@ -56,7 +56,7 @@ <h3>Cloud Operations Sandbox is an open source tool* that helps practitioners to
       <h2>Get started now</h2>
       <div class="steps">
         <div class="step step-1">
-          <a class="console-btn" href="https://console.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https://github.com/GoogleCloudPlatform/cloud-ops-sandbox.git&cloudshell_git_branch=develop&shellonly=true&cloudshell_image=gcr.io/stackdriver-sandbox-230822/cloudshell-image/uncertified:latest&cloudshell_tutorial=docs/tutorial.md"
+          <a class="console-btn" href="https://console.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https://github.com/GoogleCloudPlatform/cloud-ops-sandbox.git&cloudshell_git_branch=v0.7.1&shellonly=true&cloudshell_image=gcr.io/stackdriver-sandbox-230822/cloudshell-image/uncertified:v0.7.1&cloudshell_tutorial=docs/tutorial.md"
              target="_blank">Open in Google Cloud Shell</a>
         </div>
         <img src="images/bg_02.png" class="cloud-shell" alt="cloud shell">
@@ -75,7 +75,7 @@ <h2>Next steps</h2>
 
   <footer>
     <p class="fineprint">* Note: This is <b>NOT</b> an official Google product. Customers will be billed for using cloud resources when creating a sandbox cluster.
-      <button onclick="userfeedback.api.startFeedback({ 'productId': '5235454', 'productVersion': 'develop' });">Submit Feedback</button>
+      <button onclick="userfeedback.api.startFeedback({ 'productId': '5235454', 'productVersion': 'v0.7.1' });">Submit Feedback</button>
     </p>
   </footer>
 </body>