API: add renderedMinimumComponentVersion to featuregate.Status

haircommander · haircommander · commit 1815f572487b · 2025-03-20T13:39:24.000-04:00
Signed-off-by: Peter Hunt &lt;pehunt@redhat.com&gt;
diff --git a/config/v1/types_feature.go b/config/v1/types_feature.go
@@ -125,6 +125,15 @@ type FeatureGateDetails struct {
 	// disabled is a list of all feature gates that are disabled in the cluster for the named version.
 	// +optional
 	Disabled []FeatureGateAttributes `json:"disabled"`
+	// renderedMinimumComponentVersions are the component versions that the feature gate list of this status were rendered from.
+	// Currently, the only supported component is Kubelet, and setting a required minimum kubelet component will set the
+	// minimumKubeletVersion field in the nodes.config.openshift.io CRD.
+	// +kubebuilder:validation:MaxItems:=1
+	// +listType=map
+	// +listMapKey=component
+	// +openshift:enable:FeatureGate=MinimumKubeletVersion
+	// +optional
+	RenderedMinimumComponentVersions []MinimumComponentVersion `json:"renderedMinimumComponentVersions,omitempty"`
 }
 
 type FeatureGateAttributes struct {
diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_featuregates-CustomNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_featuregates-CustomNoUpgrade.crd.yaml
@@ -272,6 +272,41 @@ spec:
                         - name
                         type: object
                       type: array
+                    renderedMinimumComponentVersions:
+                      description: |-
+                        renderedMinimumComponentVersions are the component versions that the feature gate list of this status were rendered from.
+                        Currently, the only supported component is Kubelet, and setting a required minimum kubelet component will set the
+                        minimumKubeletVersion field in the nodes.config.openshift.io CRD.
+                      items:
+                        description: |-
+                          MinimumComponentVersion is a pair of Component and Version that specifies the required minimum Version of the given Component
+                          to enable this feature.
+                        properties:
+                          component:
+                            description: component is the entity whose version must
+                              be above a certain version.
+                            enum:
+                            - Kubelet
+                            type: string
+                          version:
+                            description: |-
+                              version is the minimum version the given component may be in this cluster.
+                              version must be in semver format (x.y.z) and must consist only of numbers and periods (.).
+                            maxLength: 8
+                            type: string
+                            x-kubernetes-validations:
+                            - message: minmumKubeletVersion must be in a semver compatible
+                                format of x.y.z, or empty
+                              rule: self.matches('^[0-9]*.[0-9]*.[0-9]*$')
+                        required:
+                        - component
+                        - version
+                        type: object
+                      maxItems: 1
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - component
+                      x-kubernetes-list-type: map
                     version:
                       description: version matches the version provided by the ClusterVersion
                         and in the ClusterOperator.Status.Versions field.
diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_featuregates-DevPreviewNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_featuregates-DevPreviewNoUpgrade.crd.yaml
@@ -272,6 +272,41 @@ spec:
                         - name
                         type: object
                       type: array
+                    renderedMinimumComponentVersions:
+                      description: |-
+                        renderedMinimumComponentVersions are the component versions that the feature gate list of this status were rendered from.
+                        Currently, the only supported component is Kubelet, and setting a required minimum kubelet component will set the
+                        minimumKubeletVersion field in the nodes.config.openshift.io CRD.
+                      items:
+                        description: |-
+                          MinimumComponentVersion is a pair of Component and Version that specifies the required minimum Version of the given Component
+                          to enable this feature.
+                        properties:
+                          component:
+                            description: component is the entity whose version must
+                              be above a certain version.
+                            enum:
+                            - Kubelet
+                            type: string
+                          version:
+                            description: |-
+                              version is the minimum version the given component may be in this cluster.
+                              version must be in semver format (x.y.z) and must consist only of numbers and periods (.).
+                            maxLength: 8
+                            type: string
+                            x-kubernetes-validations:
+                            - message: minmumKubeletVersion must be in a semver compatible
+                                format of x.y.z, or empty
+                              rule: self.matches('^[0-9]*.[0-9]*.[0-9]*$')
+                        required:
+                        - component
+                        - version
+                        type: object
+                      maxItems: 1
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - component
+                      x-kubernetes-list-type: map
                     version:
                       description: version matches the version provided by the ClusterVersion
                         and in the ClusterOperator.Status.Versions field.
diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_featuregates-TechPreviewNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_featuregates-TechPreviewNoUpgrade.crd.yaml
@@ -272,6 +272,41 @@ spec:
                         - name
                         type: object
                       type: array
+                    renderedMinimumComponentVersions:
+                      description: |-
+                        renderedMinimumComponentVersions are the component versions that the feature gate list of this status were rendered from.
+                        Currently, the only supported component is Kubelet, and setting a required minimum kubelet component will set the
+                        minimumKubeletVersion field in the nodes.config.openshift.io CRD.
+                      items:
+                        description: |-
+                          MinimumComponentVersion is a pair of Component and Version that specifies the required minimum Version of the given Component
+                          to enable this feature.
+                        properties:
+                          component:
+                            description: component is the entity whose version must
+                              be above a certain version.
+                            enum:
+                            - Kubelet
+                            type: string
+                          version:
+                            description: |-
+                              version is the minimum version the given component may be in this cluster.
+                              version must be in semver format (x.y.z) and must consist only of numbers and periods (.).
+                            maxLength: 8
+                            type: string
+                            x-kubernetes-validations:
+                            - message: minmumKubeletVersion must be in a semver compatible
+                                format of x.y.z, or empty
+                              rule: self.matches('^[0-9]*.[0-9]*.[0-9]*$')
+                        required:
+                        - component
+                        - version
+                        type: object
+                      maxItems: 1
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - component
+                      x-kubernetes-list-type: map
                     version:
                       description: version matches the version provided by the ClusterVersion
                         and in the ClusterOperator.Status.Versions field.
diff --git a/config/v1/zz_generated.deepcopy.go b/config/v1/zz_generated.deepcopy.go
diff --git a/config/v1/zz_generated.featuregated-crd-manifests/featuregates.config.openshift.io/MinimumKubeletVersion.yaml b/config/v1/zz_generated.featuregated-crd-manifests/featuregates.config.openshift.io/MinimumKubeletVersion.yaml
@@ -272,6 +272,41 @@ spec:
                         - name
                         type: object
                       type: array
+                    renderedMinimumComponentVersions:
+                      description: |-
+                        renderedMinimumComponentVersions are the component versions that the feature gate list of this status were rendered from.
+                        Currently, the only supported component is Kubelet, and setting a required minimum kubelet component will set the
+                        minimumKubeletVersion field in the nodes.config.openshift.io CRD.
+                      items:
+                        description: |-
+                          MinimumComponentVersion is a pair of Component and Version that specifies the required minimum Version of the given Component
+                          to enable this feature.
+                        properties:
+                          component:
+                            description: component is the entity whose version must
+                              be above a certain version.
+                            enum:
+                            - Kubelet
+                            type: string
+                          version:
+                            description: |-
+                              version is the minimum version the given component may be in this cluster.
+                              version must be in semver format (x.y.z) and must consist only of numbers and periods (.).
+                            maxLength: 8
+                            type: string
+                            x-kubernetes-validations:
+                            - message: minmumKubeletVersion must be in a semver compatible
+                                format of x.y.z, or empty
+                              rule: self.matches('^[0-9]*.[0-9]*.[0-9]*$')
+                        required:
+                        - component
+                        - version
+                        type: object
+                      maxItems: 1
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - component
+                      x-kubernetes-list-type: map
                     version:
                       description: version matches the version provided by the ClusterVersion
                         and in the ClusterOperator.Status.Versions field.
diff --git a/config/v1/zz_generated.swagger_doc_generated.go b/config/v1/zz_generated.swagger_doc_generated.go
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
@@ -6272,6 +6272,18 @@
             "$ref": "#/definitions/com.github.openshift.api.config.v1.FeatureGateAttributes"
           }
         },
