OCPBUGS-26498: Add UnservableInFutureVersions route status condition …

…type Add UnservableInFutureVersions as a route status condition type. This change allows the router to indicate that a route is using an unsupported configuration and will be unservable in the future. The ingress operator may use this condition to block upgrades.
openshift · Feb 2, 2024 · 34ed4ee · 34ed4ee
1 parent 12a8eb6
commit 34ed4ee
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
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
@@ -32842,7 +32842,7 @@
           "default": ""
         },
         "type": {
-          "description": "Type is the type of the condition. Currently only Admitted.",
+          "description": "Type is the type of the condition. Currently only Admitted or UnservableInFutureVersions.",
           "type": "string",
           "default": ""
         }

diff --git a/route/v1/generated.proto b/route/v1/generated.proto
diff --git a/route/v1/route-CustomNoUpgrade.crd.yaml b/route/v1/route-CustomNoUpgrade.crd.yaml
@@ -344,7 +344,7 @@ spec:
                               description: Status is the status of the condition. Can be True, False, Unknown.
                               type: string
                             type:
-                              description: Type is the type of the condition. Currently only Admitted.
+                              description: Type is the type of the condition. Currently only Admitted or UnservableInFutureVersions.
                               type: string
                       host:
                         description: Host is the host string under which the route is exposed; this value is required

diff --git a/route/v1/route-TechPreviewNoUpgrade.crd.yaml b/route/v1/route-TechPreviewNoUpgrade.crd.yaml
@@ -344,7 +344,7 @@ spec:
                               description: Status is the status of the condition. Can be True, False, Unknown.
                               type: string
                             type:
-                              description: Type is the type of the condition. Currently only Admitted.
+                              description: Type is the type of the condition. Currently only Admitted or UnservableInFutureVersions.
                               type: string
                       host:
                         description: Host is the host string under which the route is exposed; this value is required

diff --git a/route/v1/route.crd.yaml b/route/v1/route.crd.yaml
@@ -376,7 +376,7 @@ spec:
                               description: Status is the status of the condition. Can be True, False, Unknown.
                               type: string
                             type:
-                              description: Type is the type of the condition. Currently only Admitted.
+                              description: Type is the type of the condition. Currently only Admitted or UnservableInFutureVersions.
                               type: string
                           required:
                             - status

diff --git a/route/v1/types.go b/route/v1/types.go
@@ -369,14 +369,16 @@ type RouteIngressConditionType string
 const (
 	// RouteAdmitted means the route is able to service requests for the provided Host
 	RouteAdmitted RouteIngressConditionType = "Admitted"
-	// TODO: add other route condition types
+	// RouteUnservableInFutureVersions indicates that the route is using an unsupported
+	// configuration that may be incompatible with a future version of OpenShift.
+	RouteUnservableInFutureVersions RouteIngressConditionType = "UnservableInFutureVersions"
 )
 
 // RouteIngressCondition contains details for the current condition of this route on a particular
 // router.
 type RouteIngressCondition struct {
 	// Type is the type of the condition.
-	// Currently only Admitted.
+	// Currently only Admitted or UnservableInFutureVersions.
 	Type RouteIngressConditionType `json:"type" protobuf:"bytes,1,opt,name=type,casttype=RouteIngressConditionType"`
 	// Status is the status of the condition.
 	// Can be True, False, Unknown.

diff --git a/route/v1/zz_generated.swagger_doc_generated.go b/route/v1/zz_generated.swagger_doc_generated.go