diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go index fc69a241aca..d36c478ccb2 100644 --- a/openapi/generated_openapi/zz_generated.openapi.go +++ b/openapi/generated_openapi/zz_generated.openapi.go @@ -59020,7 +59020,7 @@ func schema_openshift_api_route_v1_TLSConfig(ref common.ReferenceCallback) commo }, "insecureEdgeTerminationPolicy": { SchemaProps: spec.SchemaProps{ - Description: "insecureEdgeTerminationPolicy indicates the desired behavior for insecure connections to a route. While each router may make its own decisions on which ports to expose, this is normally port 80.\n\n* Allow - traffic is sent to the server on the insecure port (edge/reencrypt terminations only) (default). * None - no traffic is allowed on the insecure port. * Redirect - clients are redirected to the secure port.", + Description: "insecureEdgeTerminationPolicy indicates the desired behavior for insecure connections to a route. While each router may make its own decisions on which ports to expose, this is normally port 80.\n\nIf a route does not specify insecureEdgeTerminationPolicy, then the default behavior is \"None\".\n\n* Allow - traffic is sent to the server on the insecure port (edge/reencrypt terminations only).\n\n* None - no traffic is allowed on the insecure port (default).\n\n* Redirect - clients are redirected to the secure port.", Type: []string{"string"}, Format: "", }, diff --git a/openapi/openapi.json b/openapi/openapi.json index ac5453dff65..a39c36738bd 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -34626,7 +34626,7 @@ "$ref": "#/definitions/com.github.openshift.api.route.v1.LocalObjectReference" }, "insecureEdgeTerminationPolicy": { - "description": "insecureEdgeTerminationPolicy indicates the desired behavior for insecure connections to a route. While each router may make its own decisions on which ports to expose, this is normally port 80.\n\n* Allow - traffic is sent to the server on the insecure port (edge/reencrypt terminations only) (default). * None - no traffic is allowed on the insecure port. * Redirect - clients are redirected to the secure port.", + "description": "insecureEdgeTerminationPolicy indicates the desired behavior for insecure connections to a route. While each router may make its own decisions on which ports to expose, this is normally port 80.\n\nIf a route does not specify insecureEdgeTerminationPolicy, then the default behavior is \"None\".\n\n* Allow - traffic is sent to the server on the insecure port (edge/reencrypt terminations only).\n\n* None - no traffic is allowed on the insecure port (default).\n\n* Redirect - clients are redirected to the secure port.", "type": "string" }, "key": { diff --git a/route/v1/generated.proto b/route/v1/generated.proto index 1797fe7702f..621bec09b00 100644 --- a/route/v1/generated.proto +++ b/route/v1/generated.proto @@ -436,8 +436,12 @@ message TLSConfig { // insecureEdgeTerminationPolicy indicates the desired behavior for insecure connections to a route. While // each router may make its own decisions on which ports to expose, this is normally port 80. // - // * Allow - traffic is sent to the server on the insecure port (edge/reencrypt terminations only) (default). - // * None - no traffic is allowed on the insecure port. + // If a route does not specify insecureEdgeTerminationPolicy, then the default behavior is "None". + // + // * Allow - traffic is sent to the server on the insecure port (edge/reencrypt terminations only). + // + // * None - no traffic is allowed on the insecure port (default). + // // * Redirect - clients are redirected to the secure port. // // +kubebuilder:validation:Enum=Allow;None;Redirect;"" diff --git a/route/v1/types.go b/route/v1/types.go index cd5e5eced40..fadc4b618ba 100644 --- a/route/v1/types.go +++ b/route/v1/types.go @@ -447,8 +447,12 @@ type TLSConfig struct { // insecureEdgeTerminationPolicy indicates the desired behavior for insecure connections to a route. While // each router may make its own decisions on which ports to expose, this is normally port 80. // - // * Allow - traffic is sent to the server on the insecure port (edge/reencrypt terminations only) (default). - // * None - no traffic is allowed on the insecure port. + // If a route does not specify insecureEdgeTerminationPolicy, then the default behavior is "None". + // + // * Allow - traffic is sent to the server on the insecure port (edge/reencrypt terminations only). + // + // * None - no traffic is allowed on the insecure port (default). + // // * Redirect - clients are redirected to the secure port. // // +kubebuilder:validation:Enum=Allow;None;Redirect;"" diff --git a/route/v1/zz_generated.crd-manifests/routes-CustomNoUpgrade.crd.yaml b/route/v1/zz_generated.crd-manifests/routes-CustomNoUpgrade.crd.yaml index 7833378705a..0fbecf6b3c3 100644 --- a/route/v1/zz_generated.crd-manifests/routes-CustomNoUpgrade.crd.yaml +++ b/route/v1/zz_generated.crd-manifests/routes-CustomNoUpgrade.crd.yaml @@ -519,10 +519,12 @@ spec: description: "insecureEdgeTerminationPolicy indicates the desired behavior for insecure connections to a route. While each router may make its own decisions on which ports to expose, this is - normally port 80. \n * Allow - traffic is sent to the server - on the insecure port (edge/reencrypt terminations only) (default). - * None - no traffic is allowed on the insecure port. * Redirect - - clients are redirected to the secure port." + normally port 80. \n If a route does not specify insecureEdgeTerminationPolicy, + then the default behavior is \"None\". \n * Allow - traffic + is sent to the server on the insecure port (edge/reencrypt terminations + only). \n * None - no traffic is allowed on the insecure port + (default). \n * Redirect - clients are redirected to the secure + port." enum: - Allow - None diff --git a/route/v1/zz_generated.crd-manifests/routes-Default.crd.yaml b/route/v1/zz_generated.crd-manifests/routes-Default.crd.yaml index b79bcf83e66..598df2e65b9 100644 --- a/route/v1/zz_generated.crd-manifests/routes-Default.crd.yaml +++ b/route/v1/zz_generated.crd-manifests/routes-Default.crd.yaml @@ -507,10 +507,12 @@ spec: description: "insecureEdgeTerminationPolicy indicates the desired behavior for insecure connections to a route. While each router may make its own decisions on which ports to expose, this is - normally port 80. \n * Allow - traffic is sent to the server - on the insecure port (edge/reencrypt terminations only) (default). - * None - no traffic is allowed on the insecure port. * Redirect - - clients are redirected to the secure port." + normally port 80. \n If a route does not specify insecureEdgeTerminationPolicy, + then the default behavior is \"None\". \n * Allow - traffic + is sent to the server on the insecure port (edge/reencrypt terminations + only). \n * None - no traffic is allowed on the insecure port + (default). \n * Redirect - clients are redirected to the secure + port." enum: - Allow - None diff --git a/route/v1/zz_generated.crd-manifests/routes-DevPreviewNoUpgrade.crd.yaml b/route/v1/zz_generated.crd-manifests/routes-DevPreviewNoUpgrade.crd.yaml index 0c38ccdb38c..d0e60625083 100644 --- a/route/v1/zz_generated.crd-manifests/routes-DevPreviewNoUpgrade.crd.yaml +++ b/route/v1/zz_generated.crd-manifests/routes-DevPreviewNoUpgrade.crd.yaml @@ -519,10 +519,12 @@ spec: description: "insecureEdgeTerminationPolicy indicates the desired behavior for insecure connections to a route. While each router may make its own decisions on which ports to expose, this is - normally port 80. \n * Allow - traffic is sent to the server - on the insecure port (edge/reencrypt terminations only) (default). - * None - no traffic is allowed on the insecure port. * Redirect - - clients are redirected to the secure port." + normally port 80. \n If a route does not specify insecureEdgeTerminationPolicy, + then the default behavior is \"None\". \n * Allow - traffic + is sent to the server on the insecure port (edge/reencrypt terminations + only). \n * None - no traffic is allowed on the insecure port + (default). \n * Redirect - clients are redirected to the secure + port." enum: - Allow - None diff --git a/route/v1/zz_generated.crd-manifests/routes-TechPreviewNoUpgrade.crd.yaml b/route/v1/zz_generated.crd-manifests/routes-TechPreviewNoUpgrade.crd.yaml index 248768e9a9d..efa957252f0 100644 --- a/route/v1/zz_generated.crd-manifests/routes-TechPreviewNoUpgrade.crd.yaml +++ b/route/v1/zz_generated.crd-manifests/routes-TechPreviewNoUpgrade.crd.yaml @@ -519,10 +519,12 @@ spec: description: "insecureEdgeTerminationPolicy indicates the desired behavior for insecure connections to a route. While each router may make its own decisions on which ports to expose, this is - normally port 80. \n * Allow - traffic is sent to the server - on the insecure port (edge/reencrypt terminations only) (default). - * None - no traffic is allowed on the insecure port. * Redirect - - clients are redirected to the secure port." + normally port 80. \n If a route does not specify insecureEdgeTerminationPolicy, + then the default behavior is \"None\". \n * Allow - traffic + is sent to the server on the insecure port (edge/reencrypt terminations + only). \n * None - no traffic is allowed on the insecure port + (default). \n * Redirect - clients are redirected to the secure + port." enum: - Allow - None diff --git a/route/v1/zz_generated.featuregated-crd-manifests/routes.route.openshift.io/AAA_ungated.yaml b/route/v1/zz_generated.featuregated-crd-manifests/routes.route.openshift.io/AAA_ungated.yaml index e0163cb225c..088c29dbbfe 100644 --- a/route/v1/zz_generated.featuregated-crd-manifests/routes.route.openshift.io/AAA_ungated.yaml +++ b/route/v1/zz_generated.featuregated-crd-manifests/routes.route.openshift.io/AAA_ungated.yaml @@ -448,10 +448,12 @@ spec: description: "insecureEdgeTerminationPolicy indicates the desired behavior for insecure connections to a route. While each router may make its own decisions on which ports to expose, this is - normally port 80. \n * Allow - traffic is sent to the server - on the insecure port (edge/reencrypt terminations only) (default). - * None - no traffic is allowed on the insecure port. * Redirect - - clients are redirected to the secure port." + normally port 80. \n If a route does not specify insecureEdgeTerminationPolicy, + then the default behavior is \"None\". \n * Allow - traffic + is sent to the server on the insecure port (edge/reencrypt terminations + only). \n * None - no traffic is allowed on the insecure port + (default). \n * Redirect - clients are redirected to the secure + port." enum: - Allow - None diff --git a/route/v1/zz_generated.featuregated-crd-manifests/routes.route.openshift.io/ExternalRouteCertificate.yaml b/route/v1/zz_generated.featuregated-crd-manifests/routes.route.openshift.io/ExternalRouteCertificate.yaml index 3072081baf8..a45b898e63b 100644 --- a/route/v1/zz_generated.featuregated-crd-manifests/routes.route.openshift.io/ExternalRouteCertificate.yaml +++ b/route/v1/zz_generated.featuregated-crd-manifests/routes.route.openshift.io/ExternalRouteCertificate.yaml @@ -460,10 +460,12 @@ spec: description: "insecureEdgeTerminationPolicy indicates the desired behavior for insecure connections to a route. While each router may make its own decisions on which ports to expose, this is - normally port 80. \n * Allow - traffic is sent to the server - on the insecure port (edge/reencrypt terminations only) (default). - * None - no traffic is allowed on the insecure port. * Redirect - - clients are redirected to the secure port." + normally port 80. \n If a route does not specify insecureEdgeTerminationPolicy, + then the default behavior is \"None\". \n * Allow - traffic + is sent to the server on the insecure port (edge/reencrypt terminations + only). \n * None - no traffic is allowed on the insecure port + (default). \n * Redirect - clients are redirected to the secure + port." enum: - Allow - None diff --git a/route/v1/zz_generated.swagger_doc_generated.go b/route/v1/zz_generated.swagger_doc_generated.go index c65815a1cc6..56a4e23e3d5 100644 --- a/route/v1/zz_generated.swagger_doc_generated.go +++ b/route/v1/zz_generated.swagger_doc_generated.go @@ -178,7 +178,7 @@ var map_TLSConfig = map[string]string{ "key": "key provides key file contents", "caCertificate": "caCertificate provides the cert authority certificate contents", "destinationCACertificate": "destinationCACertificate provides the contents of the ca certificate of the final destination. When using reencrypt termination this file should be provided in order to have routers use it for health checks on the secure connection. If this field is not specified, the router may provide its own destination CA and perform hostname validation using the short service name (service.namespace.svc), which allows infrastructure generated certificates to automatically verify.", - "insecureEdgeTerminationPolicy": "insecureEdgeTerminationPolicy indicates the desired behavior for insecure connections to a route. While each router may make its own decisions on which ports to expose, this is normally port 80.\n\n* Allow - traffic is sent to the server on the insecure port (edge/reencrypt terminations only) (default). * None - no traffic is allowed on the insecure port. * Redirect - clients are redirected to the secure port.", + "insecureEdgeTerminationPolicy": "insecureEdgeTerminationPolicy indicates the desired behavior for insecure connections to a route. While each router may make its own decisions on which ports to expose, this is normally port 80.\n\nIf a route does not specify insecureEdgeTerminationPolicy, then the default behavior is \"None\".\n\n* Allow - traffic is sent to the server on the insecure port (edge/reencrypt terminations only).\n\n* None - no traffic is allowed on the insecure port (default).\n\n* Redirect - clients are redirected to the secure port.", "externalCertificate": "externalCertificate provides certificate contents as a secret reference. This should be a single serving certificate, not a certificate chain. Do not include a CA certificate. The secret referenced should be present in the same namespace as that of the Route. Forbidden when `certificate` is set.", }