Skip to content

Commit

Permalink
Remove alias field
Browse files Browse the repository at this point in the history
Signed-off-by: Steve Sloka <steves@heptio.com>
  • Loading branch information
stevesloka authored and josebiro committed Oct 12, 2018
1 parent 291e6cc commit eca1d06
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 36 deletions.
6 changes: 3 additions & 3 deletions apis/contour/v1beta1/ingressroute.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ type IngressRouteSpec struct {
// to be a "root".
type VirtualHost struct {
// The fully qualified domain name of the root of the ingress tree
// all leaves of the DAG rooted at this object relate to the fqdn (and its aliases)
// all leaves of the DAG rooted at this object relate to the fqdn
Fqdn string `json:"fqdn"`
// If present describes tls properties. The CNI names that will be matched on
// are described in fqdn and aliases, the tls.secretName secret must contain a
// are described in fqdn, the tls.secretName secret must contain a
// matching certificate
TLS *TLS `json:"tls,omitempty"`
}

// TLS describes tls properties. The CNI names that will be matched on
// are described in fqdn and aliases, the tls.secretName secret must contain a
// are described in fqdn, the tls.secretName secret must contain a
// matching certificate
type TLS struct {
// required, the name of a secret in the current namespace
Expand Down
5 changes: 0 additions & 5 deletions deployment/common/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@ spec:
fqdn:
type: string
pattern: ^([a-zA-Z0-9]+(-[a-zA-Z0-9]+)*\.)+[a-z]{2,}$
aliases:
type: array
items:
type: string
pattern: ^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$
tls:
properties:
secretName:
Expand Down
5 changes: 0 additions & 5 deletions deployment/ds-hostnet-split/01-common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@ spec:
fqdn:
type: string
pattern: ^([a-zA-Z0-9]+(-[a-zA-Z0-9]+)*\.)+[a-z]{2,}$
aliases:
type: array
items:
type: string
pattern: ^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$
tls:
properties:
secretName:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ metadata:
spec:
virtualhost:
fqdn: bar.com
aliases:
- www.bar.com
routes:
- match: /
services:
Expand Down
5 changes: 0 additions & 5 deletions deployment/render/daemonset-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,6 @@ spec:
fqdn:
type: string
pattern: ^([a-zA-Z0-9]+(-[a-zA-Z0-9]+)*\.)+[a-z]{2,}$
aliases:
type: array
items:
type: string
pattern: ^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$
tls:
properties:
secretName:
Expand Down
5 changes: 0 additions & 5 deletions deployment/render/deployment-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,6 @@ spec:
fqdn:
type: string
pattern: ^([a-zA-Z0-9]+(-[a-zA-Z0-9]+)*\.)+[a-z]{2,}$
aliases:
type: array
items:
type: string
pattern: ^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$
tls:
properties:
secretName:
Expand Down
13 changes: 3 additions & 10 deletions design/ingressroute-design.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ The working model for delegation is DNS.
As the owner of a DNS domain, for example `.com`, I _delegate_ to another nameserver the responsibility for handing the subdomain `heptio.com`.
Any nameserver can hold a record for `heptio.com`, but without the linkage from the parent `.com` TLD, its information is unreachable and non authoritative.

Each _root_ of a DAG starts at a virtual host, which describes properties such as the fully qualified name of the virtual host, any aliases of the vhost (for example, a `www.` prefix), TLS configuration, and possibly global access list details.
Each _root_ of a DAG starts at a virtual host, which describes properties such as the fully qualified name of the virtual host, TLS configuration, and possibly global access list details.
The vertices of a graph do not contain virtual host information.
Instead they are reachable from a root only by delegation.
This permits the _owner_ of an ingress root to both delegate the authority to publish a service on a portion of the route space inside a virtual host, and to further delegate authority to publish and delegate.
Expand All @@ -59,15 +59,10 @@ spec:
# to be a "root".
virtualhost:
# the fully qualified domain name of the root of the ingress tree
# all leaves of the DAG rooted at this object relate to the fqdn (and its aliases)
# all leaves of the DAG rooted at this object relate to the fqdn
fqdn: www.google.com
# a set of aliases for the domain, these may be alternative fqdns which are considered
# aliases of the primary fqdn
aliases:
- www.google.com.au
- google.com
# if present describes tls properties. The CNI names that will be matched on
# are described in fqdn and aliases, the tls.secretName secret must contain a
# are described in fqdn, the tls.secretName secret must contain a
# matching certificate
tls:
# required, the name of a secret in the current namespace
Expand Down Expand Up @@ -282,8 +277,6 @@ metadata:
spec:
virtualhost:
fqdn: heptio.com
aliases:
- www.heptio.com
routes:
- match: /
# delegate everything to heptio-wordpress/wordpress
Expand Down
2 changes: 1 addition & 1 deletion internal/dag/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -639,5 +639,5 @@ type Status struct {
Object *ingressroutev1.IngressRoute
Status string
Description string
Vhost string // SAS: Support `aliases` once merged
Vhost string
}

0 comments on commit eca1d06

Please sign in to comment.