feat(stoneintg-1350): add support for nested componentGroups

Allows users to add a ComponentGroup to another ComponentGroup's
spec.Components field. The resulting data structure is a DAG in which
all leaf nodes are Components and all non-leaves are ComponentGroups.

When a Component is built, its ComponentGroups will be gathered and
snapshots will be created for them. The Snapshot will contain the GCL
and updated images for that ComponentGroup and all ComponentGroups
nested within it. After that snapshot is created the snapshot controller
will create snapshots for all ComponentGroups that contain the first
ComponentGroup.

This allows Konflux to support complex use-cases for ComponentGroups in
which users have multi-tiered applications with subgroups that must be
tested independently

Signed-off-by: Ryan Cole <rcyoalne@gmail.com>

Author: 14rcole

api/v1beta2/componentgroup_types.go

@@ -41,11 +41,6 @@ type ComponentGroupSpec struct {
 	// +required
 	Components []ComponentReference `json:"components"`
 
-	// Dependents is a list of ComponentGroup names that are dependent on this ComponentGroup.
-	// When a snapshot is created for this ComponentGroup, snapshots will also be created for all dependents.
-	// +optional
-	Dependents []string `json:"dependents,omitempty"`
-
 	// TestGraph describes the desired order in which tests associated with the ComponentGroup should be executed.
 	// If not specified, all tests will run in parallel.
 	// The map key is the test scenario name, and the value is a list of parent test scenarios it depends on.
@@ -58,17 +53,24 @@ type ComponentGroupSpec struct {
 	SnapshotCreator *SnapshotCreatorSpec `json:"snapshotCreator,omitempty"`
 }
 
-// ComponentReference references a Component and its specific branch/version
+// ComponentReference references a Component or ComponentGroup and its specific branch/version
 type ComponentReference struct {
-	// Name is the name of the Component
+	// Name is the name of the Component or ComponentGroup
 	// +kubebuilder:validation:Pattern=^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
 	// +required
 	Name string `json:"name"`
 
+	// Kind is the type of resource  being referenced
+	// Must be 'component' or 'componentGroup', case-insensitive
+	// +kubebuilder:default:="component"
+	// +kubebuilder:validation:Pattern=`(?i)^(component|componentGroup)$`
+	Kind string `json:"kind,omitempty"`
+
 	// ComponentVersion references the ComponentVersion for this Component.
+	// Can only be set if 'Kind' is set to 'Component' or empty
 	// The ComponentVersion CRD will be implemented by the build team as part of STONEBLD-3604.
 	// For now, this contains the branch name and GCL (Global Candidate List) information.
-	// +required
+	// +optional
 	ComponentVersion ComponentVersionReference `json:"componentVersion"`
 }
 

api/v1beta2/componentgroup_types_test.go

@@ -52,7 +52,6 @@ func TestComponentGroupSpec(t *testing.T) {
 					},
 				},
 			},
-			Dependents: []string{"child-cg-1", "child-cg-2"},
 			TestGraph: map[string][]TestGraphNode{
 				"verify": {
 					{Name: "clamav-scan"},
@@ -116,10 +115,6 @@ func TestComponentGroupSpec(t *testing.T) {
 		t.Errorf("Expected second component branch 'components/second-component', got '%s'", cg.Spec.Components[1].ComponentVersion.Name)
 	}
 
-	if len(cg.Spec.Dependents) != 2 {
-		t.Errorf("Expected 2 dependents, got %d", len(cg.Spec.Dependents))
-	}
-
 	if len(cg.Spec.TestGraph) != 2 {
 		t.Errorf("Expected 2 test graph entries, got %d", len(cg.Spec.TestGraph))
 	}
@@ -192,9 +187,6 @@ func TestComponentGroupMinimalSpec(t *testing.T) {
 	if cg.Spec.Components[0].ComponentVersion.Revision != "" {
 		t.Errorf("Expected empty Revision, got '%s'", cg.Spec.Components[0].ComponentVersion.Revision)
 	}
-	if len(cg.Spec.Dependents) != 0 {
-		t.Errorf("Expected 0 dependents, got %d", len(cg.Spec.Dependents))
-	}
 	if cg.Spec.TestGraph != nil {
 		t.Error("Expected nil TestGraph")
 	}
@@ -257,7 +249,6 @@ func TestComponentGroupDeepCopy(t *testing.T) {
 					},
 				},
 			},
-			Dependents: []string{"dependent-1"},
 		},
 	}
 
