Merge pull request #1468 from snyk/staging

RELEASE
snyk · Mar 12, 2024 · 1f13071 · 1f13071
2 parents 69056fd + 9595d26
commit 1f13071
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1007,9 +1007,10 @@ master_branch_only_filter:
 orbs:
     aws-cli: circleci/aws-cli@2.0.6
     azure-cli: circleci/azure-cli@1.2.0
-    prodsec: snyk/prodsec-orb@1.0
+    prodsec: snyk/prodsec-orb@1.1
     redhat-openshift: circleci/redhat-openshift@0.2.0
-    snyk: snyk/snyk@1.7.0
+    snyk: snyk/snyk@2
+
 staging_branch_only_filter:
     filters:
         branches:
@@ -1022,7 +1023,7 @@ workflows:
             - publish:
                 context:
                     - team-container-integration
-                    - team-container-integration-snyk
+                    - analysis_integrations
                 filters:
                     branches:
                         only:
@@ -1037,19 +1038,19 @@ workflows:
     MERGE_TO_STAGING:
         jobs:
             - build_image:
-                context: team-container-integration-snyk
+                context: analysis_integrations
                 filters:
                     branches:
                         only:
                             - staging
             - build_and_upload_operator:
-                context: team-container-integration-snyk
+                context: analysis_integrations
                 filters:
                     branches:
                         only:
                             - staging
             - unit_tests:
-                context: team-container-integration-snyk
+                context: analysis_integrations
                 filters:
                     branches:
                         only:
@@ -1080,22 +1081,29 @@ workflows:
                     - tag_and_push
     PR_TO_STAGING:
         jobs:
+            - prodsec/secrets-scan:
+                  name: Scan repository for secrets
+                  trusted-branch: main
+                  context:
+                      - snyk-bot-slack
+                  channel: team-integrations-alerts
+
             - build_image:
-                context: team-container-integration-snyk
+                context: analysis_integrations
                 filters:
                     branches:
                         ignore:
                             - staging
                             - master
             - build_and_upload_operator:
-                context: team-container-integration-snyk
+                context: analysis_integrations
                 filters:
                     branches:
                         ignore:
                             - staging
                             - master
             - unit_tests:
-                context: team-container-integration-snyk
+                context: analysis_integrations
                 filters:
                     branches:
                         ignore:

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,4 +1 @@
-# This is a comment.
-# Each line is a file pattern followed by one or more owners.
-
-* @snyk/container-integration
+* @snyk/orchestration-integrations
diff --git a/catalog-info.yaml b/catalog-info.yaml
@@ -4,8 +4,8 @@ metadata:
   name: kubernetes-monitor
   annotations:
     github.com/project-slug: snyk/kubernetes-monitor
-    github.com/team-slug: snyk/container-integration
+    github.com/team-slug: snyk/orchestration-integrations
 spec:
   type: external-tooling
   lifecycle: "-"
-  owner: container-integration
+  owner: orchestration-integrations