Merge pull request #1753 from wking/drop-conditionalUpdates-Evaluating

config/v1/types_cluster_version: Drop never-implemented 'Evaluating' conditionalUpdates condition type
openshift · Feb 13, 2024 · 54b3334 · 54b3334
2 parents 06532f4 + 50677c8
commit 54b3334
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 16 deletions.
diff --git a/config/v1/0000_00_cluster-version-operator_01_clusterversion-CustomNoUpgrade.crd.yaml b/config/v1/0000_00_cluster-version-operator_01_clusterversion-CustomNoUpgrade.crd.yaml
@@ -395,10 +395,8 @@ spec:
                   properties:
                     conditions:
                       description: 'conditions represents the observations of the
-                        conditional update''s current status. Known types are: * Evaluating,
-                        for whether the cluster-version operator will attempt to evaluate
-                        any risks[].matchingRules. * Recommended, for whether the
-                        update is recommended for the current cluster.'
+                        conditional update''s current status. Known types are: * Recommended,
+                        for whether the update is recommended for the current cluster.'
                       items:
                         description: "Condition contains details for one aspect of
                           the current state of this API Resource. --- This struct

diff --git a/config/v1/0000_00_cluster-version-operator_01_clusterversion-Default.crd.yaml b/config/v1/0000_00_cluster-version-operator_01_clusterversion-Default.crd.yaml
@@ -342,10 +342,8 @@ spec:
                   properties:
                     conditions:
                       description: 'conditions represents the observations of the
-                        conditional update''s current status. Known types are: * Evaluating,
-                        for whether the cluster-version operator will attempt to evaluate
-                        any risks[].matchingRules. * Recommended, for whether the
-                        update is recommended for the current cluster.'
+                        conditional update''s current status. Known types are: * Recommended,
+                        for whether the update is recommended for the current cluster.'
                       items:
                         description: "Condition contains details for one aspect of
                           the current state of this API Resource. --- This struct

diff --git a/config/v1/0000_00_cluster-version-operator_01_clusterversion-TechPreviewNoUpgrade.crd.yaml b/config/v1/0000_00_cluster-version-operator_01_clusterversion-TechPreviewNoUpgrade.crd.yaml
@@ -395,10 +395,8 @@ spec:
                   properties:
                     conditions:
                       description: 'conditions represents the observations of the
-                        conditional update''s current status. Known types are: * Evaluating,
-                        for whether the cluster-version operator will attempt to evaluate
-                        any risks[].matchingRules. * Recommended, for whether the
-                        update is recommended for the current cluster.'
+                        conditional update''s current status. Known types are: * Recommended,
+                        for whether the update is recommended for the current cluster.'
                       items:
                         description: "Condition contains details for one aspect of
                           the current state of this API Resource. --- This struct

diff --git a/config/v1/types_cluster_version.go b/config/v1/types_cluster_version.go
@@ -730,7 +730,6 @@ type ConditionalUpdate struct {
 
 	// conditions represents the observations of the conditional update's
 	// current status. Known types are:
-	// * Evaluating, for whether the cluster-version operator will attempt to evaluate any risks[].matchingRules.
 	// * Recommended, for whether the update is recommended for the current cluster.
 	// +patchMergeKey=type
 	// +patchStrategy=merge

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
@@ -5593,7 +5593,7 @@
       ],
       "properties": {
         "conditions": {
-          "description": "conditions represents the observations of the conditional update's current status. Known types are: * Evaluating, for whether the cluster-version operator will attempt to evaluate any risks[].matchingRules. * Recommended, for whether the update is recommended for the current cluster.",
+          "description": "conditions represents the observations of the conditional update's current status. Known types are: * Recommended, for whether the update is recommended for the current cluster.",
           "type": "array",
           "items": {
             "default": {},