Skip to content

Commit

Permalink
chore: bump trivy 0.43.1 (#1406)
Browse files Browse the repository at this point in the history
Signed-off-by: chenk <hen.keinan@gmail.com>
  • Loading branch information
chen-keinan authored Jul 31, 2023
1 parent ace1bd5 commit 4bc323c
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion deploy/helm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ Keeps security report resources updated
| trivy.ignoreUnfixed | bool | `false` | ignoreUnfixed is the flag to show only fixed vulnerabilities in vulnerabilities reported by Trivy. Set to true to enable it. |
| trivy.image.registry | string | `"ghcr.io"` | registry of the Trivy image |
| trivy.image.repository | string | `"aquasecurity/trivy"` | repository of the Trivy image |
| trivy.image.tag | string | `"0.42.0"` | tag version of the Trivy image |
| trivy.image.tag | string | `"0.43.1"` | tag version of the Trivy image |
| trivy.insecureRegistries | object | `{}` | The registry to which insecure connections are allowed. There can be multiple registries with different keys. |
| trivy.javaDbRegistry | string | `"ghcr.io"` | javaDbRegistry is the registry for the Java vulnerability database. |
| trivy.javaDbRepository | string | `"aquasecurity/trivy-java-db"` | |
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ trivy:
# -- repository of the Trivy image
repository: aquasecurity/trivy
# -- tag version of the Trivy image
tag: 0.42.0
tag: 0.43.1
# -- imagePullSecret is the secret name to be used when pulling trivy image from private registries example : reg-secret
# It is the user responsibility to create the secret for the private registry in `trivy-operator` namespace
# imagePullSecret:
Expand Down
2 changes: 1 addition & 1 deletion deploy/static/trivy-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2157,7 +2157,7 @@ metadata:
app.kubernetes.io/managed-by: kubectl
data:
trivy.repository: "ghcr.io/aquasecurity/trivy"
trivy.tag: "0.42.0"
trivy.tag: "0.43.1"
trivy.additionalVulnerabilityReportFields: ""
trivy.severity: "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL"
trivy.slow: "true"
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/crds/sbom-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ report:
scanner:
name: Trivy
vendor: Aqua Security
version: 0.42.0
version: 0.43.1
summary:
componentsCount: 5
dependenciesCount: 5
Expand Down
15 changes: 8 additions & 7 deletions pkg/plugins/trivy/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@ import (
"context"
"encoding/json"
"fmt"
cdx "github.com/CycloneDX/cyclonedx-go"
"github.com/aquasecurity/trivy-db/pkg/types"
"github.com/aquasecurity/trivy-operator/pkg/utils"
tr "github.com/aquasecurity/trivy/pkg/report"
ty "github.com/aquasecurity/trivy/pkg/types"
containerimage "github.com/google/go-containerregistry/pkg/name"
"io"
"net/url"
"path/filepath"
"regexp"
"strconv"
"strings"

cdx "github.com/CycloneDX/cyclonedx-go"
"github.com/aquasecurity/trivy-db/pkg/types"
"github.com/aquasecurity/trivy-operator/pkg/utils"
tr "github.com/aquasecurity/trivy/pkg/report"
ty "github.com/aquasecurity/trivy/pkg/types"
containerimage "github.com/google/go-containerregistry/pkg/name"

"github.com/aquasecurity/trivy-operator/pkg/configauditreport"

"github.com/aquasecurity/trivy-operator/pkg/apis/aquasecurity/v1alpha1"
Expand Down Expand Up @@ -554,7 +555,7 @@ func (p *plugin) Init(ctx trivyoperator.PluginContext) error {
return ctx.EnsureConfig(trivyoperator.PluginConfig{
Data: map[string]string{
keyTrivyImageRepository: DefaultImageRepository,
keyTrivyImageTag: "0.42.0",
keyTrivyImageTag: "0.43.1",
KeyTrivySeverity: DefaultSeverity,
keyTrivySlow: "true",
keyTrivyMode: string(Standalone),
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugins/trivy/plugin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ func TestPlugin_Init(t *testing.T) {
},
Data: map[string]string{
"trivy.repository": trivy.DefaultImageRepository,
"trivy.tag": "0.42.0",
"trivy.tag": "0.43.1",
"trivy.severity": trivy.DefaultSeverity,
"trivy.slow": "true",
"trivy.mode": string(trivy.Standalone),
Expand Down

0 comments on commit 4bc323c

Please sign in to comment.