Skip to content

Commit

Permalink
release: prepare v0.18.0 official (#1739)
Browse files Browse the repository at this point in the history
* release: prepare v0.18.0 official

Signed-off-by: chenk <[email protected]>

* release: prepare v0.18.0 official

Signed-off-by: chenk <[email protected]>

---------

Signed-off-by: chenk <[email protected]>
  • Loading branch information
chen-keinan committed Jan 4, 2024
1 parent 67a005d commit c73d65d
Show file tree
Hide file tree
Showing 22 changed files with 47 additions and 47 deletions.
10 changes: 5 additions & 5 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@
5. Create an annotated git tag and push it to the `upstream`. This will trigger the [`.github/workflows/release.yaml`] workflow

```sh
git tag -v0.18.0-rc2 -m 'Release v0.18.0-rc2'
git push upstream v0.18.0-rc2
git tag -v0.18.0 -m 'Release v0.18.0'
git push upstream v0.18.0
```

6. Verify that the `release` workflow has built and published the following artifacts
1. Trivy-operator container images published to DockerHub
`docker.io/aquasec/trivy-operator:0.18.0-rc2`
`docker.io/aquasec/trivy-operator:0.18.0`
2. Trivy-operator container images published to Amazon ECR Public Gallery
`public.ecr.aws/aquasecurity/trivy-operator:0.18.0-rc2`
`public.ecr.aws/aquasecurity/trivy-operator:0.18.0`
3. Trivy-operator container images published to GitHub Container Registry
`ghcr.io/aquasecurity/trivy-operator:0.18.0-rc2`
`ghcr.io/aquasecurity/trivy-operator:0.18.0`

7. Submit trivy-operator Operator to OperatorHub and ArtifactHUB by opening the PR to the <https://github.com/k8s-operatorhub/community-operators> repository.

Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.20.0-rc2
version: 0.20.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 0.18.0-rc2
appVersion: 0.18.0

# kubeVersion: A SemVer range of compatible Kubernetes versions (optional)

Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# trivy-operator

![Version: 0.20.0-rc2](https://img.shields.io/badge/Version-0.20.0--rc2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.18.0-rc2](https://img.shields.io/badge/AppVersion-0.18.0--rc2-informational?style=flat-square)
![Version: 0.20.0](https://img.shields.io/badge/Version-0.20.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.18.0](https://img.shields.io/badge/AppVersion-0.18.0-informational?style=flat-square)

Keeps security report resources updated

Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/templates/specs/cis-1.23.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: 0.18.0-rc2
app.kubernetes.io/version: 0.18.0
app.kubernetes.io/managed-by: kubectl
spec:
cron: {{ .Values.compliance.cron | quote}}
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/templates/specs/nsa-1.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
spec:
cron: {{ .Values.compliance.cron | quote }}
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/templates/specs/pss-baseline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: 0.18.0-rc2
app.kubernetes.io/version: 0.18.0
app.kubernetes.io/managed-by: kubectl
spec:
cron: {{ .Values.compliance.cron | quote }}
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/templates/specs/pss-restricted.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: 0.18.0-rc2
app.kubernetes.io/version: 0.18.0
app.kubernetes.io/managed-by: kubectl
spec:
cron: {{ .Values.compliance.cron | quote }}
Expand Down
2 changes: 1 addition & 1 deletion deploy/static/namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
36 changes: 18 additions & 18 deletions deploy/static/trivy-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2730,7 +2730,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
---
# Source: trivy-operator/templates/configmaps/operator.yaml
Expand All @@ -2742,7 +2742,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
data:
nodeCollector.volumes: "[{\"hostPath\":{\"path\":\"/var/lib/etcd\"},\"name\":\"var-lib-etcd\"},{\"hostPath\":{\"path\":\"/var/lib/kubelet\"},\"name\":\"var-lib-kubelet\"},{\"hostPath\":{\"path\":\"/var/lib/kube-scheduler\"},\"name\":\"var-lib-kube-scheduler\"},{\"hostPath\":{\"path\":\"/var/lib/kube-controller-manager\"},\"name\":\"var-lib-kube-controller-manager\"},{\"hostPath\":{\"path\":\"/etc/systemd\"},\"name\":\"etc-systemd\"},{\"hostPath\":{\"path\":\"/lib/systemd\"},\"name\":\"lib-systemd\"},{\"hostPath\":{\"path\":\"/etc/kubernetes\"},\"name\":\"etc-kubernetes\"},{\"hostPath\":{\"path\":\"/etc/cni/net.d/\"},\"name\":\"etc-cni-netd\"}]"
Expand All @@ -2764,7 +2764,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
data:
---
Expand All @@ -2777,7 +2777,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
data:
trivy.repository: "ghcr.io/aquasecurity/trivy"
Expand Down Expand Up @@ -2813,7 +2813,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
---
# Source: trivy-operator/templates/secrets/trivy.yaml
Expand All @@ -2825,7 +2825,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
data:
---
Expand All @@ -2838,7 +2838,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
spec:
replicas: 1
Expand All @@ -2858,7 +2858,7 @@ spec:
automountServiceAccountToken: true
containers:
- name: "trivy-operator"
image: "ghcr.io/aquasecurity/trivy-operator:0.18.0-rc2"
image: "ghcr.io/aquasecurity/trivy-operator:0.18.0"
imagePullPolicy: IfNotPresent
env:
- name: OPERATOR_NAMESPACE
Expand Down Expand Up @@ -2987,7 +2987,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
spec:

Expand Down Expand Up @@ -3379,7 +3379,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -3400,7 +3400,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
rules:
- apiGroups:
Expand All @@ -3427,7 +3427,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -3447,7 +3447,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
rules:
- apiGroups:
Expand Down Expand Up @@ -3477,7 +3477,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -3497,7 +3497,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
rbac.authorization.k8s.io/aggregate-to-view: "true"
rbac.authorization.k8s.io/aggregate-to-edit: "true"
Expand All @@ -3522,7 +3522,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
rbac.authorization.k8s.io/aggregate-to-view: "true"
rbac.authorization.k8s.io/aggregate-to-edit: "true"
Expand All @@ -3547,7 +3547,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
rbac.authorization.k8s.io/aggregate-to-view: "true"
rbac.authorization.k8s.io/aggregate-to-edit: "true"
Expand All @@ -3572,5 +3572,5 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
2 changes: 1 addition & 1 deletion docs/docs/crds/clustercompliance-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -1346,7 +1346,7 @@ status:
"app.kubernetes.io/instance": "trivy-operator",
"app.kubernetes.io/managed-by": "kubectl",
"app.kubernetes.io/name": "trivy-operator",
"app.kubernetes.io/version": "0.18.0-rc2"
"app.kubernetes.io/version": "0.18.0"
},
"name": "cis",
"resourceVersion": "8985",
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/crds/configaudit-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ report:
scanner:
name: Trivy
vendor: Aqua Security
version: '0.18.0-rc2'
version: '0.18.0'
summary:
criticalCount: 2
highCount: 0
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/crds/exposedsecret-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ metadata:
report:
artifact:
repository: myimagewithsecret
tag: v0.18.0-rc2
tag: v0.18.0
registry:
server: index.docker.io
scanner:
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/crds/rbacassessment-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ report:
scanner:
name: Trivy
vendor: Aqua Security
version: '0.18.0-rc2'
version: '0.18.0'
summary:
criticalCount: 1
highCount: 0
Expand Down
4 changes: 2 additions & 2 deletions docs/docs/design/caching_scan_results_by_repo_digest.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,5 +129,5 @@ We can't use something like ownerReference since it would delete all vulnerabili
a gate.
* Both Trivy-Operator CLI and Trivy-Operator Operator can read and leverage ClusterVulnerabilityReports.

[Standalone]: https://aquasecurity.github.io/trivy-operator/v0.18.0-rc2/integrations/vulnerability-scanners/trivy/#standalone
[ClientServer]: https://aquasecurity.github.io/trivy-operator/v0.18.0-rc2/integrations/vulnerability-scanners/trivy/#clientserver
[Standalone]: https://aquasecurity.github.io/trivy-operator/v0.18.0/integrations/vulnerability-scanners/trivy/#standalone
[ClientServer]: https://aquasecurity.github.io/trivy-operator/v0.18.0/integrations/vulnerability-scanners/trivy/#clientserver
4 changes: 2 additions & 2 deletions docs/docs/design/design_compliance_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ metadata:
name: clustercompliancereports.aquasecurity.github.io
labels:
app.kubernetes.io/managed-by: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
spec:
group: aquasecurity.github.io
scope: Cluster
Expand Down Expand Up @@ -678,7 +678,7 @@ metadata:
name: clustercompliancedetailreports.aquasecurity.github.io
labels:
app.kubernetes.io/managed-by: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
spec:
group: aquasecurity.github.io
versions:
Expand Down
4 changes: 2 additions & 2 deletions docs/docs/design/design_starboard_at_scale.excalidraw
Original file line number Diff line number Diff line change
Expand Up @@ -11835,7 +11835,7 @@
"versionNonce": 596868769,
"isDeleted": false,
"boundElementIds": null,
"text": "apiVersion: batch/v1\nkind: Job\nmetadata:\n name: scan-vulnerabilityreport-<workload hash>\n namespace: trivy-system\nspec:\n template:\n spec:\n containers:\n - name: nginx\n image: aquasec/trivy:0.18.0-rc2\n command: [\"trivy\", \"image\", \"nginx:1.16\"]\n restartPolicy: Never\n backoffLimit: 1",
"text": "apiVersion: batch/v1\nkind: Job\nmetadata:\n name: scan-vulnerabilityreport-<workload hash>\n namespace: trivy-system\nspec:\n template:\n spec:\n containers:\n - name: nginx\n image: aquasec/trivy:0.18.0\n command: [\"trivy\", \"image\", \"nginx:1.16\"]\n restartPolicy: Never\n backoffLimit: 1",
"fontSize": 20,
"fontFamily": 3,
"textAlign": "left",
Expand Down Expand Up @@ -11895,7 +11895,7 @@
"boundElementIds": [],
"fontSize": 20,
"fontFamily": 3,
"text": "apiVersion: v1\nkind: Pod\nmetadata:\n name: scan-vulnerabilityreport-<workload hash>-<pod-hash>\n namespace: trivy-system\nspec:\n containers:\n - name: nginx\n image: aquasec/trivy:0.18.0-rc2\n command: [\"trivy\", \"image\", \"nginx:1.16\"]\n",
"text": "apiVersion: v1\nkind: Pod\nmetadata:\n name: scan-vulnerabilityreport-<workload hash>-<pod-hash>\n namespace: trivy-system\nspec:\n containers:\n - name: nginx\n image: aquasec/trivy:0.18.0\n command: [\"trivy\", \"image\", \"nginx:1.16\"]\n",
"baseline": 259,
"textAlign": "left",
"verticalAlign": "top"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,6 @@ With this approach trivy operator will not have to worry about managing(create/d
- As we will run scan job with service account of workload and if there are some very strict PSP defined in the cluster
then scan job will be blocked due to the PSP.

[ECR registry configuration]: https://aquasecurity.github.io/trivy-operator/v0.18.0-rc2/integrations/managed-registries/#amazon-elastic-container-registry-ecr
[ECR registry configuration]: https://aquasecurity.github.io/trivy-operator/v0.18.0/integrations/managed-registries/#amazon-elastic-container-registry-ecr
[IAM role to service account]: https://docs.aws.amazon.com/eks/latest/userguide/specify-service-account-role.html
[Trivy fs command]: https://github.com/aquasecurity/trivy-operator/blob/main/docs/design/design_trivy_file_system_scanner.md
2 changes: 1 addition & 1 deletion docs/docs/design/ttl_scans.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ metadata:
report:
artifact:
repository: fluxcd/source-controller
tag: v0.18.0-rc2
tag: v0.18.0
registry:
server: ghcr.io
scanner:
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/vulnerability-scanning/managed-registries.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ metadata:
labels:
app.kubernetes.io/name: trivy-operator
app.kubernetes.io/instance: trivy-operator
app.kubernetes.io/version: "0.18.0-rc2"
app.kubernetes.io/version: "0.18.0"
app.kubernetes.io/managed-by: kubectl
azure.workload.identity/use: "true"
annotations:
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/private-registries.md
Original file line number Diff line number Diff line change
Expand Up @@ -303,4 +303,4 @@ data:
The last way that you could give the Trivy operator access to your private container registry is through managed registries. In this case, the container registry and your Kubernetes cluster would have to be on the same cloud provider; then you can define access to your container namespace as part of the IAM account. Once defined, trivy will already have the permissions for the registry.
For additional information, please refer to the [documentation on managed registries.](https://aquasecurity.github.io/trivy-operator/v0.18.0-rc2/docs/vulnerability-scanning/managed-registries/)
For additional information, please refer to the [documentation on managed registries.](https://aquasecurity.github.io/trivy-operator/v0.18.0/docs/vulnerability-scanning/managed-registries/)
2 changes: 1 addition & 1 deletion itest/helper/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ var (
trivyScanner = v1alpha1.Scanner{
Name: v1alpha1.ScannerNameTrivy,
Vendor: "Aqua Security",
Version: "0.18.0-rc2",
Version: "0.18.0",
}
)

Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ extra:
provider: mike
var:
prev_git_tag: "v0.17.1"
chart_version: "0.20.0-rc2"
chart_version: "0.20.0"

plugins:
- search
Expand Down

0 comments on commit c73d65d

Please sign in to comment.