Skip to content

Commit

Permalink
Merge branch 'main' into 1383
Browse files Browse the repository at this point in the history
  • Loading branch information
cmwylie19 authored Nov 6, 2024
2 parents a6c0fb7 + 7020907 commit 656045d
Show file tree
Hide file tree
Showing 15 changed files with 861 additions and 362 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/container-scan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ jobs:
- name: Build Pepr Controller Image
run: npm run build:image
- name: Vulnerability Scan
uses: anchore/scan-action@5ed195cc06065322983cae4bb31e2a751feb86fd # v5.2.0
uses: anchore/scan-action@f2ba85e044c8f5e5014c9a539328a9c78d3bfa49 # v5.2.1
with:
image: "pepr:dev"
fail-build: true
severity-cutoff: high
- name: Generate SBOM
uses: anchore/sbom-action@251a468eed47e5082b105c3ba6ee500c0e65a764 # v0.17.6
uses: anchore/sbom-action@fc46e51fd3cb168ffb36c6d1915723c47db58abb # v0.17.7
with:
image: pepr:dev
upload-artifact: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/secret-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ jobs:
with:
fetch-depth: 0
- name: Default Secret Scanning
uses: trufflesecurity/trufflehog@5ca4a17a4c7a242046966b84cf9d7a53364971bc # main
uses: trufflesecurity/trufflehog@944d5dcdc2ba2aa70c2227d8e432d19eceda10be # main
with:
extra_args: --debug --no-verification # Warn on potential violations
23 changes: 16 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"follow-redirects": "1.15.9",
"http-status-codes": "^2.3.0",
"json-pointer": "^0.6.2",
"kubernetes-fluent-client": "3.2.2",
"kubernetes-fluent-client": "3.3.0",
"pino": "9.5.0",
"pino-pretty": "11.3.0",
"prom-client": "15.1.3",
Expand Down
Loading

0 comments on commit 656045d

Please sign in to comment.