Merge pull request #1 from GoogleCloudPlatform/main

Update from original fork
devzero-inc · Nov 18, 2024 · f0584e0 · f0584e0
2 parents 3b3153b + b0ee845
commit f0584e0
Show file tree

Hide file tree

Showing 46 changed files with 1,195 additions and 1,161 deletions.
diff --git a/.github/workflows/ci-main.yaml b/.github/workflows/ci-main.yaml
@@ -36,7 +36,7 @@ jobs:
       env:
         DOTNET_INSTALL_DIR: "./.dotnet"
       with:
-        dotnet-version: '8.0'
+        dotnet-version: '9.0'
     - uses: actions/setup-go@v5
       with:
         go-version: '1.23'

diff --git a/.github/workflows/ci-pr.yaml b/.github/workflows/ci-pr.yaml
@@ -40,7 +40,7 @@ jobs:
       env:
         DOTNET_INSTALL_DIR: "./.dotnet"
       with:
-        dotnet-version: '8.0'
+        dotnet-version: '9.0'
     - uses: actions/setup-go@v5
       with:
         go-version: '1.23'

diff --git a/.github/workflows/helm-chart-ci.yaml b/.github/workflows/helm-chart-ci.yaml
@@ -26,7 +26,7 @@ on:
       - '.github/workflows/helm-chart-ci.yaml'
 jobs:
   helm-chart-ci:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: helm lint

diff --git a/.github/workflows/kubevious-manifests-ci.yaml b/.github/workflows/kubevious-manifests-ci.yaml
@@ -30,7 +30,7 @@ permissions:
   contents: read
 jobs:
   kubevious-manifests-ci:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 1
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/kustomize-build-ci.yaml b/.github/workflows/kustomize-build-ci.yaml
@@ -26,7 +26,7 @@ on:
       - '.github/workflows/kustomize-build-ci.yaml'
 jobs:
   kustomize-build-ci:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: kustomize build base

diff --git a/.github/workflows/terraform-validate-ci.yaml b/.github/workflows/terraform-validate-ci.yaml
@@ -26,9 +26,10 @@ on:
       - '.github/workflows/terraform-validate-ci.yaml'
 jobs:
   terraform-validate-ci:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
+      - uses: hashicorp/setup-terraform@v3
       - name: terraform init & validate
         run: |
           cd terraform/

diff --git a/helm-chart/Chart.yaml b/helm-chart/Chart.yaml
@@ -29,10 +29,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.10.1
+version: 0.10.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v0.10.1"
+appVersion: "v0.10.2"
diff --git a/helm-chart/templates/opentelemetry-collector.yaml b/helm-chart/templates/opentelemetry-collector.yaml
@@ -94,7 +94,7 @@ spec:
           readOnlyRootFilesystem: true
         args:
         - --config=/conf/collector-gateway-config.yaml
-        image: otel/opentelemetry-collector-contrib:0.111.0@sha256:a2a52e43c1a80aa94120ad78c2db68780eb90e6d11c8db5b3ce2f6a0cc6b5029
+        image: otel/opentelemetry-collector-contrib:0.112.0@sha256:2203eea06554f892c765d6eff8069cdf64ae8d4516526d03cab4a70e82775495
         volumeMounts:
         - name: collector-gateway-config
           mountPath: /conf

diff --git a/kustomize/base/adservice.yaml b/kustomize/base/adservice.yaml
@@ -43,7 +43,7 @@ spec:
               - ALL
           privileged: false
           readOnlyRootFilesystem: true
-        image: us-central1-docker.pkg.dev/google-samples/microservices-demo/adservice:v0.10.1
+        image: us-central1-docker.pkg.dev/google-samples/microservices-demo/adservice:v0.10.2
         ports:
         - containerPort: 9555
         env:

diff --git a/kustomize/base/cartservice.yaml b/kustomize/base/cartservice.yaml
@@ -43,7 +43,7 @@ spec:
               - ALL
           privileged: false
           readOnlyRootFilesystem: true
-        image: us-central1-docker.pkg.dev/google-samples/microservices-demo/cartservice:v0.10.1
+        image: us-central1-docker.pkg.dev/google-samples/microservices-demo/cartservice:v0.10.2
         ports:
         - containerPort: 7070
         env:

diff --git a/kustomize/base/checkoutservice.yaml b/kustomize/base/checkoutservice.yaml
@@ -42,7 +42,7 @@ spec:
                 - ALL
             privileged: false
             readOnlyRootFilesystem: true
-          image: us-central1-docker.pkg.dev/google-samples/microservices-demo/checkoutservice:v0.10.1
+          image: us-central1-docker.pkg.dev/google-samples/microservices-demo/checkoutservice:v0.10.2
           ports:
           - containerPort: 5050
           readinessProbe:

