update generated

openshift · Mar 11, 2024 · 68c8c83 · 68c8c83
1 parent dc110cc
commit 68c8c83
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 232 deletions.
diff --git a/config/v1/feature_gates.go b/config/v1/feature_gates.go
@@ -113,6 +113,7 @@ func (b *featureGateBuilder) register() (FeatureGateName, error) {
 		OwningProduct:       b.owningProduct,
 	}
 
+	// statusByClusterProfileByFeatureSet is initialized by constructor to be false for every combination
 	for clusterProfile, byFeatureSet := range b.statusByClusterProfileByFeatureSet {
 		for featureSet, enabled := range byFeatureSet {
 			if _, ok := allFeatureGates[clusterProfile]; !ok {

diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go
diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -10692,25 +10692,40 @@
         }
       }
     },
-    "com.github.openshift.api.config.v1.featureSetBuilder": {
+    "com.github.openshift.api.config.v1.featureGateBuilder": {
       "type": "object",
       "required": [
-        "forceOn",
-        "forceOff"
+        "name",
+        "owningJiraComponent",
+        "responsiblePerson",
+        "owningProduct",
+        "statusByClusterProfileByFeatureSet"
       ],
       "properties": {
-        "forceOff": {
-          "type": "array",
-          "items": {
-            "default": {},
-            "$ref": "#/definitions/com.github.openshift.api.config.v1.FeatureGateDescription"
-          }
+        "name": {
+          "type": "string",
+          "default": ""
         },
-        "forceOn": {
-          "type": "array",
-          "items": {
-            "default": {},
-            "$ref": "#/definitions/com.github.openshift.api.config.v1.FeatureGateDescription"
+        "owningJiraComponent": {
+          "type": "string",
+          "default": ""
+        },
+        "owningProduct": {
+          "type": "string",
+          "default": ""
+        },
+        "responsiblePerson": {
+          "type": "string",
+          "default": ""
+        },
+        "statusByClusterProfileByFeatureSet": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "boolean",
+              "default": false
+            }
           }
         }
       }

diff --git a/payload-command/render/render.go b/payload-command/render/render.go
@@ -72,6 +72,9 @@ func (o *RenderOpts) Run() error {
 		if err != nil {
 			return fmt.Errorf("error converting FeatureGate: %w", err)
 		}
+		if featureGates.Annotations == nil {
+			featureGates.Annotations = map[string]string{}
+		}
 
 		// if the manifest has cluster profiles specified, the manifest's list must include the configured clusterprofile.
 		manifestClusterProfiles := clusterProfilesFrom(featureGates.Annotations)

diff --git a/payload-manifests/featuregates/featureGate-CustomNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-CustomNoUpgrade.yaml
diff --git a/payload-manifests/featuregates/featureGate-LatencySensitive.yaml b/payload-manifests/featuregates/featureGate-LatencySensitive.yaml