update due to bump; do not merge

Author: DavidHurta

lib/manifest/manifest.go

@@ -61,6 +61,7 @@ func GetImplicitlyEnabledCapabilities(
 			manifestInclusionConfiguration.Capabilities,
 			manifestInclusionConfiguration.Overrides,
 			manifestInclusionConfiguration.EnabledFeatureGates,
+			nil,
 			true,
 		)
 		// update manifest is enabled, no need to check
@@ -79,6 +80,7 @@ func GetImplicitlyEnabledCapabilities(
 				manifestInclusionConfiguration.Capabilities,
 				manifestInclusionConfiguration.Overrides,
 				manifestInclusionConfiguration.EnabledFeatureGates,
+				nil,
 				true,
 			); err != nil {
 				continue

pkg/cvo/featuregate_integration_test.go

@@ -101,7 +101,7 @@ func TestFeatureGateManifestFiltering(t *testing.T) {
 			}
 
 			// Test the manifest inclusion logic
-			err := manifest.Include(nil, nil, nil, nil, nil, tt.enabledGates)
+			err := manifest.Include(nil, nil, nil, nil, nil, tt.enabledGates, nil)
 
 			if tt.shouldInclude {
 				if err != nil {
@@ -144,7 +144,7 @@ func TestSyncWorkIntegration(t *testing.T) {
 		Obj: testObj,
 	}
 
-	err := manifest.Include(nil, nil, nil, nil, nil, work.EnabledFeatureGates)
+	err := manifest.Include(nil, nil, nil, nil, nil, work.EnabledFeatureGates, nil)
 	if err != nil {
 		t.Errorf("Expected manifest to be included with TestGate1 enabled, got error: %v", err)
 	}
@@ -154,7 +154,7 @@ func TestSyncWorkIntegration(t *testing.T) {
 		"release.openshift.io/feature-gate": "DisabledGate",
 	})
 
-	err = manifest.Include(nil, nil, nil, nil, nil, work.EnabledFeatureGates)
+	err = manifest.Include(nil, nil, nil, nil, nil, work.EnabledFeatureGates, nil)
 	if err == nil {
 		t.Error("Expected manifest to be excluded with DisabledGate not enabled, but no error occurred")
 	}
@@ -263,7 +263,7 @@ func TestManifestFilteringExamples(t *testing.T) {
 				Obj: obj,
 			}
 
-			err := manifest.Include(nil, nil, nil, nil, nil, example.enabledGates)
+			err := manifest.Include(nil, nil, nil, nil, nil, example.enabledGates, nil)
 
 			if example.shouldInclude {
 				if err != nil {

pkg/cvo/sync_worker.go

@@ -1067,7 +1067,7 @@ func (w *SyncWorker) apply(ctx context.Context, work *SyncWork, maxWorkers int,
 			if task.Manifest.GVK != configv1.GroupVersion.WithKind("ClusterOperator") {
 				continue
 			}
-			if err := task.Manifest.Include(nil, nil, nil, &capabilities, work.Overrides, work.EnabledFeatureGates); err != nil {
+			if err := task.Manifest.Include(nil, nil, nil, &capabilities, work.Overrides, work.EnabledFeatureGates, nil); err != nil {
 				klog.V(manifestVerbosity).Infof("Skipping precreation of %s: %s", task, err)
 				continue
 			}
@@ -1087,7 +1087,7 @@ func (w *SyncWorker) apply(ctx context.Context, work *SyncWork, maxWorkers int,
 
 			klog.V(manifestVerbosity).Infof("Running sync for %s", task)
 
-			if err := task.Manifest.Include(nil, nil, nil, &capabilities, work.Overrides, work.EnabledFeatureGates); err != nil {
+			if err := task.Manifest.Include(nil, nil, nil, &capabilities, work.Overrides, work.EnabledFeatureGates, nil); err != nil {
 				klog.V(manifestVerbosity).Infof("Skipping %s: %s", task, err)
 				continue
 			}

pkg/payload/payload.go

@@ -211,7 +211,7 @@ func LoadUpdate(dir, releaseImage, excludeIdentifier string, requiredFeatureSet
 			filteredMs := []manifest.Manifest{}
 
 			for _, manifest := range ms {
-				if err := manifest.Include(&excludeIdentifier, &requiredFeatureSet, &profile, onlyKnownCaps, nil, enabledFeatureGates); err != nil {
+				if err := manifest.Include(&excludeIdentifier, &requiredFeatureSet, &profile, onlyKnownCaps, nil, enabledFeatureGates, nil); err != nil {
 					klog.V(2).Infof("excluding %s: %v\n", manifest.String(), err)
 					continue
 				}

pkg/payload/render.go

@@ -140,7 +140,7 @@ func renderDir(renderConfig manifestRenderConfig, idir, odir string, overrides [
 		for _, manifest := range manifests {
 			if len(filterGroupKind) > 0 && !filterGroupKind.Has(manifest.GVK.GroupKind()) {
 				klog.Infof("excluding %s because we do not render that group/kind", manifest.String())
-			} else if err := manifest.Include(nil, requiredFeatureSet, clusterProfile, nil, overrides, enabledFeatureGates); err != nil {
+			} else if err := manifest.Include(nil, requiredFeatureSet, clusterProfile, nil, overrides, enabledFeatureGates, nil); err != nil {
 				klog.Infof("excluding %s: %v", manifest.String(), err)
 			} else {
 				filteredManifests = append(filteredManifests, string(manifest.Raw))