diff --git a/kustomize/base/currencyservice.yaml b/kustomize/base/currencyservice.yaml
@@ -43,7 +43,7 @@ spec:
               - ALL
           privileged: false
           readOnlyRootFilesystem: true
-        image: us-central1-docker.pkg.dev/google-samples/microservices-demo/currencyservice:v0.10.1
+        image: us-central1-docker.pkg.dev/google-samples/microservices-demo/currencyservice:v0.10.2
         ports:
         - name: grpc
           containerPort: 7000

diff --git a/kustomize/base/emailservice.yaml b/kustomize/base/emailservice.yaml
@@ -43,7 +43,7 @@ spec:
               - ALL
           privileged: false
           readOnlyRootFilesystem: true
-        image: us-central1-docker.pkg.dev/google-samples/microservices-demo/emailservice:v0.10.1
+        image: us-central1-docker.pkg.dev/google-samples/microservices-demo/emailservice:v0.10.2
         ports:
         - containerPort: 8080
         env:

diff --git a/kustomize/base/frontend.yaml b/kustomize/base/frontend.yaml
@@ -44,7 +44,7 @@ spec:
                 - ALL
             privileged: false
             readOnlyRootFilesystem: true
-          image: us-central1-docker.pkg.dev/google-samples/microservices-demo/frontend:v0.10.1
+          image: us-central1-docker.pkg.dev/google-samples/microservices-demo/frontend:v0.10.2
           ports:
           - containerPort: 8080
           readinessProbe:

diff --git a/kustomize/base/loadgenerator.yaml b/kustomize/base/loadgenerator.yaml
@@ -77,7 +77,7 @@ spec:
               - ALL
           privileged: false
           readOnlyRootFilesystem: true
-        image: us-central1-docker.pkg.dev/google-samples/microservices-demo/loadgenerator:v0.10.1
+        image: us-central1-docker.pkg.dev/google-samples/microservices-demo/loadgenerator:v0.10.2
         env:
         - name: FRONTEND_ADDR
           value: "frontend:80"

diff --git a/kustomize/base/paymentservice.yaml b/kustomize/base/paymentservice.yaml
@@ -43,7 +43,7 @@ spec:
               - ALL
           privileged: false
           readOnlyRootFilesystem: true
-        image: us-central1-docker.pkg.dev/google-samples/microservices-demo/paymentservice:v0.10.1
+        image: us-central1-docker.pkg.dev/google-samples/microservices-demo/paymentservice:v0.10.2
         ports:
         - containerPort: 50051
         env:

diff --git a/kustomize/base/productcatalogservice.yaml b/kustomize/base/productcatalogservice.yaml
@@ -43,7 +43,7 @@ spec:
               - ALL
           privileged: false
           readOnlyRootFilesystem: true
-        image: us-central1-docker.pkg.dev/google-samples/microservices-demo/productcatalogservice:v0.10.1
+        image: us-central1-docker.pkg.dev/google-samples/microservices-demo/productcatalogservice:v0.10.2
         ports:
         - containerPort: 3550
         env:

diff --git a/kustomize/base/recommendationservice.yaml b/kustomize/base/recommendationservice.yaml
@@ -43,7 +43,7 @@ spec:
               - ALL
           privileged: false
           readOnlyRootFilesystem: true
-        image: us-central1-docker.pkg.dev/google-samples/microservices-demo/recommendationservice:v0.10.1
+        image: us-central1-docker.pkg.dev/google-samples/microservices-demo/recommendationservice:v0.10.2
         ports:
         - containerPort: 8080
         readinessProbe:

diff --git a/kustomize/base/shippingservice.yaml b/kustomize/base/shippingservice.yaml
@@ -42,7 +42,7 @@ spec:
               - ALL
           privileged: false
           readOnlyRootFilesystem: true
-        image: us-central1-docker.pkg.dev/google-samples/microservices-demo/shippingservice:v0.10.1
+        image: us-central1-docker.pkg.dev/google-samples/microservices-demo/shippingservice:v0.10.2
         ports:
         - containerPort: 50051
         env:

diff --git a/kustomize/components/google-cloud-operations/otel-collector.yaml b/kustomize/components/google-cloud-operations/otel-collector.yaml
@@ -68,7 +68,7 @@ spec:
           readOnlyRootFilesystem: true
         args:
         - --config=/conf/collector-gateway-config.yaml
-        image: otel/opentelemetry-collector-contrib:0.111.0@sha256:a2a52e43c1a80aa94120ad78c2db68780eb90e6d11c8db5b3ce2f6a0cc6b5029
+        image: otel/opentelemetry-collector-contrib:0.112.0@sha256:2203eea06554f892c765d6eff8069cdf64ae8d4516526d03cab4a70e82775495
         volumeMounts:
         - name: collector-gateway-config
           mountPath: /conf