Merge branch 'develop' into feat/order-go

steadybit · Jan 29, 2025 · 6ab5143 · 6ab5143
2 parents a53e326 + aff83f4
commit 6ab5143
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,9 +27,17 @@ jobs:
         if: github.ref == 'refs/heads/main'
         uses: snyk/actions/setup@master
 
-      - name: "[main] Synk monitor: maven"
+      - name: "[main] Synk monitor: maven (Java)"
         if: github.ref == 'refs/heads/main'
-        run: snyk monitor --all-projects --prune-repeated-subdependencies --target-reference=${{ github.ref_name }} -- -s .github/workflows/maven-settings.xml
+        run: snyk monitor --all-projects --exclude=go.mod --prune-repeated-subdependencies --target-reference=${{ github.ref_name }} -- -s .github/workflows/maven-settings.xml
+        env:
+          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+          PAT_USERNAME: ${{ secrets.PAT_USERNAME }}
+          PAT_TOKEN: ${{ secrets.PAT_TOKEN }}
+
+      - name: "[main] Synk monitor: maven (Go)"
+        if: github.ref == 'refs/heads/main'
+        run: snyk monitor --all-projects --exclude=pom.xml --prune-repeated-subdependencies --target-reference=${{ github.ref_name }}
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
           PAT_USERNAME: ${{ secrets.PAT_USERNAME }}

diff --git a/...ts/steadybit-shopping-demo/tests/__snapshot__/4-bestseller-toys-deployment_test.yaml.snap b/...ts/steadybit-shopping-demo/tests/__snapshot__/4-bestseller-toys-deployment_test.yaml.snap
@@ -54,7 +54,7 @@ manifest should match snapshot:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.labels['tags.datadoghq.com/version']
-              image: steadybit/bestseller-toys:develop
+              image: steadybit/bestseller-toys-go:develop
               imagePullPolicy: Always
               livenessProbe:
                 httpGet:
@@ -169,7 +169,7 @@ manifest should match snapshot replica count:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.labels['tags.datadoghq.com/version']
-              image: steadybit/bestseller-toys:develop
+              image: steadybit/bestseller-toys-go:develop
               imagePullPolicy: Always
               livenessProbe:
                 httpGet:

diff --git a/charts/steadybit-shopping-demo/values.yaml b/charts/steadybit-shopping-demo/values.yaml
@@ -65,7 +65,7 @@ bestsellerToys:
   enabled: true
   image:
     # Container image name
-    name: steadybit/bestseller-toys
+    name: steadybit/bestseller-toys-go
     # Container image tag
     tag: develop
   # Container resources