Merge pull request #832 from davecheney/release-0.8.1

Release 0.8.1
projectcontour · Dec 11, 2018 · 22e772d · 22e772d
2 parents 9844961 + b5dd305
commit 22e772d
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 31 deletions.
diff --git a/deployment/common/common.yaml b/deployment/common/common.yaml
@@ -47,8 +47,6 @@ spec:
     openAPIV3Schema:
       properties:
         spec:
-          required:
-            - routes
           properties:
             virtualhost:
               properties:

diff --git a/deployment/deployment-grpc-v2/02-contour.yaml b/deployment/deployment-grpc-v2/02-contour.yaml
@@ -21,7 +21,7 @@ spec:
         prometheus.io/format: "prometheus"
     spec:
       containers:
-      - image: gcr.io/heptio-images/contour:v0.8.0
+      - image: gcr.io/heptio-images/contour:v0.8.1
         imagePullPolicy: Always
         name: contour
         command: ["contour"]
@@ -54,7 +54,7 @@ spec:
             exec:
               command: ["wget", "-qO-", "http://localhost:9001/healthcheck/fail"] 
       initContainers:
-      - image: gcr.io/heptio-images/contour:v0.8.0
+      - image: gcr.io/heptio-images/contour:v0.8.1
         imagePullPolicy: Always
         name: envoy-initconfig
         command: ["contour"]

diff --git a/deployment/ds-grpc-v2/02-contour.yaml b/deployment/ds-grpc-v2/02-contour.yaml
@@ -22,7 +22,7 @@ spec:
         prometheus.io/format: "prometheus"
     spec:
       containers:
-      - image: gcr.io/heptio-images/contour:v0.8.0
+      - image: gcr.io/heptio-images/contour:v0.8.1
         imagePullPolicy: Always
         name: contour
         command: ["contour"]
@@ -55,7 +55,7 @@ spec:
             exec:
               command: ["wget", "-qO-", "http://localhost:9001/healthcheck/fail"] 
       initContainers:
-      - image: gcr.io/heptio-images/contour:v0.8.0
+      - image: gcr.io/heptio-images/contour:v0.8.1
         imagePullPolicy: Always
         name: envoy-initconfig
         command: ["contour"]

diff --git a/deployment/ds-hostnet-split/03-contour.yaml b/deployment/ds-hostnet-split/03-contour.yaml
@@ -40,7 +40,7 @@ spec:
         - --envoy-https-port
         - "443"
         command: ["contour"]
-        image: gcr.io/heptio-images/contour:v0.8.0
+        image: gcr.io/heptio-images/contour:v0.8.1
         imagePullPolicy: Always
         name: contour
         ports:

diff --git a/deployment/ds-hostnet-split/03-envoy.yaml b/deployment/ds-hostnet-split/03-envoy.yaml
@@ -70,7 +70,7 @@ spec:
         - $(CONTOUR_SERVICE_PORT)
         command:
         - contour
-        image: gcr.io/heptio-images/contour:v0.8.0
+        image: gcr.io/heptio-images/contour:v0.8.1
         imagePullPolicy: Always
         name: envoy-initconfig
         volumeMounts:

diff --git a/deployment/ds-hostnet/02-contour.yaml b/deployment/ds-hostnet/02-contour.yaml
@@ -23,7 +23,7 @@ spec:
     spec:
       hostNetwork: true
       containers:
-      - image: gcr.io/heptio-images/contour:v0.8.0
+      - image: gcr.io/heptio-images/contour:v0.8.1
         imagePullPolicy: Always
         ports:
         - containerPort: 8000
@@ -59,7 +59,7 @@ spec:
             exec:
               command: ["wget", "-qO-", "http://localhost:9001/healthcheck/fail"] 
       initContainers:
-      - image: gcr.io/heptio-images/contour:v0.8.0
+      - image: gcr.io/heptio-images/contour:v0.8.1
         imagePullPolicy: Always
         name: envoy-initconfig
         command: ["contour"]

diff --git a/deployment/render/daemonset-rbac.yaml b/deployment/render/daemonset-rbac.yaml
@@ -50,8 +50,6 @@ spec:
     openAPIV3Schema:
       properties:
         spec:
