diff --git a/deploy/helm/crds/aquasecurity.github.io_clustervulnerabilityreports.yaml b/deploy/helm/crds/aquasecurity.github.io_clustervulnerabilityreports.yaml index b598808add..2578e4cdcc 100644 --- a/deploy/helm/crds/aquasecurity.github.io_clustervulnerabilityreports.yaml +++ b/deploy/helm/crds/aquasecurity.github.io_clustervulnerabilityreports.yaml @@ -212,6 +212,18 @@ spec: type: object cvsssource: type: string + dataSource: + description: DataSource represents the source of vulnerability + data. + properties: + id: + description: SourceID represents data source such as NVD. + type: string + name: + type: string + url: + type: string + type: object description: type: string fixedVersion: @@ -255,6 +267,9 @@ spec: - LOW - UNKNOWN type: string + severitySource: + description: SourceID represents data source such as NVD. + type: string target: type: string title: diff --git a/deploy/helm/crds/aquasecurity.github.io_vulnerabilityreports.yaml b/deploy/helm/crds/aquasecurity.github.io_vulnerabilityreports.yaml index 8f1f3fd34e..ae708bcbc7 100644 --- a/deploy/helm/crds/aquasecurity.github.io_vulnerabilityreports.yaml +++ b/deploy/helm/crds/aquasecurity.github.io_vulnerabilityreports.yaml @@ -213,6 +213,18 @@ spec: type: object cvsssource: type: string + dataSource: + description: DataSource represents the source of vulnerability + data. + properties: + id: + description: SourceID represents data source such as NVD. + type: string + name: + type: string + url: + type: string + type: object description: type: string fixedVersion: @@ -257,7 +269,7 @@ spec: - UNKNOWN type: string severitySource: - description: SeveritySource is the data source of the severity value. + description: SourceID represents data source such as NVD. type: string target: type: string @@ -266,19 +278,6 @@ spec: vulnerabilityID: description: VulnerabilityID the vulnerability identifier. type: string - dataSource: - description: DataSource is the data source of the vulnerability data. - type: object - properties: - id: - description: ID is the identifier of the data source. - type: string - name: - description: Name is the name of the data source. - type: string - url: - description: URL is the URL of the data source. - type: string required: - fixedVersion - installedVersion diff --git a/deploy/static/trivy-operator.yaml b/deploy/static/trivy-operator.yaml index 00ab309da7..8dd7f1501d 100644 --- a/deploy/static/trivy-operator.yaml +++ b/deploy/static/trivy-operator.yaml @@ -1419,6 +1419,18 @@ spec: type: object cvsssource: type: string + dataSource: + description: DataSource represents the source of vulnerability + data. + properties: + id: + description: SourceID represents data source such as NVD. + type: string + name: + type: string + url: + type: string + type: object description: type: string fixedVersion: @@ -1462,6 +1474,9 @@ spec: - LOW - UNKNOWN type: string + severitySource: + description: SourceID represents data source such as NVD. + type: string target: type: string title: @@ -2853,6 +2868,18 @@ spec: type: object cvsssource: type: string + dataSource: + description: DataSource represents the source of vulnerability + data. + properties: + id: + description: SourceID represents data source such as NVD. + type: string + name: + type: string + url: + type: string + type: object description: type: string fixedVersion: @@ -2897,7 +2924,7 @@ spec: - UNKNOWN type: string severitySource: - description: SeveritySource is the data source of the severity value. + description: SourceID represents data source such as NVD. type: string target: type: string @@ -2906,19 +2933,6 @@ spec: vulnerabilityID: description: VulnerabilityID the vulnerability identifier. type: string - dataSource: - description: DataSource is the data source of the vulnerability data. - type: object - properties: - id: - description: ID is the identifier of the data source. - type: string - name: - description: Name is the name of the data source. - type: string - url: - description: URL is the URL of the data source. - type: string required: - fixedVersion - installedVersion diff --git a/pkg/apis/aquasecurity/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/aquasecurity/v1alpha1/zz_generated.deepcopy.go index a670833ee1..129459d0d0 100644 --- a/pkg/apis/aquasecurity/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/aquasecurity/v1alpha1/zz_generated.deepcopy.go @@ -759,6 +759,21 @@ func (in *ControlCheckSummary) DeepCopy() *ControlCheckSummary { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DataSource) DeepCopyInto(out *DataSource) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataSource. +func (in *DataSource) DeepCopy() *DataSource { + if in == nil { + return nil + } + out := new(DataSource) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Dependency) DeepCopyInto(out *Dependency) { *out = *in @@ -1481,6 +1496,11 @@ func (in *Vulnerability) DeepCopyInto(out *Vulnerability) { (*out)[key] = val } } + if in.DataSource != nil { + in, out := &in.DataSource, &out.DataSource + *out = new(DataSource) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Vulnerability.