Different TLS settings must generate new Envoy clusters

Signed-off-by: Robbie McMichael <[email protected]>
projectcontour · Jan 14, 2019 · b86fbf5 · b86fbf5
1 parent 798f10a
commit b86fbf5
Show file tree

Hide file tree

Showing 15 changed files with 747 additions and 88 deletions.
diff --git a/apis/contour/v1beta1/ingressroute.go b/apis/contour/v1beta1/ingressroute.go
@@ -120,9 +120,9 @@ type HealthCheck struct {
 type TLSVerification struct {
 	// Required, the CA to use for TLS verification
 	CA CA `json:"ca"`
-	// If specified, at least one of the hostnames must be included in the
-	// certificate's Subject Alternative Names field
-	Hostnames []string `json:"hostnames"`
+	// If specified, the hostname must be included in the certificate's Subject
+	// Alternative Names field
+	Hostname string `json:"hostname"`
 }
 
 // TLS verification for the upstream services

diff --git a/deployment/common/common.yaml b/deployment/common/common.yaml
@@ -161,7 +161,5 @@ spec:
                                   type: string
                                   pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$ # DNS-1123 subdomain
                             hostnames:
-                              type: array
-                              items:
-                                type: string
+                              type: string
 ---
diff --git a/deployment/deployment-grpc-v2/02-contour.yaml b/deployment/deployment-grpc-v2/02-contour.yaml
@@ -21,8 +21,7 @@ spec:
         prometheus.io/format: "prometheus"
     spec:
       containers:
-      - image: gcr.io/heptio-images/contour:master
-        imagePullPolicy: Always
+      - image: gcr.io/heptio-images/contour:dea8bb8b
         name: contour
         command: ["contour"]
         args: ["serve", "--incluster"]
@@ -54,8 +53,7 @@ spec:
             exec:
               command: ["wget", "-qO-", "http://localhost:9001/healthcheck/fail"] 
       initContainers:
-      - image: gcr.io/heptio-images/contour:master
-        imagePullPolicy: Always
+      - image: gcr.io/heptio-images/contour:dea8bb8b
         name: envoy-initconfig
         command: ["contour"]
         args:

diff --git a/deployment/render/daemonset-rbac.yaml b/deployment/render/daemonset-rbac.yaml
@@ -164,9 +164,7 @@ spec:
                                   type: string
                                   pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$ # DNS-1123 subdomain
                             hostnames:
-                              type: array
-                              items:
-                                type: string
+                              type: string
 ---
 apiVersion: extensions/v1beta1
 kind: DaemonSet

diff --git a/deployment/render/deployment-rbac.yaml b/deployment/render/deployment-rbac.yaml
@@ -164,9 +164,7 @@ spec:
                                   type: string
                                   pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$ # DNS-1123 subdomain
                             hostnames:
-                              type: array
-                              items:
-                                type: string
+                              type: string
 ---
 apiVersion: extensions/v1beta1
 kind: Deployment
@@ -191,8 +189,7 @@ spec:
         prometheus.io/format: "prometheus"
     spec:
       containers:
-      - image: gcr.io/heptio-images/contour:master
-        imagePullPolicy: Always
+      - image: gcr.io/heptio-images/contour:dea8bb8b
         name: contour
         command: ["contour"]
         args: ["serve", "--incluster"]
@@ -224,8 +221,7 @@ spec:
             exec:
               command: ["wget", "-qO-", "http://localhost:9001/healthcheck/fail"] 
       initContainers:
-      - image: gcr.io/heptio-images/contour:master
-        imagePullPolicy: Always
+      - image: gcr.io/heptio-images/contour:dea8bb8b
         name: envoy-initconfig
         command: ["contour"]
         args:

diff --git a/internal/contour/cluster.go b/internal/contour/cluster.go
@@ -97,13 +97,7 @@ func visitClusters(root dag.Vertex) map[string]*v2.Cluster {
 
 func (v *clusterVisitor) visit(vertex dag.Vertex) {
 	switch service := vertex.(type) {
-	case *dag.HTTPService:
-		name := envoy.Clustername(&service.TCPService)
-		if _, ok := v.clusters[name]; !ok {
-			c := envoy.Cluster(service)
-			v.clusters[c.Name] = c
-		}
-	case *dag.TCPService:
+	case dag.Service:
 		name := envoy.Clustername(service)
 		if _, ok := v.clusters[name]; !ok {
 			c := envoy.Cluster(service)