Skip to content

Commit 286504b

Browse files
Merge pull request #2532 from Frankkkkk/termination-type
`route`: improve `.spec.tls.termination` doc
2 parents 6a0c921 + aea1b9a commit 286504b

File tree

8 files changed

+18
-8
lines changed

8 files changed

+18
-8
lines changed

openapi/generated_openapi/zz_generated.openapi.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

openapi/openapi.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37403,7 +37403,7 @@
3740337403
"type": "string"
3740437404
},
3740537405
"termination": {
37406-
"description": "termination indicates termination type.\n\n* edge - TLS termination is done by the router and http is used to communicate with the backend (default) * passthrough - Traffic is sent straight to the destination without the router providing TLS termination * reencrypt - TLS termination is done by the router and https is used to communicate with the backend\n\nNote: passthrough termination is incompatible with httpHeader actions",
37406+
"description": "termination indicates the TLS termination type.\n\n* edge - TLS termination is done by the router and http is used to communicate with the backend (default)\n\n* passthrough - Traffic is sent straight to the destination without the router providing TLS termination\n\n* reencrypt - TLS termination is done by the router and https is used to communicate with the backend\n\nNote: passthrough termination is incompatible with httpHeader actions",
3740737407
"type": "string",
3740837408
"default": ""
3740937409
}

route/v1/generated.proto

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

route/v1/types.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,10 +424,12 @@ type RouterShard struct {
424424
// +kubebuilder:validation:XValidation:rule="has(self.termination) && has(self.insecureEdgeTerminationPolicy) ? !((self.termination=='passthrough') && (self.insecureEdgeTerminationPolicy=='Allow')) : true", message="cannot have both spec.tls.termination: passthrough and spec.tls.insecureEdgeTerminationPolicy: Allow"
425425
// +openshift:validation:FeatureGateAwareXValidation:featureGate=RouteExternalCertificate,rule="!(has(self.certificate) && has(self.externalCertificate))", message="cannot have both spec.tls.certificate and spec.tls.externalCertificate"
426426
type TLSConfig struct {
427-
// termination indicates termination type.
427+
// termination indicates the TLS termination type.
428428
//
429429
// * edge - TLS termination is done by the router and http is used to communicate with the backend (default)
430+
//
430431
// * passthrough - Traffic is sent straight to the destination without the router providing TLS termination
432+
//
431433
// * reencrypt - TLS termination is done by the router and https is used to communicate with the backend
432434
//
433435
// Note: passthrough termination is incompatible with httpHeader actions

route/v1/zz_generated.crd-manifests/routes.crd.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,10 +540,12 @@ spec:
540540
type: string
541541
termination:
542542
description: |-
543-
termination indicates termination type.
543+
termination indicates the TLS termination type.
544544
545545
* edge - TLS termination is done by the router and http is used to communicate with the backend (default)
546+
546547
* passthrough - Traffic is sent straight to the destination without the router providing TLS termination
548+
547549
* reencrypt - TLS termination is done by the router and https is used to communicate with the backend
548550
549551
Note: passthrough termination is incompatible with httpHeader actions

route/v1/zz_generated.featuregated-crd-manifests/routes.route.openshift.io/AAA_ungated.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,12 @@ spec:
466466
type: string
467467
termination:
468468
description: |-
469-
termination indicates termination type.
469+
termination indicates the TLS termination type.
470470
471471
* edge - TLS termination is done by the router and http is used to communicate with the backend (default)
472+
472473
* passthrough - Traffic is sent straight to the destination without the router providing TLS termination
474+
473475
* reencrypt - TLS termination is done by the router and https is used to communicate with the backend
474476
475477
Note: passthrough termination is incompatible with httpHeader actions

route/v1/zz_generated.featuregated-crd-manifests/routes.route.openshift.io/RouteExternalCertificate.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,10 +483,12 @@ spec:
483483
type: string
484484
termination:
485485
description: |-
486-
termination indicates termination type.
486+
termination indicates the TLS termination type.
487487
488488
* edge - TLS termination is done by the router and http is used to communicate with the backend (default)
489+
489490
* passthrough - Traffic is sent straight to the destination without the router providing TLS termination
491+
490492
* reencrypt - TLS termination is done by the router and https is used to communicate with the backend
491493
492494
Note: passthrough termination is incompatible with httpHeader actions

route/v1/zz_generated.swagger_doc_generated.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)