+        "renderedMinimumComponentVersions": {
+          "description": "renderedMinimumComponentVersions are the component versions that the feature gate list of this status were rendered from. Currently, the only supported component is Kubelet, and setting a required minimum kubelet component will set the minimumKubeletVersion field in the nodes.config.openshift.io CRD.",
+          "type": "array",
+          "items": {
+            "default": {},
+            "$ref": "#/definitions/com.github.openshift.api.config.v1.MinimumComponentVersion"
+          },
+          "x-kubernetes-list-map-keys": [
+            "component"
+          ],
+          "x-kubernetes-list-type": "map"
+        },
         "version": {
           "description": "version matches the version provided by the ClusterVersion and in the ClusterOperator.Status.Versions field.",
           "type": "string",
diff --git a/payload-manifests/crds/0000_10_config-operator_01_featuregates-CustomNoUpgrade.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_featuregates-CustomNoUpgrade.crd.yaml
@@ -272,6 +272,41 @@ spec:
                         - name
                         type: object
                       type: array
+                    renderedMinimumComponentVersions:
+                      description: |-
+                        renderedMinimumComponentVersions are the component versions that the feature gate list of this status were rendered from.
+                        Currently, the only supported component is Kubelet, and setting a required minimum kubelet component will set the
+                        minimumKubeletVersion field in the nodes.config.openshift.io CRD.
+                      items:
+                        description: |-
+                          MinimumComponentVersion is a pair of Component and Version that specifies the required minimum Version of the given Component
+                          to enable this feature.
+                        properties:
+                          component:
+                            description: component is the entity whose version must
+                              be above a certain version.
+                            enum:
+                            - Kubelet
+                            type: string
+                          version:
+                            description: |-
+                              version is the minimum version the given component may be in this cluster.
+                              version must be in semver format (x.y.z) and must consist only of numbers and periods (.).
+                            maxLength: 8
+                            type: string
+                            x-kubernetes-validations:
+                            - message: minmumKubeletVersion must be in a semver compatible
+                                format of x.y.z, or empty
+                              rule: self.matches('^[0-9]*.[0-9]*.[0-9]*$')
+                        required:
+                        - component
+                        - version
+                        type: object
+                      maxItems: 1
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - component
+                      x-kubernetes-list-type: map
                     version:
                       description: version matches the version provided by the ClusterVersion
                         and in the ClusterOperator.Status.Versions field.
diff --git a/payload-manifests/crds/0000_10_config-operator_01_featuregates-DevPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_featuregates-DevPreviewNoUpgrade.crd.yaml
@@ -272,6 +272,41 @@ spec:
                         - name
                         type: object
                       type: array
+                    renderedMinimumComponentVersions:
+                      description: |-
+                        renderedMinimumComponentVersions are the component versions that the feature gate list of this status were rendered from.
+                        Currently, the only supported component is Kubelet, and setting a required minimum kubelet component will set the
+                        minimumKubeletVersion field in the nodes.config.openshift.io CRD.
+                      items:
+                        description: |-
+                          MinimumComponentVersion is a pair of Component and Version that specifies the required minimum Version of the given Component
+                          to enable this feature.
+                        properties:
+                          component:
+                            description: component is the entity whose version must
+                              be above a certain version.
+                            enum:
+                            - Kubelet
+                            type: string
+                          version:
+                            description: |-
+                              version is the minimum version the given component may be in this cluster.
+                              version must be in semver format (x.y.z) and must consist only of numbers and periods (.).
+                            maxLength: 8
+                            type: string
+                            x-kubernetes-validations:
+                            - message: minmumKubeletVersion must be in a semver compatible
+                                format of x.y.z, or empty
+                              rule: self.matches('^[0-9]*.[0-9]*.[0-9]*$')
+                        required:
+                        - component
+                        - version
+                        type: object
+                      maxItems: 1
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - component
+                      x-kubernetes-list-type: map
                     version:
                       description: version matches the version provided by the ClusterVersion
                         and in the ClusterOperator.Status.Versions field.
diff --git a/payload-manifests/crds/0000_10_config-operator_01_featuregates-TechPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_featuregates-TechPreviewNoUpgrade.crd.yaml
