Merge branch 'main' into 10k

pkg/apis/softwarecomposition/register.go

@@ -53,22 +53,14 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&SBOMSPDXv2p3FilteredList{},
 		&VulnerabilityManifest{},
 		&VulnerabilityManifestList{},
-		&SBOMSummary{},
-		&SBOMSummaryList{},
-		&VulnerabilityManifestSummary{},
-		&VulnerabilityManifestSummaryList{},
 		&WorkloadConfigurationScan{},
 		&WorkloadConfigurationScanList{},
 		&WorkloadConfigurationScanSummary{},
 		&WorkloadConfigurationScanSummaryList{},
 		&ConfigurationScanSummary{},
 		&ConfigurationScanSummaryList{},
-		&VulnerabilitySummary{},
-		&VulnerabilitySummaryList{},
 		&ApplicationProfile{},
 		&ApplicationProfileList{},
-		&ApplicationProfileSummary{},
-		&ApplicationProfileSummaryList{},
 		&ApplicationActivity{},
 		&ApplicationActivityList{},
 		&NetworkNeighbors{},

pkg/apis/softwarecomposition/types.go

@@ -17,8 +17,9 @@ limitations under the License.
 package softwarecomposition
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"strings"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -70,36 +71,6 @@ type SBOMSPDXv2p3 struct {
 	Status SBOMSPDXv2p3Status
 }
 
-// SBOMSummarySpec is the spec for the SBOM summary
-//
-// Since the summary spec is supposed to hold no data, only used as a low
-// footprint way to watch for heavy full-sized SBOMs, the spec is supposed to be
-// empty on purpose.
-type SBOMSummarySpec struct{}
-
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// SBOMSummary is a summary of an SBOM. It is not meant to be changed and only
-// works as a lightweight facade for watching proper SBOMs.
-type SBOMSummary struct {
-	metav1.TypeMeta
-	metav1.ObjectMeta
-
-	Spec   SBOMSummarySpec
-	Status SBOMSPDXv2p3Status
-}
-
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// SBOMSummaryList is a list of SBOM summaries
-type SBOMSummaryList struct {
-	metav1.TypeMeta
-	metav1.ListMeta
-
-	Items []SBOMSummary
-}
-
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
@@ -204,63 +175,6 @@ type VulnerabilitiesComponents struct {
 	WorkloadVulnerabilitiesObj VulnerabilitiesObjScope
 }
 
-type VulnerabilityManifestSummarySpec struct {
-	Severities      SeveritySummary
-	Vulnerabilities VulnerabilitiesComponents
-}
-
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// VulnerabilityManifestSummary is a summary of a VulnerabilityManifest.
-type VulnerabilityManifestSummary struct {
-	metav1.TypeMeta
-	metav1.ObjectMeta
-
-	Spec   VulnerabilityManifestSummarySpec
-	Status VulnerabilityManifestStatus
-}
-
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// VulnerabilityManifestSummaryList is a list of VulnerabilityManifest summaries.
-type VulnerabilityManifestSummaryList struct {
-	metav1.TypeMeta
-	metav1.ListMeta
-
-	Items []VulnerabilityManifestSummary
-}
-
-type VulnerabilitySummarySpec struct {
-	Severities                 SeveritySummary
-	WorkloadVulnerabilitiesObj []VulnerabilitiesObjScope
-}
-
-type VulnerabilitySummaryStatus struct {
-}
-
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// VulnerabilitySummary is a summary of a vulnerabilities for a given scope.
-type VulnerabilitySummary struct {
-	metav1.TypeMeta
-	metav1.ObjectMeta
-
-	Spec   VulnerabilitySummarySpec
-	Status VulnerabilitySummaryStatus
-}
-
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// VulnerabilitySummaryList is a list of VulnerabilitySummaries.
-type VulnerabilitySummaryList struct {
-	metav1.TypeMeta
-	metav1.ListMeta
-
-	Items []VulnerabilitySummary
-}
-
 func (c *VulnerabilityCounters) Add(counters *VulnerabilityCounters) {
 	c.All += counters.All
 	c.Relevant += counters.Relevant
@@ -275,16 +189,6 @@ func (s *SeveritySummary) Add(severities *SeveritySummary) {
 	s.Unknown.Add(&severities.Unknown)
 }
 
-func (v *VulnerabilitySummary) Merge(vulnManifestSumm *VulnerabilityManifestSummary) {
-	v.Spec.Severities.Add(&vulnManifestSumm.Spec.Severities)
-	workloadVulnerabilitiesObj := VulnerabilitiesObjScope{
-		Name:      vulnManifestSumm.Name,
-		Namespace: vulnManifestSumm.Namespace,
-		Kind:      "vulnerabilitymanifestsummary",
-	}
-	v.Spec.WorkloadVulnerabilitiesObj = append(v.Spec.WorkloadVulnerabilitiesObj, workloadVulnerabilitiesObj)
-}
-
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
@@ -361,23 +265,6 @@ type ApplicationProfileList struct {
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-type ApplicationProfileSummary struct {
-	metav1.TypeMeta
-	metav1.ObjectMeta
-}
-
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-type ApplicationProfileSummaryList struct {
-	metav1.TypeMeta
-	metav1.ListMeta
-
-	Items []ApplicationProfileSummary
-}
-
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
 type ApplicationActivity struct {
 	metav1.TypeMeta
 	metav1.ObjectMeta