From b1f6de28c8b3dc07df20a61c288fea7fd2b88c2a Mon Sep 17 00:00:00 2001 From: Daniel Pacak Date: Thu, 21 May 2020 11:39:16 +0200 Subject: [PATCH] release: Prepare v0.6.0 (#53) Signed-off-by: Daniel Pacak --- README.md | 2 +- helm/harbor-scanner-aqua/Chart.yaml | 4 ++-- helm/harbor-scanner-aqua/README.md | 4 ++-- helm/harbor-scanner-aqua/values.yaml | 29 +++++++++++++++++----------- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 0568ca9..cbea1bc 100644 --- a/README.md +++ b/README.md @@ -287,7 +287,7 @@ it out based on the following instructions. networks: - harbor container_name: aqua-scanner - image: docker.io/aquasec/harbor-scanner-aqua:0.5.1 + image: docker.io/aquasec/harbor-scanner-aqua:$HARBOR_SCANNER_AQUA_VERSION restart: always cap_drop: - ALL diff --git a/helm/harbor-scanner-aqua/Chart.yaml b/helm/harbor-scanner-aqua/Chart.yaml index 753a1eb..81f3ac9 100644 --- a/helm/harbor-scanner-aqua/Chart.yaml +++ b/helm/harbor-scanner-aqua/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: harbor-scanner-aqua -version: 0.5.1 -appVersion: 0.5.1 +version: 0.6.0 +appVersion: 0.6.0 description: Harbor scanner adapter for Aqua CSP scanner keywords: - scanner diff --git a/helm/harbor-scanner-aqua/README.md b/helm/harbor-scanner-aqua/README.md index 2c62a87..ce3646c 100644 --- a/helm/harbor-scanner-aqua/README.md +++ b/helm/harbor-scanner-aqua/README.md @@ -85,7 +85,7 @@ The following table lists the configurable parameters of the scanner adapter cha | Parameter | Description | Default | |-----------------------------------------|-------------------------------------------------------------------------|----------------| -| `aqua.version` | The version of Aqua CSP that the adapter operates against | `4.5` | +| `aqua.version` | The version of Aqua CSP that the adapter operates against | `4.6` | | `aqua.registry.server` | Aqua Docker registry server | `registry.aquasec.com` | | `aqua.registry.username` | Aqua Docker registry username | N/A | | `aqua.registry.password` | Aqua Docker registry password | N/A | @@ -117,7 +117,7 @@ The following table lists the configurable parameters of the scanner adapter cha | `scanner.store.redisScanJobTTL` | The time to live for persisting scan jobs and associated scan reports | `1h` | | `service.type` | Kubernetes service type | `LoadBalancer` | | `service.port` | Kubernetes service port | `8443` | -| `replicaCount` | Number of scanner adapter Pods to run | `1` | +| `replicaCount` | The number of scanner adapter Pods to run | `1` | The above parameters map to the env variables defined in [harbor-scanner-aqua](https://github.com/aquasecurity/harbor-scanner-aqua#configuration). diff --git a/helm/harbor-scanner-aqua/values.yaml b/helm/harbor-scanner-aqua/values.yaml index 57521bf..590e5bd 100644 --- a/helm/harbor-scanner-aqua/values.yaml +++ b/helm/harbor-scanner-aqua/values.yaml @@ -2,9 +2,12 @@ nameOverride: "" fullnameOverride: "" service: + ## type Kubernetes service type type: "ClusterIP" + ## port Kubernetes service port port: 8080 +## replicaCount the number of scanner adapter Pods to run replicaCount: 1 initResources: @@ -24,10 +27,14 @@ mainResources: memory: 512Mi aqua: + ## version the version of Aqua CSP that the adapter operates against version: 4.6 registry: + ## server the Aqua Docker registry server server: "registry.aquasec.com" + ## username the Aqua Docker registry username username: "" + ## password the Aqua Docker registry password password: "" image: pullPolicy: "IfNotPresent" @@ -36,7 +43,7 @@ scanner: image: registry: "docker.io" repository: "aquasec/harbor-scanner-aqua" - tag: "0.5.1" + tag: "0.6.0" pullPolicy: "IfNotPresent" logLevel: info api: @@ -47,25 +54,25 @@ scanner: writeTimeout: 15s idleTimeout: 60s aqua: - # username Aqua management console username + ## username Aqua management console username username: "" - # password Aqua management console password + ## password Aqua management console password password: "" - # host Aqua management console address + ## host Aqua management console address host: "http://csp-console-svc.aqua:8080" - # registry the name of the Harbor registry configured in Aqua management console + ## registry the name of the Harbor registry configured in Aqua management console registry: "Harbor" - # reportsDir directory to save temporary scan reports + ## reportsDir directory to save temporary scan reports reportsDir: "/var/lib/scanner/reports" - # useImageTag the flag to determine whether the image tag or digest is used in the image reference passed to `scannercli` + ## useImageTag the flag to determine whether the image tag or digest is used in the image reference passed to `scannercli` useImageTag: true - # scannerCLINoVerify the flag passed to `scannercli` to skip verifying TLS certificates + ## scannerCLINoVerify the flag passed to `scannercli` to skip verifying TLS certificates scannerCLINoVerify: false - # scannerCLIShowNegligible the flag passed to `scannercli` to show negligible/unknown severity vulnerabilities + ## scannerCLIShowNegligible the flag passed to `scannercli` to show negligible/unknown severity vulnerabilities scannerCLIShowNegligible: true - # scannerCLIShowWillNotFix the flag passed to `scannercli` to show vulnerabilities that will not be fixed + ## scannerCLIShowWillNotFix the flag passed to `scannercli` to show vulnerabilities that will not be fixed scannerCLIShowWillNotFix: false - # scannerCLIHideBase the flag passed to `scannercli` to hide vulnerabilities in the base image + ## scannerCLIHideBase the flag passed to `scannercli` to hide vulnerabilities in the base image scannerCLIHideBase: true store: redisURL: "redis://harbor-harbor-redis:6379"