Skip to content

Commit 4151fa1

Browse files
ivanstanevivanstanev
authored
Merge pull request #970 from snyk/chore/snyk-test
Chore/snyk test
2 parents aeaf5c3 + d11143f commit 4151fa1

File tree

12 files changed

+111
-91
lines changed

12 files changed

+111
-91
lines changed

‎.circleci/config.yml‎

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
aks_integration_tests:
3333
machine:
3434
docker_layer_caching: true
35-
image: ubuntu-2004:202010-01
35+
image: ubuntu-2004:202111-01
3636
steps:
3737
- checkout
3838
- setup_node16
@@ -60,7 +60,7 @@ jobs:
6060
- auth:
6161
password: $DOCKERHUB_PASSWORD
6262
username: $DOCKERHUB_USER
63-
image: circleci/python:3.9
63+
image: cimg/python:3.10
6464
steps:
6565
- checkout
6666
- setup_remote_docker
@@ -76,7 +76,13 @@ jobs:
7676
OPERATOR_TAG="${IMAGE_TAG}-${CIRCLE_SHA1}"
7777
MONITOR_TAG="${IMAGE_TAG}-${CIRCLE_SHA1}"
7878
scripts/operator/create_operator_and_push.py "${OPERATOR_TAG}" "${MONITOR_TAG}" "${DOCKERHUB_USER}" "${DOCKERHUB_PASSWORD}"
79+
echo "export OPERATOR_TAG=$OPERATOR_TAG" >> $BASH_ENV
7980
name: Create Operator and push Operator image to DockerHub
81+
- snyk/scan:
82+
docker-image-name: snyk/kubernetes-operator:${OPERATOR_TAG}
83+
monitor-on-build: false
84+
severity-threshold: high
85+
target-file: snyk-operator/build/Dockerfile
8086
- run:
8187
command: |
8288
export IMAGE_TAG=$([[ "$CIRCLE_BRANCH" == "staging" ]] && echo "staging-candidate" || echo "discardable")
@@ -100,7 +106,7 @@ jobs:
100106
working_directory: ~/kubernetes-monitor
101107
build_image:
102108
machine:
103-
image: ubuntu-2004:202010-01
109+
image: ubuntu-2004:202111-01
104110
steps:
105111
- checkout
106112
- install_python_requests
@@ -133,7 +139,7 @@ jobs:
133139
code_formatter:
134140
machine:
135141
docker_layer_caching: true
136-
image: ubuntu-2004:202010-01
142+
image: ubuntu-2004:202111-01
137143
steps:
138144
- checkout
139145
- setup_node16
@@ -153,7 +159,7 @@ jobs:
153159
- auth:
154160
password: $DOCKERHUB_PASSWORD
155161
username: $DOCKERHUB_USER
156-
image: cimg/node:16.5
162+
image: cimg/node:16.13
157163
steps:
158164
- checkout
159165
- install_python_requests
@@ -177,7 +183,7 @@ jobs:
177183
- auth:
178184
password: $DOCKERHUB_PASSWORD
179185
username: $DOCKERHUB_USER
180-
image: cimg/node:16.5
186+
image: cimg/node:16.13
181187
steps:
182188
- checkout
183189
- install_python_requests
@@ -198,7 +204,7 @@ jobs:
198204
eks_integration_tests:
199205
machine:
200206
docker_layer_caching: true
201-
image: ubuntu-2004:202010-01
207+
image: ubuntu-2004:202111-01
202208
steps:
203209
- checkout
204210
- install_python_requests
@@ -225,7 +231,7 @@ jobs:
225231
integration_tests:
226232
machine:
227233
docker_layer_caching: true
228-
image: ubuntu-2004:202010-01
234+
image: ubuntu-2004:202111-01
229235
steps:
230236
- checkout
231237
- setup_node16
@@ -249,7 +255,7 @@ jobs:
249255
integration_tests_helm:
250256
machine:
251257
docker_layer_caching: true
252-
image: ubuntu-2004:202010-01
258+
image: ubuntu-2004:202111-01
253259
steps:
254260
- checkout
255261
- setup_node16
@@ -273,7 +279,7 @@ jobs:
273279
integration_tests_operator_on_k8s:
274280
machine:
275281
docker_layer_caching: true
276-
image: ubuntu-2004:202010-01
282+
image: ubuntu-2004:202111-01
277283
steps:
278284
- checkout
279285
- setup_node16
@@ -298,7 +304,7 @@ jobs:
298304
integration_tests_proxy:
299305
machine:
300306
docker_layer_caching: true
301-
image: ubuntu-2004:202010-01
307+
image: ubuntu-2004:202111-01
302308
steps:
303309
- checkout
304310
- setup_node16
@@ -322,7 +328,7 @@ jobs:
322328
lint:
323329
machine:
324330
docker_layer_caching: true
325-
image: ubuntu-2004:202010-01
331+
image: ubuntu-2004:202111-01
326332
steps:
327333
- checkout
328334
- setup_node16
@@ -340,7 +346,7 @@ jobs:
340346
openshift3_integration_tests:
341347
machine:
342348
docker_layer_caching: true
343-
image: ubuntu-2004:202010-01
349+
image: ubuntu-2004:202111-01
344350
steps:
345351
- checkout
346352
- setup_node16
@@ -363,7 +369,7 @@ jobs:
363369
openshift4_integration_tests:
364370
machine:
365371
docker_layer_caching: true
366-
image: ubuntu-2004:202010-01
372+
image: ubuntu-2004:202111-01
367373
steps:
368374
- checkout
369375
- setup_node16
@@ -614,7 +620,7 @@ jobs:
614620
- auth:
615621
password: $DOCKERHUB_PASSWORD
616622
username: $DOCKERHUB_USER
617-
image: cimg/node:16.5
623+
image: cimg/node:16.13
618624
steps:
619625
- checkout
620626
- setup_remote_docker
@@ -661,6 +667,11 @@ jobs:
661667
MONITOR_TAG="${LATEST_TAG}"
662668
python3 scripts/operator/create_operator_and_push.py "${OPERATOR_TAG}" "${MONITOR_TAG}" "${DOCKERHUB_USER}" "${DOCKERHUB_PASSWORD}"
663669
name: Create Operator and push Operator image to DockerHub
670+
- snyk/scan:
671+
docker-image-name: snyk/kubernetes-operator:${OPERATOR_TAG}
672+
monitor-on-build: true
673+
severity-threshold: high
674+
target-file: snyk-operator/build/Dockerfile
664675
- run:
665676
command: ./scripts/slack/notify_failure.py "${CIRCLE_BRANCH}" "${CIRCLE_JOB}" "${CIRCLE_BUILD_URL}" "${CIRCLE_PULL_REQUEST}" "${SLACK_WEBHOOK}"
666677
name: Notify Slack on failure
@@ -803,7 +814,7 @@ jobs:
803814
- auth:
804815
password: $DOCKERHUB_PASSWORD
805816
username: $DOCKERHUB_USER
806-
image: cimg/python:3.9.5
817+
image: cimg/python:3.10
807818
steps:
808819
- checkout
809820
- install_python_requests
@@ -835,7 +846,7 @@ jobs:
835846
- auth:
836847
password: $DOCKERHUB_PASSWORD
837848
username: $DOCKERHUB_USER
838-
image: cimg/python:3.9.5
849+
image: cimg/python:3.10
839850
steps:
840851
- checkout
841852
- install_python_requests
@@ -865,7 +876,7 @@ jobs:
865876
system_tests:
866877
machine:
867878
docker_layer_caching: true
868-
image: ubuntu-2004:202010-01
879+
image: ubuntu-2004:202111-01
869880
steps:
870881
- checkout
871882
- setup_node16
@@ -897,7 +908,7 @@ jobs:
897908
- auth:
898909
password: $DOCKERHUB_PASSWORD
899910
username: $DOCKERHUB_USER
900-
image: cimg/node:16.5
911+
image: cimg/node:16.13
901912
steps:
902913
- checkout
903914
- setup_remote_docker
@@ -922,7 +933,7 @@ jobs:
922933
unit_tests:
923934
machine:
924935
docker_layer_caching: true
925-
image: ubuntu-2004:202010-01
936+
image: ubuntu-2004:202111-01
926937
steps:
927938
- checkout
928939
- setup_node16
@@ -953,8 +964,8 @@ master_branch_only_filter:
953964
only:
954965
- master
955966
orbs:
956-
aws-cli: circleci/[email protected].3
957-
azure-cli: circleci/azure-cli@1.0.0
967+
aws-cli: circleci/[email protected].6
968+
azure-cli: circleci/azure-cli@1.2.0
958969
redhat-openshift: circleci/[email protected]
959970
snyk: snyk/[email protected]
960971
staging_branch_only_filter:

‎.circleci/config/@config.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
version: 2.1
22

3-
orbs:
4-
snyk: snyk/[email protected]
5-
63
staging_branch_only_filter: &staging_branch_only_filter
74
filters:
85
branches:

0 commit comments

Comments
 (0)