From eca1d06dccc9510061fb353b400de0997207fc6b Mon Sep 17 00:00:00 2001 From: Steve Sloka Date: Thu, 11 Oct 2018 10:25:34 -0400 Subject: [PATCH] Remove alias field Signed-off-by: Steve Sloka --- apis/contour/v1beta1/ingressroute.go | 6 +++--- deployment/common/common.yaml | 5 ----- deployment/ds-hostnet-split/01-common.yaml | 5 ----- .../02-basic/domain-aliases.ingressroute.yaml | 2 -- deployment/render/daemonset-rbac.yaml | 5 ----- deployment/render/deployment-rbac.yaml | 5 ----- design/ingressroute-design.md | 13 +++---------- internal/dag/builder.go | 2 +- 8 files changed, 7 insertions(+), 36 deletions(-) diff --git a/apis/contour/v1beta1/ingressroute.go b/apis/contour/v1beta1/ingressroute.go index 8c04f396d52..961bea29c94 100644 --- a/apis/contour/v1beta1/ingressroute.go +++ b/apis/contour/v1beta1/ingressroute.go @@ -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 diff --git a/deployment/common/common.yaml b/deployment/common/common.yaml index 6b50f37610b..67a1160a752 100644 --- a/deployment/common/common.yaml +++ b/deployment/common/common.yaml @@ -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: diff --git a/deployment/ds-hostnet-split/01-common.yaml b/deployment/ds-hostnet-split/01-common.yaml index 08cdf8050ac..3bc76ff4623 100644 --- a/deployment/ds-hostnet-split/01-common.yaml +++ b/deployment/ds-hostnet-split/01-common.yaml @@ -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: diff --git a/deployment/example-workload/ingressroute/02-basic/domain-aliases.ingressroute.yaml b/deployment/example-workload/ingressroute/02-basic/domain-aliases.ingressroute.yaml index b063a54ed54..a120fb714d2 100644 --- a/deployment/example-workload/ingressroute/02-basic/domain-aliases.ingressroute.yaml +++ b/deployment/example-workload/ingressroute/02-basic/domain-aliases.ingressroute.yaml @@ -7,8 +7,6 @@ metadata: spec: virtualhost: fqdn: bar.com - aliases: - - www.bar.com routes: - match: / services: diff --git a/deployment/render/daemonset-rbac.yaml b/deployment/render/daemonset-rbac.yaml index ead12466b02..6b19eba36d5 100644 --- a/deployment/render/daemonset-rbac.yaml +++ b/deployment/render/daemonset-rbac.yaml @@ -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: diff --git a/deployment/render/deployment-rbac.yaml b/deployment/render/deployment-rbac.yaml index cd86ce896a5..a2ddcf65a8e 100644 --- a/deployment/render/deployment-rbac.yaml +++ b/deployment/render/deployment-rbac.yaml @@ -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: diff --git a/design/ingressroute-design.md b/design/ingressroute-design.md index 45b08ed85e3..f1dd2ec9d53 100644 --- a/design/ingressroute-design.md +++ b/design/ingressroute-design.md @@ -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. @@ -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 @@ -282,8 +277,6 @@ metadata: spec: virtualhost: fqdn: heptio.com - aliases: - - www.heptio.com routes: - match: / # delegate everything to heptio-wordpress/wordpress diff --git a/internal/dag/builder.go b/internal/dag/builder.go index 4506352566d..abf78334c8e 100644 --- a/internal/dag/builder.go +++ b/internal/dag/builder.go @@ -639,5 +639,5 @@ type Status struct { Object *ingressroutev1.IngressRoute Status string Description string - Vhost string // SAS: Support `aliases` once merged + Vhost string }