Merge pull request #1170 from kinvolk/invidian/update-contour-v1.10.0

contour: update to v.1.10.0
kinvolk · Nov 9, 2020 · fc2a02d · fc2a02d
2 parents 2c758ea + a11a1e0
commit fc2a02d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/assets/charts/components/contour/templates/01-contour-config.yaml b/assets/charts/components/contour/templates/01-contour-config.yaml
@@ -10,8 +10,6 @@ data:
     # server:
     #   determine which XDS Server implementation to utilize in Contour.
     #   xds-server-type: contour
-    #   specify the xDS version to use when serving resources to Envoy.
-    #   xds-server-version: v2
     #
     # should contour expect to be running inside a k8s cluster
     # incluster: true

diff --git a/assets/charts/components/contour/templates/02-job-certgen.yaml b/assets/charts/components/contour/templates/02-job-certgen.yaml
@@ -36,7 +36,7 @@ rules:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: contour-certgen-v1.9.0
+  name: contour-certgen-v1.10.0
   namespace: projectcontour
 spec:
   ttlSecondsAfterFinished: 0

diff --git a/assets/charts/components/contour/templates/03-contour.yaml b/assets/charts/components/contour/templates/03-contour.yaml
@@ -65,6 +65,9 @@ spec:
           name: xds
           protocol: TCP
         - containerPort: 8000
+          name: metrics
+          protocol: TCP
+        - containerPort: 6060
           name: debug
           protocol: TCP
         livenessProbe:

diff --git a/assets/charts/components/contour/templates/03-envoy.yaml b/assets/charts/components/contour/templates/03-envoy.yaml
@@ -125,6 +125,7 @@ spec:
         - /config/envoy.json
         - --xds-address=contour
         - --xds-port=8001
+        - --xds-resource-version=v3
         - --resources-dir=/config/resources
         - --envoy-cafile=/certs/ca.crt
         - --envoy-cert-file=/certs/tls.crt

diff --git a/assets/charts/components/contour/values.yaml b/assets/charts/components/contour/values.yaml
@@ -3,7 +3,7 @@ monitoring:
 
 contour:
   image: docker.io/projectcontour/contour
-  tag: v1.9.0
+  tag: v1.10.0
 
 envoy:
   image: docker.io/envoyproxy/envoy

diff --git a/pkg/assets/generated_assets.go b/pkg/assets/generated_assets.go