-          required:
-            - routes
           properties:
             virtualhost:
               properties:
@@ -177,7 +175,7 @@ spec:
         prometheus.io/format: "prometheus"
     spec:
       containers:
-      - image: gcr.io/heptio-images/contour:v0.8.0
+      - image: gcr.io/heptio-images/contour:v0.8.1
         imagePullPolicy: Always
         name: contour
         command: ["contour"]
@@ -210,7 +208,7 @@ spec:
             exec:
               command: ["wget", "-qO-", "http://localhost:9001/healthcheck/fail"] 
       initContainers:
-      - image: gcr.io/heptio-images/contour:v0.8.0
+      - image: gcr.io/heptio-images/contour:v0.8.1
         imagePullPolicy: Always
         name: envoy-initconfig
         command: ["contour"]

diff --git a/deployment/render/deployment-rbac.yaml b/deployment/render/deployment-rbac.yaml
@@ -50,8 +50,6 @@ spec:
     openAPIV3Schema:
       properties:
         spec:
-          required:
-            - routes
           properties:
             virtualhost:
               properties:
@@ -176,7 +174,7 @@ spec:
         prometheus.io/format: "prometheus"
     spec:
       containers:
-      - image: gcr.io/heptio-images/contour:v0.8.0
+      - image: gcr.io/heptio-images/contour:v0.8.1
         imagePullPolicy: Always
         name: contour
         command: ["contour"]
@@ -209,7 +207,7 @@ spec:
             exec:
               command: ["wget", "-qO-", "http://localhost:9001/healthcheck/fail"] 
       initContainers:
-      - image: gcr.io/heptio-images/contour:v0.8.0
+      - image: gcr.io/heptio-images/contour:v0.8.1
         imagePullPolicy: Always
         name: envoy-initconfig
         command: ["contour"]

diff --git a/docs/ingressroute.md b/docs/ingressroute.md
@@ -746,7 +746,7 @@ IngressRoutes with a defined `virtualhost` field that are not in one of the allo
 
 Ingressroute supports proxying of TLS encapsulated TCP sessions.
 
-The TCP session must be encrupted with TLS.
+The TCP session must be encrypted with TLS.
 This is necessary so that Envoy can use SNI to route the incoming request to the correct service.
 
 ```

diff --git a/docs/proxy-proto.md b/docs/proxy-proto.md
@@ -33,14 +33,11 @@ spec:
 ...
 spec:
   containers:
-  - name: contour
-    args:                 
-    - serve            
-    - --incluster                 
-    - --use-proxy-protocol
-    command:             
-    - contour                
-    image: gcr.io/heptio-images/contour:latest
+  - image: gcr.io/heptio-images/contour:master
+    imagePullPolicy: Always
+    name: contour
+    command: ["contour"]
+    args: ["serve", "--incluster", "--use-proxy-protocol"]
 ...
 ```
 

diff --git a/docs/tls.md b/docs/tls.md
@@ -4,13 +4,11 @@ Contour 0.3 adds support for HTTPS (TLS/SSL) ingress by integrating Envoy's SNI
 
 ## Enabling TLS support
 
-Enabling TLS support requires Contour version 0.3 or later. You must use the [YAML v2 bootstrap configuration][0].
-
+Enabling TLS support requires Contour version 0.3 or later.=
 You must also add an [entry for port 443][1] to your `contour` service object.
 
 ## Configuring TLS with Contour on an ELB
 
 If you deploy behind an AWS Elastic Load Balancer, see [EC2 ELB PROXY protocol support](proxy-proto.md) for special instructions.
 
-[0]: upgrade.md
 [1]: https://github.com/heptio/contour/blob/v0.3.1/deployment/common/service.yaml#L20-L23
diff --git a/internal/contour/holdoff.go b/internal/contour/holdoff.go
@@ -60,7 +60,6 @@ func (hn *HoldoffNotifier) OnChange(builder *dag.Builder) {
 		return
 	}
 
-	hn.WithField("remaining", holdoffMaxDelay-since).Info("delaying update")
 	hn.timer = time.AfterFunc(holdoffDelay, func() {
 		hn.mu.Lock()
 		defer hn.mu.Unlock()