From 50677c8486361021cc168f75ef8ddcfa05d75e37 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Mon, 5 Feb 2024 16:41:11 -0800 Subject: [PATCH] config/v1/types_cluster_version: Drop never-implemented 'Evaluating' conditionalUpdates condition type Catching up with openshift/enhancements@c446cd7846 (enhancements/update/targeted-update-edge-blocking: Drop Evaluating, 2023-06-07, openshift/enhancements#1420), which points out that this type was never implemented, because Recommended=Unknown is sufficient to say "we're trying (and failing) to figure out if some of the target's risks apply to the cluster". --- ...sion-operator_01_clusterversion-CustomNoUpgrade.crd.yaml | 6 ++---- ...ster-version-operator_01_clusterversion-Default.crd.yaml | 6 ++---- ...operator_01_clusterversion-TechPreviewNoUpgrade.crd.yaml | 6 ++---- config/v1/types_cluster_version.go | 1 - config/v1/zz_generated.swagger_doc_generated.go | 2 +- openapi/generated_openapi/zz_generated.openapi.go | 2 +- openapi/openapi.json | 2 +- 7 files changed, 9 insertions(+), 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 index d86f1dc011f..24f14a991f7 100644 --- 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 @@ -391,10 +391,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 index 45da62856cd..edf518f2a76 100644 --- 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 @@ -338,10 +338,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 index e301850c799..0650f28c7af 100644 --- 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 @@ -391,10 +391,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 index 0ceedbab45d..7d043f21fc7 100644 --- a/config/v1/types_cluster_version.go +++ b/config/v1/types_cluster_version.go @@ -691,7 +691,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 index 270fa0acf9b..dcaa09b0054 100644 --- a/config/v1/zz_generated.swagger_doc_generated.go +++ b/config/v1/zz_generated.swagger_doc_generated.go @@ -743,7 +743,7 @@ var map_ConditionalUpdate = map[string]string{ "": "ConditionalUpdate represents an update which is recommended to some clusters on the version the current cluster is reconciling, but which may not be recommended for the current cluster.", "release": "release is the target of the update.", "risks": "risks represents the range of issues associated with updating to the target release. The cluster-version operator will evaluate all entries, and only recommend the update if there is at least one entry and all entries recommend the update.", - "conditions": "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.", + "conditions": "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.", } func (ConditionalUpdate) SwaggerDoc() map[string]string { diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go index fd854563a06..205acc5985a 100644 --- a/openapi/generated_openapi/zz_generated.openapi.go +++ b/openapi/generated_openapi/zz_generated.openapi.go @@ -10959,7 +10959,7 @@ func schema_openshift_api_config_v1_ConditionalUpdate(ref common.ReferenceCallba }, }, SchemaProps: spec.SchemaProps{ - 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: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ diff --git a/openapi/openapi.json b/openapi/openapi.json index 3e29fa5f4ec..fb2b82600f9 100644 --- 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": {},