chore(trivy): Upgrade from v0.16.0 to v0.19.2 (aquasecurity#656)

Signed-off-by: Daniel Pacak <pacak.daniel@gmail.com>
amit-catalogic · Aug 2, 2021 · d14e28e · d14e28e
1 parent f761e35
commit d14e28e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
@@ -85,7 +85,7 @@ starboard:
   # annotated with. Example: `foo=bar,env=stage` will annotate the scanner pods with the annotations `foo: bar` and `env: stage`
   scanJobAnnotations: ""
 trivy:
-  imageRef: docker.io/aquasec/trivy:0.16.0
+  imageRef: docker.io/aquasec/trivy:0.19.2
   mode: Standalone
   serverURL:
   httpProxy:

diff --git a/deploy/static/05-starboard-operator.config.yaml b/deploy/static/05-starboard-operator.config.yaml
@@ -27,7 +27,7 @@ metadata:
   labels:
     "app.kubernetes.io/managed-by": "starboard"
 data:
-  trivy.imageRef: docker.io/aquasec/trivy:0.16.0
+  trivy.imageRef: docker.io/aquasec/trivy:0.19.2
   trivy.severity: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
   trivy.mode: Standalone
   trivy.resources.requests.cpu: 100m

diff --git a/docs/integrations/vulnerability-scanners/trivy.md b/docs/integrations/vulnerability-scanners/trivy.md
@@ -82,7 +82,7 @@ EOF
 
 | CONFIGMAP KEY                     | DEFAULT                            | DESCRIPTION |
 | --------------------------------- | ---------------------------------- | ----------- |
-| `trivy.imageRef`                  | `docker.io/aquasec/trivy:0.16.0`   | Trivy image reference |
+| `trivy.imageRef`                  | `docker.io/aquasec/trivy:0.19.2`   | Trivy image reference |
 | `trivy.mode`                      | `Standalone`                       | Trivy client mode. Either `Standalone` or `ClientServer`. Depending on the active mode other settings might be applicable or required. |
 | `trivy.severity`                  | `UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL` | A comma separated list of severity levels reported by Trivy |
 | `trivy.ignoreUnfixed`             | N/A                                | Whether to show only fixed vulnerabilities in vulnerabilities reported by Trivy. Set to `"true"` to enable it. |

diff --git a/itest/matcher/matcher.go b/itest/matcher/matcher.go
@@ -19,7 +19,7 @@ var (
 	trivyScanner = v1alpha1.Scanner{
 		Name:    "Trivy",
 		Vendor:  "Aqua Security",
-		Version: "0.16.0",
+		Version: "0.19.2",
 	}
 	polarisScanner = v1alpha1.Scanner{
 		Name:    "Polaris",

diff --git a/itest/matcher/matcher_test.go b/itest/matcher/matcher_test.go
@@ -57,7 +57,7 @@ func TestVulnerabilityReportMatcher(t *testing.T) {
 				Scanner: v1alpha1.Scanner{
 					Name:    "Trivy",
 					Vendor:  "Aqua Security",
-					Version: "0.16.0",
+					Version: "0.19.2",
 				},
 				Vulnerabilities: []v1alpha1.Vulnerability{},
 			},

diff --git a/pkg/plugin/trivy/plugin.go b/pkg/plugin/trivy/plugin.go
@@ -171,7 +171,7 @@ func NewPlugin(clock ext.Clock, idGenerator ext.IDGenerator) vulnerabilityreport
 func (p *plugin) Init(ctx starboard.PluginContext) error {
 	return ctx.EnsureConfig(starboard.PluginConfig{
 		Data: map[string]string{
-			keyTrivyImageRef: "docker.io/aquasec/trivy:0.16.0",
+			keyTrivyImageRef: "docker.io/aquasec/trivy:0.19.2",
 			keyTrivySeverity: "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL",
 			keyTrivyMode:     string(Standalone),
 

diff --git a/pkg/plugin/trivy/plugin_test.go b/pkg/plugin/trivy/plugin_test.go
@@ -297,7 +297,7 @@ func TestPlugin_Init(t *testing.T) {
 				ResourceVersion: "1",
 			},
 			Data: map[string]string{
-				"trivy.imageRef": "docker.io/aquasec/trivy:0.16.0",
+				"trivy.imageRef": "docker.io/aquasec/trivy:0.19.2",
 				"trivy.severity": "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL",
 				"trivy.mode":     "Standalone",
 
@@ -322,7 +322,7 @@ func TestPlugin_Init(t *testing.T) {
 					ResourceVersion: "1",
 				},
 				Data: map[string]string{
-					"trivy.imageRef": "docker.io/aquasec/trivy:0.16.0",
+					"trivy.imageRef": "docker.io/aquasec/trivy:0.19.2",
 					"trivy.severity": "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL",
 					"trivy.mode":     "Standalone",
 				},
@@ -356,7 +356,7 @@ func TestPlugin_Init(t *testing.T) {
 				ResourceVersion: "1",
 			},
 			Data: map[string]string{
-				"trivy.imageRef": "docker.io/aquasec/trivy:0.16.0",
+				"trivy.imageRef": "docker.io/aquasec/trivy:0.19.2",
 				"trivy.severity": "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL",
 				"trivy.mode":     "Standalone",
 			},