Handle requiredFeatureGates in partial manifests and manifest merge

Author: JoelSpeed

tools/codegen/pkg/emptypartialschemas/content_creator.go

@@ -2,16 +2,17 @@ package emptypartialschemas
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
 	"github.com/google/go-cmp/cmp"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/klog/v2"
-	"os"
-	"path/filepath"
-	"strings"
 )
 
 func createFeatureGatedCRDManifests(allCRDInfo map[string]*CRDInfo, outputDir string, verify bool) error {
@@ -128,12 +129,9 @@ func ensureNoExtraFields(minimalCRD, existingCRD *apiextensionsv1.CustomResource
 func minimalCRDFor(crdInfo *CRDInfo, featureGate string) *apiextensionsv1.CustomResourceDefinition {
 	ret := &apiextensionsv1.CustomResourceDefinition{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: crdInfo.CRDName,
-			Annotations: map[string]string{
-				// notice that this produces a "" featuregate to mean ungated
-				fmt.Sprintf("feature-gate.release.openshift.io/%s", featureGate): "true",
-			},
-			Labels: map[string]string{},
+			Name:        crdInfo.CRDName,
+			Annotations: map[string]string{},
+			Labels:      map[string]string{},
 		},
 		Spec: apiextensionsv1.CustomResourceDefinitionSpec{
 			Group: crdInfo.GroupName,
@@ -160,6 +158,12 @@ func minimalCRDFor(crdInfo *CRDInfo, featureGate string) *apiextensionsv1.Custom
 			PreserveUnknownFields: false,
 		},
 	}
+
+	for _, fg := range strings.Split(featureGate, "+") {
+		// notice that this produces a "" featuregate to mean ungated
+		ret.Annotations[fmt.Sprintf("feature-gate.release.openshift.io/%s", fg)] = "true"
+	}
+
 	if len(crdInfo.FilenameRunLevel) > 0 {
 		ret.Annotations["api.openshift.io/filename-cvo-runlevel"] = crdInfo.FilenameRunLevel
 	}

tools/codegen/pkg/emptypartialschemas/tags.go

@@ -2,10 +2,11 @@ package emptypartialschemas
 
 import (
 	"fmt"
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/gengo/types"
 	"strconv"
 	"strings"
+
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	"k8s.io/gengo/types"
 )
 
 // known tags that are handled by empty partial schema generation.
@@ -83,6 +84,17 @@ func extractFeatureGatesFromValidationMarker(comments []string, tagName string)
 		}
 	}
 
+	for _, tagVal := range tagVals {
+		requiredFeatureGates := extractNamedValuesFromSingleLine(tagVal)["requiredFeatureGate"]
+
+		// Use + as the separator between required feature gates in file names.
+		requiredFeatureGates = strings.Replace(requiredFeatureGates, ";", "+", -1)
+
+		if len(requiredFeatureGates) > 0 {
+			ret = append(ret, requiredFeatureGates)
+		}
+	}
+
 	return ret
 }
 

tools/codegen/pkg/manifestmerge/filters.go

@@ -2,15 +2,16 @@ package manifestmerge
 
 import (
 	"fmt"
+	"os"
+	"path"
+	"path/filepath"
+	"strings"
+
 	"github.com/openshift/api/tools/codegen/pkg/utils"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"os"
-	"path"
-	"path/filepath"
 	kyaml "sigs.k8s.io/yaml"
-	"strings"
 )
 
 func AllKnownFeatureSets(payloadFeatureGatePath string) (sets.String, error) {
@@ -149,7 +150,7 @@ func (f *ForFeatureGates) UseManifest(data []byte) (bool, error) {
 		return true, nil
 	}
 
-	return manifestFeatureGates.HasAny(f.allowedFeatureGates.UnsortedList()...), nil
+	return f.allowedFeatureGates.HasAll(manifestFeatureGates.UnsortedList()...), nil
 }
 
 func (f *ForFeatureGates) String() string {