Update Contour from 1.26.1 to 1.27.0 (#32)

kadras-io · Nov 11, 2023 · ae06d83 · ae06d83
1 parent 60185d5
commit ae06d83
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 16 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,6 +18,6 @@ jobs:
       registry-server: ghcr.io
       registry-username: ${{ github.actor }}
       image: ${{ github.repository }}
-      version: 1.26.1
+      version: 1.27.0
     secrets:
       pull-request-token: ${{ secrets.GH_ORG_PAT }}
diff --git a/package/config/upstream/deployment/03-envoy-deployment.yaml b/package/config/upstream/deployment/03-envoy-deployment.yaml
@@ -42,7 +42,7 @@ spec:
           args:
             - envoy
             - shutdown-manager
-          image: ghcr.io/projectcontour/contour:v1.26.1
+          image: ghcr.io/projectcontour/contour:v1.27.0
           imagePullPolicy: IfNotPresent
           lifecycle:
             preStop:
@@ -63,7 +63,7 @@ spec:
             - --log-level info
           command:
             - envoy
-          image: docker.io/envoyproxy/envoy:v1.27.2
+          image: docker.io/envoyproxy/envoy:v1.28.0
           imagePullPolicy: IfNotPresent
           name: envoy
           env:
@@ -120,7 +120,7 @@ spec:
             - --envoy-key-file=/certs/tls.key
           command:
             - contour
-          image: ghcr.io/projectcontour/contour:v1.26.1
+          image: ghcr.io/projectcontour/contour:v1.27.0
           imagePullPolicy: IfNotPresent
           name: envoy-initconfig
           volumeMounts:

diff --git a/package/config/upstream/render/contour.yaml b/package/config/upstream/render/contour.yaml
@@ -690,6 +690,14 @@ spec:
                         type: string
                     type: object
                 type: object
+              featureFlags:
+                description: 'FeatureFlags defines toggle to enable new contour features.
+                  Available toggles are: useEndpointSlices - configures contour to
+                  fetch endpoint data from k8s endpoint slices. defaults to false
+                  and reading endpoint data from the k8s endpoints.'
+                items:
+                  type: string
+                type: array
               gateway:
                 description: Gateway contains parameters for the gateway-api Gateway
                   that Contour is configured to serve traffic.
@@ -3623,6 +3631,15 @@ spec:
                           type: object
                         type: array
                     type: object
+                  overloadMaxHeapSize:
+                    description: 'OverloadMaxHeapSize defines the maximum heap memory
+                      of the envoy controlled by the overload manager. When the value
+                      is greater than 0, the overload manager is enabled, and when
+                      envoy reaches 95% of the maximum heap size, it performs a shrink
+                      heap operation, When it reaches 98% of the maximum heap size,
+                      Envoy Will stop accepting requests. More info: https://projectcontour.io/docs/main/config/overload-manager/'
+                    format: int64
+                    type: integer
                   podAnnotations:
                     additionalProperties:
                       type: string
@@ -4155,6 +4172,14 @@ spec:
                             type: string
                         type: object
                     type: object
+                  featureFlags:
+                    description: 'FeatureFlags defines toggle to enable new contour
+                      features. Available toggles are: useEndpointSlices - configures
+                      contour to fetch endpoint data from k8s endpoint slices. defaults
+                      to false and reading endpoint data from the k8s endpoints.'
+                    items:
+                      type: string
+                    type: array
                   gateway:
                     description: Gateway contains parameters for the gateway-api Gateway
                       that Contour is configured to serve traffic.
@@ -6210,8 +6235,15 @@ spec:
                           type: object
                       type: object
                     requestHeadersPolicy:
-                      description: The policy for managing request headers during
-                        proxying.
+                      description: "The policy for managing request headers during
+                        proxying. \n You may dynamically rewrite the Host header to
+                        be forwarded upstream to the content of a request header using
+                        the below format \"%REQ(X-Header-Name)%\". If the value of
+                        the header is empty, it is ignored. \n *NOTE: Pay attention
+                        to the potential security implications of using this option.
+                        Provided header must come from trusted source. \n **NOTE:
+                        The header rewrite is only done while forwarding and has no
+                        bearing on the routing decision."
                       properties:
                         remove:
                           description: Remove specifies a list of HTTP header names
@@ -8335,7 +8367,7 @@ rules:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: contour-certgen-v1-26-1
+  name: contour-certgen-v1-27-0
   namespace: projectcontour
 spec:
   template:
@@ -8345,7 +8377,7 @@ spec:
     spec:
       containers:
       - name: contour
-        image: ghcr.io/projectcontour/contour:v1.26.1
+        image: ghcr.io/projectcontour/contour:v1.27.0
         imagePullPolicy: IfNotPresent
         command:
         - contour
@@ -8418,6 +8450,14 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - discovery.k8s.io
+  resources:
+  - endpointslices
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - gateway.networking.k8s.io
   resources:
@@ -8596,7 +8636,7 @@ spec:
         - --contour-key-file=/certs/tls.key
         - --config-path=/config/contour.yaml
         command: ["contour"]
-        image: ghcr.io/projectcontour/contour:v1.26.1
+        image: ghcr.io/projectcontour/contour:v1.27.0
         imagePullPolicy: IfNotPresent
         name: contour
         ports:
@@ -8685,7 +8725,7 @@ spec:
         args:
           - envoy
           - shutdown-manager
-        image: ghcr.io/projectcontour/contour:v1.26.1
+        image: ghcr.io/projectcontour/contour:v1.27.0
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
@@ -8706,7 +8746,7 @@ spec:
         - --log-level info
         command:
         - envoy
-        image: docker.io/envoyproxy/envoy:v1.27.2
+        image: docker.io/envoyproxy/envoy:v1.28.0
         imagePullPolicy: IfNotPresent
         name: envoy
         env:
@@ -8763,7 +8803,7 @@ spec:
         - --envoy-key-file=/certs/tls.key
         command:
         - contour
-        image: ghcr.io/projectcontour/contour:v1.26.1
+        image: ghcr.io/projectcontour/contour:v1.27.0
         imagePullPolicy: IfNotPresent
         name: envoy-initconfig
         volumeMounts:

diff --git a/package/vendir.lock.yml b/package/vendir.lock.yml
@@ -2,10 +2,10 @@ apiVersion: vendir.k14s.io/v1alpha1
 directories:
 - contents:
   - git:
-      commitTitle: Update Contour Docker image to v1.26.1....
-      sha: e1e0e05f21aa6d3b5cef80eb47ded15aa7e29452
+      commitTitle: Update Contour Docker image to v1.27.0....
+      sha: 30f317ea4978ddfcdd3405b40032d74dc43efb02
       tags:
-      - v1.26.1
+      - v1.27.0
     path: .
   path: config/upstream
 kind: LockConfig
diff --git a/package/vendir.yml b/package/vendir.yml
@@ -2,7 +2,7 @@ apiVersion: vendir.k14s.io/v1alpha1
 directories:
 - contents:
   - git:
-      ref: v1.26.1
+      ref: v1.27.0
       url: https://github.com/projectcontour/contour
     includePaths:
     - examples/render/contour.yaml