@@ -360,7 +351,6 @@ func TestComponentGroupSpecDeepCopy(t *testing.T) {
 		Components: []ComponentReference{
 			{Name: "comp-1", ComponentVersion: ComponentVersionReference{Name: "main"}},
 		},
-		Dependents: []string{"dep-1"},
 		TestGraph: map[string][]TestGraphNode{
 			"test-1": {{Name: "node-1", FailFast: true}},
 		},

api/v1beta2/zz_generated.deepcopy.go

@@ -54,12 +54,13 @@ spec:
                   Components is a list of Components (name and branch) that belong to the ComponentGroup.
                   This is the source of truth for logical groupings of versioned Components.
                 items:
-                  description: ComponentReference references a Component and its specific
-                    branch/version
+                  description: ComponentReference references a Component or ComponentGroup
+                    and its specific branch/version
                   properties:
                     componentVersion:
                       description: |-
                         ComponentVersion references the ComponentVersion for this Component.
+                        Can only be set if 'Kind' is set to 'Component' or empty
                         The ComponentVersion CRD will be implemented by the build team as part of STONEBLD-3604.
                         For now, this contains the branch name and GCL (Global Candidate List) information.
                       properties:
@@ -82,22 +83,21 @@ spec:
                       required:
                       - name
                       type: object
+                    kind:
+                      default: component
+                      description: |-
+                        Kind is the type of resource  being referenced
+                        Must be 'component' or 'componentGroup', case-insensitive
+                      pattern: (?i)^(component|componentGroup)$
+                      type: string
                     name:
-                      description: Name is the name of the Component
+                      description: Name is the name of the Component or ComponentGroup
                       pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
                       type: string
                   required:
-                  - componentVersion
                   - name
                   type: object
                 type: array
-              dependents:
-                description: |-
-                  Dependents is a list of ComponentGroup names that are dependent on this ComponentGroup.
-                  When a snapshot is created for this ComponentGroup, snapshots will also be created for all dependents.
-                items:
-                  type: string
-                type: array
               snapshotCreator:
                 description: |-
                   SnapshotCreator is an optional field that allows custom logic for Snapshot creation.

config/crd/bases/appstudio.redhat.com_componentgroups.yaml

@@ -24,17 +24,16 @@ spec:
       componentVersion:
         name: "main"
     - name: second-component
+      kind: component
       componentBranch:
         name: "v1"
         revision: "v1branch"
         context: "components/second-component"
     - name: python-component
       componentBranch:
         name: "3.12.4"
-  dependents:
-    # when a snapshot for this ComponentGroup is created,
-    # the integration service will also create one for child-cg
-    - child-cg
+    - name: child-cg
+      kind: componentGroup
   testGraph:
     # in this graph clamav-scan, dast-tests, and deployment would run first
     # e2e-test would start when clamav-scan finishes

config/samples/appstudio_v1beta2_componentgroup.yaml

@@ -251,6 +251,10 @@ const (
 	// SnapshotAutoReleasedCondition is the condition for marking if Snapshot was auto-released released with AppStudio.
 	SnapshotAutoReleasedCondition = "AutoReleased"
 
+	// ParentSnapshotsCreatedCondition is the condition marking whether snapshots for all parent ComponentGroups for the
+	// ComponentGroup that the snapshot belongs to have been created
+	ParentSnapshotsCreatedCondition = "ParentSnapshotsCreated"
+
 	// SnapshotAddedToGlobalCandidateListCondition is the condition for marking if Snapshot's component was added to
 	// the global candidate list.
 	SnapshotAddedToGlobalCandidateListCondition = "AddedToGlobalCandidateList"
@@ -351,6 +355,8 @@ type ComponentSnapshotInfo struct {
 	Namespace string `json:"namespace"`
 	// Component name
 	Component string `json:"component"`
+	// Component version
+	Version string `json:"version,omitempty"`
 	// The build PLR name building the container image triggered by pull request
 	BuildPipelineRun string `json:"buildPipelineRun"`
 	// The built component snapshot from build PLR
@@ -665,6 +671,31 @@ func MarkSnapshotAsAutoReleased(ctx context.Context, adapterClient client.Client
 	return nil
 }
 
+func ParentSnapshotsCreated(snapshot *applicationapiv1alpha1.Snapshot) bool {
+	return IsSnapshotStatusConditionSet(snapshot, ParentSnapshotsCreatedCondition, metav1.ConditionTrue, "")
+}
+
+func SetParentSnapshotsCreatedCondition(snapshot *applicationapiv1alpha1.Snapshot, status metav1.ConditionStatus, reason, message string) {
+	condition := metav1.Condition{
+		Type:    ParentSnapshotsCreatedCondition,
+		Status:  status,
+		Reason:  reason,
+		Message: message,
+	}
+	meta.SetStatusCondition(&snapshot.Status.Conditions, condition)
+}
+
+func AddParentSnapshotDataToSnapshotStatus(snapshot *applicationapiv1alpha1.Snapshot, created bool, parentCG, parentSnapshot, message string) {
+	if snapshot.Status.ParentSnapshots == nil {
+		snapshot.Status.ParentSnapshots = make(map[string]applicationapiv1alpha1.ParentSnapshotData)
+	}
+	snapshot.Status.ParentSnapshots[parentCG] = applicationapiv1alpha1.ParentSnapshotData{
+		Created: created,
+		Name:    parentSnapshot,
+		Message: message,
+	}
+}
+
 // IsSnapshotMarkedAsAddedToGlobalCandidateList returns true if snapshot's AddedToGlobalCandidateListAnnotation result is marked as true to global candidate list
 func IsSnapshotMarkedAsAddedToGlobalCandidateList(snapshot *applicationapiv1alpha1.Snapshot) bool {
 	annotationValue, ok := snapshot.GetAnnotations()[AddedToGlobalCandidateListAnnotation]

gitops/snapshot.go

@@ -4,7 +4,7 @@ go 1.25.0
 
 require (
 	codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v3 v3.0.0
-	github.com/konflux-ci/application-api v0.0.0-20260312190025-5154ad273e17
+	github.com/konflux-ci/application-api v0.0.0-20260603073049-dd8c9b1a64c2
 	github.com/konflux-ci/coverport/instrumentation/go v0.0.0-20251127115143-b5207b335f8b
 	github.com/konflux-ci/image-controller v0.0.0-20241128141349-9986c9955e05
 	github.com/konflux-ci/operator-toolkit v0.0.0-20251118152634-b4f41f073069

go.mod

@@ -351,8 +351,8 @@ github.com/klauspost/compress v1.18.1 h1:bcSGx7UbpBqMChDtsF28Lw6v/G94LPrrbMbdC3J
 github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0=
 github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
 github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
-github.com/konflux-ci/application-api v0.0.0-20260312190025-5154ad273e17 h1:auNv0idITCdlV3fP9i+V6EeT2MbZc/9+05GtKzOk1Ss=
-github.com/konflux-ci/application-api v0.0.0-20260312190025-5154ad273e17/go.mod h1:948Z+a1IbfRT0RtoHzWWSN9YEucSbMJTHaMhz7dVICc=
+github.com/konflux-ci/application-api v0.0.0-20260603073049-dd8c9b1a64c2 h1:ldBiggDxskW+X1Edqa1REuonbCo+hVmdwA4bC8v674Q=
+github.com/konflux-ci/application-api v0.0.0-20260603073049-dd8c9b1a64c2/go.mod h1:948Z+a1IbfRT0RtoHzWWSN9YEucSbMJTHaMhz7dVICc=
 github.com/konflux-ci/coverport/instrumentation/go v0.0.0-20251127115143-b5207b335f8b h1:NoriO1KRc+7d2/JA07JizqxP0LlA2oJdD5AuQOvEIjE=
 github.com/konflux-ci/coverport/instrumentation/go v0.0.0-20251127115143-b5207b335f8b/go.mod h1:WVMHU9A2464s/vjH1xOTm4LJDD4xP+VlEiU+KM0gkSU=
 github.com/konflux-ci/image-controller v0.0.0-20241128141349-9986c9955e05 h1:5Xawkybl99uEiXhkdkxWtHDWitgnf+kAjpNVTanVGRE=

go.sum

@@ -219,7 +219,7 @@ func (a *Adapter) EnsureSnapshotExists() (result controller.OperationResult, err
 	}
 
 	for _, componentGroup := range *a.componentGroups {
-		expectedSnapshot, err := snapshot.PrepareSnapshotForPipelineRun(a.context, a.client, a.pipelineRun, a.component.Name, &componentGroup)
+		expectedSnapshot, err := snapshot.PrepareSnapshotForPipelineRun(a.context, a.client, a.pipelineRun, a.component.Name, &componentGroup, a.loader)
 		if err != nil {
 			return a.updatePipelineRunWithCustomizedError(&canRemoveFinalizer, err, a.context, a.pipelineRun, a.client, a.logger)
 		}

internal/controller/buildpipeline/buildpipeline_adapter.go

@@ -583,6 +583,10 @@ var _ = Describe("Pipeline Adapter", Ordered, func() {
 					ContextKey: loader.ComponentGroupContextKey,
 					Resource:   hasCompGroup,
 				},
+				{
+					ContextKey: loader.NestedComponentGroupsContextKey,
+					Resource:   []v1beta2.ComponentGroup{},
+				},
 				{
 					ContextKey: loader.ComponentContextKey,
 					Resource:   hasComp,
@@ -723,6 +727,10 @@ var _ = Describe("Pipeline Adapter", Ordered, func() {
 					ContextKey: loader.ComponentGroupContextKey,
 					Resource:   hasCompGroup,
 				},
+				{
+					ContextKey: loader.NestedComponentGroupsContextKey,
+					Resource:   []v1beta2.ComponentGroup{},
+				},
 				{
 					ContextKey: loader.ComponentContextKey,
 					Resource:   hasComp,
@@ -742,7 +750,7 @@ var _ = Describe("Pipeline Adapter", Ordered, func() {
 					},
 				},
 			})
-			_, err := snapshot.PrepareSnapshotForPipelineRun(adapter.context, adapter.client, adapter.pipelineRun, adapter.component.Name, hasCompGroup)
+			_, err := snapshot.PrepareSnapshotForPipelineRun(adapter.context, adapter.client, adapter.pipelineRun, adapter.component.Name, hasCompGroup, adapter.loader)
 			Expect(helpers.IsInvalidImageDigestError(err)).To(BeTrue())
 			Eventually(func() bool {
 				result, err := adapter.EnsureSnapshotExists()
@@ -1305,6 +1313,10 @@ var _ = Describe("Pipeline Adapter", Ordered, func() {
 					ContextKey: loader.ComponentGroupContextKey,
 					Resource:   hasCompGroup,
 				},
+				{
+					ContextKey: loader.NestedComponentGroupsContextKey,
+					Resource:   []v1beta2.ComponentGroup{},
+				},
 				{
 					ContextKey: loader.ComponentContextKey,
 					Resource:   hasComp,
@@ -1345,6 +1357,10 @@ var _ = Describe("Pipeline Adapter", Ordered, func() {
 					ContextKey: loader.ComponentGroupContextKey,
 					Resource:   hasCompGroup,
 				},
+				{
+					ContextKey: loader.NestedComponentGroupsContextKey,
+					Resource:   []v1beta2.ComponentGroup{},
+				},
 				{
 					ContextKey: loader.ComponentContextKey,
 					Resource:   hasComp,
@@ -1723,6 +1739,10 @@ var _ = Describe("Pipeline Adapter", Ordered, func() {
 							hasCompGroup.Name: nil,
 						},
 					},
+					{
+						ContextKey: loader.NestedComponentGroupsContextKey,
+						Resource:   []v1beta2.ComponentGroup{},
+					},
 				})
 
 				Eventually(func() bool {
@@ -1973,6 +1993,10 @@ var _ = Describe("Pipeline Adapter", Ordered, func() {
 						Resource:   nil,
 						Err:        notFoundErr,
 					},
+					{
+						ContextKey: loader.NestedComponentGroupsContextKey,
+						Resource:   []v1beta2.ComponentGroup{},
+					},
 				})
 
 				Eventually(func() bool {
@@ -2008,6 +2032,10 @@ var _ = Describe("Pipeline Adapter", Ordered, func() {
 						Resource:   buildPipelineRun,
 						Err:        conflictErr,
 					},
+					{
+						ContextKey: loader.NestedComponentGroupsContextKey,
+						Resource:   []v1beta2.ComponentGroup{},
+					},
 				})
 
 				Eventually(func() bool {
@@ -2049,6 +2077,10 @@ var _ = Describe("Pipeline Adapter", Ordered, func() {
 						ContextKey: loader.AllSnapshotsContextKey,
 						Resource:   []applicationapiv1alpha1.Snapshot{*hasSnapshot},
 					},
+					{
+						ContextKey: loader.NestedComponentGroupsContextKey,
+						Resource:   []v1beta2.ComponentGroup{},
+					},
 				})
 
 				Eventually(func() bool {