Merge pull request #20142 from bprashanth/ing_tls

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-05 15:07:09 -08:00
17 changed files with 8683 additions and 7494 deletions

View File

@@ -3616,6 +3616,13 @@
"$ref": "v1beta1.IngressBackend",
"description": "A default backend capable of servicing requests that don't match any rule. At least one of 'backend' or 'rules' must be specified. This field is optional to allow the loadbalancer controller or defaulting logic to specify a global default."
},
"tls": {
"type": "array",
"items": {
"$ref": "v1beta1.IngressTLS"
},
"description": "TLS configuration. Currently the Ingress only supports a single TLS port, 443, and assumes TLS termination. If multiple members of this list specify different hosts, they will be multiplexed on the same port according to the hostname specified through the SNI TLS extension."
},
"rules": {
"type": "array",
"items": {
@@ -3643,6 +3650,23 @@
}
}
},
"v1beta1.IngressTLS": {
"id": "v1beta1.IngressTLS",
"description": "IngressTLS describes the transport layer security associated with an Ingress.",
"properties": {
"hosts": {
"type": "array",
"items": {
"type": "string"
},
"description": "Hosts are a list of hosts included in the TLS certificate. The values in this list must match the name/s used in the tlsSecret. Defaults to the wildcard host setting for the loadbalancer controller fulfilling this Ingress, if left unspecified."
},
"secretName": {
"type": "string",
"description": "SecretName is the name of the secret used to terminate SSL traffic on 443. Field is left optional to allow SSL routing based on SNI hostname alone. If the SNI host in a listener conflicts with the \"Host\" header field used by an IngressRule, the SNI host is used for termination and value of the Host header is used for routing."
}
}
},
"v1beta1.IngressRule": {
"id": "v1beta1.IngressRule",
"description": "IngressRule represents the rules mapping the paths under a specified host to the related backend services. Incoming requests are first evaluated for a host match, then routed to the backend associated with the matching IngressRuleValue.",