Skip to content

Commit d810d14

Browse files
chen-keinanchen-keinan
authoredApr 15, 2024··
fix: better error handling for node config api data (#2004)
* fix: better error handling for node config api data Signed-off-by: chenk <hen.keinan@gmail.com> * fix: better error handling for node config api data Signed-off-by: chenk <hen.keinan@gmail.com> * fix: better error handling for node config api data Signed-off-by: chenk <hen.keinan@gmail.com> * fix: better error handling for node config api data Signed-off-by: chenk <hen.keinan@gmail.com> * fix: better error handling for node config api data Signed-off-by: chenk <hen.keinan@gmail.com> --------- Signed-off-by: chenk <hen.keinan@gmail.com>
·
v0.25.0v0.20.0
1 parent 8b906fd commit d810d14

24 files changed

+342
-233
lines changed
 

‎.github/workflows/build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
- LICENSE
2323
- NOTICE
2424
env:
25-
GO_VERSION: 1.20.4
25+
GO_VERSION: 1.22.2
2626
KIND_VERSION: v0.17.0
2727
KIND_IMAGE: kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
2828
permissions: {}

‎.github/workflows/chart-testing.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
paths:
1313
- deploy/**
1414
env:
15-
GO_VERSION: 1.20.4
15+
GO_VERSION: 1.22.2
1616
KIND_VERSION: v0.17.0
1717
KIND_IMAGE: kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
1818
permissions: {}

‎.github/workflows/private-registries.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
- LICENSE
2323
- NOTICE
2424
env:
25-
GO_VERSION: 1.20.4
25+
GO_VERSION: 1.22.2
2626
KIND_VERSION: v0.17.0
2727
KIND_IMAGE: kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
2828
permissions: {}

‎.github/workflows/release-snapshot.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- cron: "0 0 * * *"
99

1010
env:
11-
GO_VERSION: 1.20.4
11+
GO_VERSION: 1.22.2
1212

1313
# Disable permissions granted to the GITHUB_TOKEN for all the available scopes.
1414
permissions: {}

‎.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
tags:
1111
- "v*"
1212
env:
13-
GO_VERSION: 1.20.4
13+
GO_VERSION: 1.22.2
1414
KIND_VERSION: v0.17.0
1515
KIND_IMAGE: kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
1616
jobs:

‎deploy/helm/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Keeps security report resources updated
3131
| nodeCollector.imagePullSecret | string | `nil` | imagePullSecret is the secret name to be used when pulling node-collector image from private registries example : reg-secret It is the user responsibility to create the secret for the private registry in `trivy-operator` namespace |
3232
| nodeCollector.registry | string | `"ghcr.io"` | registry of the node-collector image |
3333
| nodeCollector.repository | string | `"aquasecurity/node-collector"` | repository of the node-collector image |
34-
| nodeCollector.tag | string | `"0.1.2"` | tag version of the node-collector image |
34+
| nodeCollector.tag | string | `"0.1.3"` | tag version of the node-collector image |
3535
| nodeCollector.useNodeSelector | bool | `true` | useNodeSelector determine if to use nodeSelector (by auto detecting node name) with node-collector scan job |
3636
| nodeCollector.volumeMounts | list | `[{"mountPath":"/var/lib/etcd","name":"var-lib-etcd","readOnly":true},{"mountPath":"/var/lib/kubelet","name":"var-lib-kubelet","readOnly":true},{"mountPath":"/var/lib/kube-scheduler","name":"var-lib-kube-scheduler","readOnly":true},{"mountPath":"/var/lib/kube-controller-manager","name":"var-lib-kube-controller-manager","readOnly":true},{"mountPath":"/etc/systemd","name":"etc-systemd","readOnly":true},{"mountPath":"/lib/systemd/","name":"lib-systemd","readOnly":true},{"mountPath":"/etc/kubernetes","name":"etc-kubernetes","readOnly":true},{"mountPath":"/etc/cni/net.d/","name":"etc-cni-netd","readOnly":true}]` | node-collector pod volume mounts definition for collecting config files information |
3737
| nodeCollector.volumes | list | `[{"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"}]` | node-collector pod volumes definition for collecting config files information |

‎deploy/helm/crds/aquasecurity.github.io_clustercompliancereports.yaml

+12-8
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: clustercompliancereports.aquasecurity.github.io
98
spec:
109
group: aquasecurity.github.io
@@ -39,14 +38,19 @@ spec:
3938
resource.
4039
properties:
4140
apiVersion:
42-
description: 'APIVersion defines the versioned schema of this representation
43-
of an object. Servers should convert recognized schemas to the latest
44-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
41+
description: |-
42+
APIVersion defines the versioned schema of this representation of an object.
43+
Servers should convert recognized schemas to the latest internal value, and
44+
may reject unrecognized values.
45+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
4546
type: string
4647
kind:
47-
description: 'Kind is a string value representing the REST resource this
48-
object represents. Servers may infer this from the endpoint the client
49-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
48+
description: |-
49+
Kind is a string value representing the REST resource this object represents.
50+
Servers may infer this from the endpoint the client submits requests to.
51+
Cannot be updated.
52+
In CamelCase.
53+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
5054
type: string
5155
metadata:
5256
type: object

‎deploy/helm/crds/aquasecurity.github.io_clusterconfigauditreports.yaml

+12-8
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: clusterconfigauditreports.aquasecurity.github.io
98
spec:
109
group: aquasecurity.github.io
@@ -53,14 +52,19 @@ spec:
5352
resource.
5453
properties:
5554
apiVersion:
56-
description: 'APIVersion defines the versioned schema of this representation
57-
of an object. Servers should convert recognized schemas to the latest
58-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
55+
description: |-
56+
APIVersion defines the versioned schema of this representation of an object.
57+
Servers should convert recognized schemas to the latest internal value, and
58+
may reject unrecognized values.
59+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
5960
type: string
6061
kind:
61-
description: 'Kind is a string value representing the REST resource this
62-
object represents. Servers may infer this from the endpoint the client
63-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
62+
description: |-
63+
Kind is a string value representing the REST resource this object represents.
64+
Servers may infer this from the endpoint the client submits requests to.
65+
Cannot be updated.
66+
In CamelCase.
67+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
6468
type: string
6569
metadata:
6670
type: object

‎deploy/helm/crds/aquasecurity.github.io_clusterinfraassessmentreports.yaml

+12-8
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: clusterinfraassessmentreports.aquasecurity.github.io
98
spec:
109
group: aquasecurity.github.io
@@ -53,14 +52,19 @@ spec:
5352
resource.
5453
properties:
5554
apiVersion:
56-
description: 'APIVersion defines the versioned schema of this representation
57-
of an object. Servers should convert recognized schemas to the latest
58-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
55+
description: |-
56+
APIVersion defines the versioned schema of this representation of an object.
57+
Servers should convert recognized schemas to the latest internal value, and
58+
may reject unrecognized values.
59+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
5960
type: string
6061
kind:
61-
description: 'Kind is a string value representing the REST resource this
62-
object represents. Servers may infer this from the endpoint the client
63-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
62+
description: |-
63+
Kind is a string value representing the REST resource this object represents.
64+
Servers may infer this from the endpoint the client submits requests to.
65+
Cannot be updated.
66+
In CamelCase.
67+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
6468
type: string
6569
metadata:
6670
type: object

‎deploy/helm/crds/aquasecurity.github.io_clusterrbacassessmentreports.yaml

+12-8
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: clusterrbacassessmentreports.aquasecurity.github.io
98
spec:
109
group: aquasecurity.github.io
@@ -53,14 +52,19 @@ spec:
5352
resource.
5453
properties:
5554
apiVersion:
56-
description: 'APIVersion defines the versioned schema of this representation
57-
of an object. Servers should convert recognized schemas to the latest
58-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
55+
description: |-
56+
APIVersion defines the versioned schema of this representation of an object.
57+
Servers should convert recognized schemas to the latest internal value, and
58+
may reject unrecognized values.
59+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
5960
type: string
6061
kind:
61-
description: 'Kind is a string value representing the REST resource this
62-
object represents. Servers may infer this from the endpoint the client
63-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
62+
description: |-
63+
Kind is a string value representing the REST resource this object represents.
64+
Servers may infer this from the endpoint the client submits requests to.
65+
Cannot be updated.
66+
In CamelCase.
67+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
6468
type: string
6569
metadata:
6670
type: object

‎deploy/helm/crds/aquasecurity.github.io_clustersbomreports.yaml

+15-10
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: clustersbomreports.aquasecurity.github.io
98
spec:
109
group: aquasecurity.github.io
@@ -51,23 +50,29 @@ spec:
5150
in container image
5251
properties:
5352
apiVersion:
54-
description: 'APIVersion defines the versioned schema of this representation
55-
of an object. Servers should convert recognized schemas to the latest
56-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
53+
description: |-
54+
APIVersion defines the versioned schema of this representation of an object.
55+
Servers should convert recognized schemas to the latest internal value, and
56+
may reject unrecognized values.
57+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
5758
type: string
5859
kind:
59-
description: 'Kind is a string value representing the REST resource this
60-
object represents. Servers may infer this from the endpoint the client
61-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
60+
description: |-
61+
Kind is a string value representing the REST resource this object represents.
62+
Servers may infer this from the endpoint the client submits requests to.
63+
Cannot be updated.
64+
In CamelCase.
65+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
6266
type: string
6367
metadata:
6468
type: object
6569
report:
6670
description: Report is the actual sbom report data.
6771
properties:
6872
artifact:
69-
description: Artifact represents a standalone, executable package
70-
of software that includes everything needed to run an application.
73+
description: |-
74+
Artifact represents a standalone, executable package of software that includes everything needed to
75+
run an application.
7176
properties:
7277
digest:
7378
description: Digest is a unique and immutable identifier of an

‎deploy/helm/crds/aquasecurity.github.io_clustervulnerabilityreports.yaml

+18-12
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: clustervulnerabilityreports.aquasecurity.github.io
98
spec:
109
group: aquasecurity.github.io
@@ -62,27 +61,34 @@ spec:
6261
name: v1alpha1
6362
schema:
6463
openAPIV3Schema:
65-
description: ClusterVulnerabilityReport summarizes vulnerabilities in application
66-
dependencies and operating system packages built into container images.
64+
description: |-
65+
ClusterVulnerabilityReport summarizes vulnerabilities in application dependencies and operating system packages
66+
built into container images.
6767
properties:
6868
apiVersion:
69-
description: 'APIVersion defines the versioned schema of this representation
70-
of an object. Servers should convert recognized schemas to the latest
71-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
69+
description: |-
70+
APIVersion defines the versioned schema of this representation of an object.
71+
Servers should convert recognized schemas to the latest internal value, and
72+
may reject unrecognized values.
73+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
7274
type: string
7375
kind:
74-
description: 'Kind is a string value representing the REST resource this
75-
object represents. Servers may infer this from the endpoint the client
76-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
76+
description: |-
77+
Kind is a string value representing the REST resource this object represents.
78+
Servers may infer this from the endpoint the client submits requests to.
79+
Cannot be updated.
80+
In CamelCase.
81+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
7782
type: string
7883
metadata:
7984
type: object
8085
report:
8186
description: Report is the actual vulnerability report data.
8287
properties:
8388
artifact:
84-
description: Artifact represents a standalone, executable package
85-
of software that includes everything needed to run an application.
89+
description: |-
90+
Artifact represents a standalone, executable package of software that includes everything needed to
91+
run an application.
8692
properties:
8793
digest:
8894
description: Digest is a unique and immutable identifier of an

‎deploy/helm/crds/aquasecurity.github.io_configauditreports.yaml

+12-8
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: configauditreports.aquasecurity.github.io
98
spec:
109
group: aquasecurity.github.io
@@ -54,14 +53,19 @@ spec:
5453
resource.
5554
properties:
5655
apiVersion:
57-
description: 'APIVersion defines the versioned schema of this representation
58-
of an object. Servers should convert recognized schemas to the latest
59-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
56+
description: |-
57+
APIVersion defines the versioned schema of this representation of an object.
58+
Servers should convert recognized schemas to the latest internal value, and
59+
may reject unrecognized values.
60+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
6061
type: string
6162
kind:
62-
description: 'Kind is a string value representing the REST resource this
63-
object represents. Servers may infer this from the endpoint the client
64-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
63+
description: |-
64+
Kind is a string value representing the REST resource this object represents.
65+
Servers may infer this from the endpoint the client submits requests to.
66+
Cannot be updated.
67+
In CamelCase.
68+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
6569
type: string
6670
metadata:
6771
type: object

‎deploy/helm/crds/aquasecurity.github.io_exposedsecretreports.yaml

+15-10
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: exposedsecretreports.aquasecurity.github.io
98
spec:
109
group: aquasecurity.github.io
@@ -62,23 +61,29 @@ spec:
6261
built into container images.
6362
properties:
6463
apiVersion:
65-
description: 'APIVersion defines the versioned schema of this representation
66-
of an object. Servers should convert recognized schemas to the latest
67-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
64+
description: |-
65+
APIVersion defines the versioned schema of this representation of an object.
66+
Servers should convert recognized schemas to the latest internal value, and
67+
may reject unrecognized values.
68+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
6869
type: string
6970
kind:
70-
description: 'Kind is a string value representing the REST resource this
71-
object represents. Servers may infer this from the endpoint the client
72-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
71+
description: |-
72+
Kind is a string value representing the REST resource this object represents.
73+
Servers may infer this from the endpoint the client submits requests to.
74+
Cannot be updated.
75+
In CamelCase.
76+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
7377
type: string
7478
metadata:
7579
type: object
7680
report:
7781
description: Report is the actual exposed secret report data.
7882
properties:
7983
artifact:
80-
description: Artifact represents a standalone, executable package
81-
of software that includes everything needed to run an application.
84+
description: |-
85+
Artifact represents a standalone, executable package of software that includes everything needed to
86+
run an application.
8287
properties:
8388
digest:
8489
description: Digest is a unique and immutable identifier of an

‎deploy/helm/crds/aquasecurity.github.io_infraassessmentreports.yaml

+12-8
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: infraassessmentreports.aquasecurity.github.io
98
spec:
109
group: aquasecurity.github.io
@@ -54,14 +53,19 @@ spec:
5453
resource.
5554
properties:
5655
apiVersion:
57-
description: 'APIVersion defines the versioned schema of this representation
58-
of an object. Servers should convert recognized schemas to the latest
59-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
56+
description: |-
57+
APIVersion defines the versioned schema of this representation of an object.
58+
Servers should convert recognized schemas to the latest internal value, and
59+
may reject unrecognized values.
60+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
6061
type: string
6162
kind:
62-
description: 'Kind is a string value representing the REST resource this
63-
object represents. Servers may infer this from the endpoint the client
64-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
63+
description: |-
64+
Kind is a string value representing the REST resource this object represents.
65+
Servers may infer this from the endpoint the client submits requests to.
66+
Cannot be updated.
67+
In CamelCase.
68+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
6569
type: string
6670
metadata:
6771
type: object

‎deploy/helm/crds/aquasecurity.github.io_rbacassessmentreports.yaml

+12-8
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: rbacassessmentreports.aquasecurity.github.io
98
spec:
109
group: aquasecurity.github.io
@@ -54,14 +53,19 @@ spec:
5453
resource.
5554
properties:
5655
apiVersion:
57-
description: 'APIVersion defines the versioned schema of this representation
58-
of an object. Servers should convert recognized schemas to the latest
59-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
56+
description: |-
57+
APIVersion defines the versioned schema of this representation of an object.
58+
Servers should convert recognized schemas to the latest internal value, and
59+
may reject unrecognized values.
60+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
6061
type: string
6162
kind:
62-
description: 'Kind is a string value representing the REST resource this
63-
object represents. Servers may infer this from the endpoint the client
64-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
63+
description: |-
64+
Kind is a string value representing the REST resource this object represents.
65+
Servers may infer this from the endpoint the client submits requests to.
66+
Cannot be updated.
67+
In CamelCase.
68+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
6569
type: string
6670
metadata:
6771
type: object

‎deploy/helm/crds/aquasecurity.github.io_sbomreports.yaml

+15-10
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: sbomreports.aquasecurity.github.io
98
spec:
109
group: aquasecurity.github.io
@@ -52,23 +51,29 @@ spec:
5251
image
5352
properties:
5453
apiVersion:
55-
description: 'APIVersion defines the versioned schema of this representation
56-
of an object. Servers should convert recognized schemas to the latest
57-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
54+
description: |-
55+
APIVersion defines the versioned schema of this representation of an object.
56+
Servers should convert recognized schemas to the latest internal value, and
57+
may reject unrecognized values.
58+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
5859
type: string
5960
kind:
60-
description: 'Kind is a string value representing the REST resource this
61-
object represents. Servers may infer this from the endpoint the client
62-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
61+
description: |-
62+
Kind is a string value representing the REST resource this object represents.
63+
Servers may infer this from the endpoint the client submits requests to.
64+
Cannot be updated.
65+
In CamelCase.
66+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
6367
type: string
6468
metadata:
6569
type: object
6670
report:
6771
description: Report is the actual sbom report data.
6872
properties:
6973
artifact:
70-
description: Artifact represents a standalone, executable package
71-
of software that includes everything needed to run an application.
74+
description: |-
75+
Artifact represents a standalone, executable package of software that includes everything needed to
76+
run an application.
7277
properties:
7378
digest:
7479
description: Digest is a unique and immutable identifier of an

‎deploy/helm/crds/aquasecurity.github.io_vulnerabilityreports.yaml

+18-12
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: vulnerabilityreports.aquasecurity.github.io
98
spec:
109
group: aquasecurity.github.io
@@ -63,27 +62,34 @@ spec:
6362
name: v1alpha1
6463
schema:
6564
openAPIV3Schema:
66-
description: VulnerabilityReport summarizes vulnerabilities in application
67-
dependencies and operating system packages built into container images.
65+
description: |-
66+
VulnerabilityReport summarizes vulnerabilities in application dependencies and operating system packages
67+
built into container images.
6868
properties:
6969
apiVersion:
70-
description: 'APIVersion defines the versioned schema of this representation
71-
of an object. Servers should convert recognized schemas to the latest
72-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
70+
description: |-
71+
APIVersion defines the versioned schema of this representation of an object.
72+
Servers should convert recognized schemas to the latest internal value, and
73+
may reject unrecognized values.
74+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
7375
type: string
7476
kind:
75-
description: 'Kind is a string value representing the REST resource this
76-
object represents. Servers may infer this from the endpoint the client
77-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
77+
description: |-
78+
Kind is a string value representing the REST resource this object represents.
79+
Servers may infer this from the endpoint the client submits requests to.
80+
Cannot be updated.
81+
In CamelCase.
82+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
7883
type: string
7984
metadata:
8085
type: object
8186
report:
8287
description: Report is the actual vulnerability report data.
8388
properties:
8489
artifact:
85-
description: Artifact represents a standalone, executable package
86-
of software that includes everything needed to run an application.
90+
description: |-
91+
Artifact represents a standalone, executable package of software that includes everything needed to
92+
run an application.
8793
properties:
8894
digest:
8995
description: Digest is a unique and immutable identifier of an

‎deploy/helm/generated/role.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:
5-
creationTimestamp: null
65
name: trivy-operator
76
rules:
87
- apiGroups:

‎deploy/helm/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ nodeCollector:
656656
# -- repository of the node-collector image
657657
repository: aquasecurity/node-collector
658658
# -- tag version of the node-collector image
659-
tag: 0.1.2
659+
tag: 0.1.3
660660
# -- imagePullSecret is the secret name to be used when pulling node-collector image from private registries example : reg-secret
661661
# It is the user responsibility to create the secret for the private registry in `trivy-operator` namespace
662662
imagePullSecret: ~

‎deploy/static/trivy-operator.yaml

+166-112
Large diffs are not rendered by default.

‎go.mod

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/aquasecurity/trivy-operator
22

3-
go 1.21
3+
go 1.22
4+
5+
toolchain go1.22.0
46

57
require (
68
github.com/CycloneDX/cyclonedx-go v0.8.0

‎magefile.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ var (
6464
ENVTEST = filepath.Join(LOCALBIN, "setup-envtest")
6565

6666
// Controller Tools Version
67-
CONTROLLER_TOOLS_VERSION = "v0.9.2"
67+
CONTROLLER_TOOLS_VERSION = "v0.14.0"
6868
)
6969

7070
// Function to get the current working directory using os.Getwd()

‎pkg/apis/aquasecurity/v1alpha1/zz_generated.deepcopy.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.