From 382f6cc28600ae9e109099e65366c74b736ae891 Mon Sep 17 00:00:00 2001 From: Tam Mach Date: Sun, 24 Mar 2024 22:27:15 +1100 Subject: [PATCH] envoy: Bump envoy minor version to v1.29.x Relates: https://github.com/cilium/proxy/pull/660 Signed-off-by: Tam Mach --- Documentation/helm-values.rst | 2 +- images/cilium/Dockerfile | 2 +- install/kubernetes/Makefile.values | 6 +++--- install/kubernetes/cilium/README.md | 2 +- install/kubernetes/cilium/values.yaml | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Documentation/helm-values.rst b/Documentation/helm-values.rst index 93a6c229d8e6a..5f05b7b1529bc 100644 --- a/Documentation/helm-values.rst +++ b/Documentation/helm-values.rst @@ -1175,7 +1175,7 @@ * - :spelling:ignore:`envoy.image` - Envoy container image. - object - - ``{"digest":"sha256:d53a3d10f56d5d629dd2871a6600398d56c3f6040fda5ded8681ff6dbefb4213","override":null,"pullPolicy":"Always","repository":"quay.io/cilium/cilium-envoy","tag":"v1.28.2-b26890d42321dd1ee126ee7e38274f3a675c9a23","useDigest":true}`` + - ``{"digest":"sha256:9c75fc0faf27030902f7fe6bfacfab10220fcee896c1a31cb9f3e38ab7ccd6b8","override":null,"pullPolicy":"Always","repository":"quay.io/cilium/cilium-envoy-dev","tag":"b07d5f59934804ed0fd3d3e827754b1da0b0339e","useDigest":true}`` * - :spelling:ignore:`envoy.livenessProbe.failureThreshold` - failure threshold of liveness probe - int diff --git a/images/cilium/Dockerfile b/images/cilium/Dockerfile index ee2dbf5457f2e..f6234e41c1e7d 100644 --- a/images/cilium/Dockerfile +++ b/images/cilium/Dockerfile @@ -3,7 +3,7 @@ ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:780580e3dd8c5b944f3af7e3b094755cfbb1ebf0@sha256:593c25278aed08120f68228c7ebcfad682d9a8baf7225ed0995e85ef42add375 ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:2cac282018cb9f5e552843100a75898aa5f7fe7b@sha256:e0de3859ce3e4e6e867e21d20c6b8097352f4fe3752bd9e1687173e676f65819 -ARG CILIUM_ENVOY_IMAGE=quay.io/cilium/cilium-envoy:v1.28.2-b26890d42321dd1ee126ee7e38274f3a675c9a23@sha256:d53a3d10f56d5d629dd2871a6600398d56c3f6040fda5ded8681ff6dbefb4213 +ARG CILIUM_ENVOY_IMAGE=quay.io/cilium/cilium-envoy-dev:b07d5f59934804ed0fd3d3e827754b1da0b0339e@sha256:9c75fc0faf27030902f7fe6bfacfab10220fcee896c1a31cb9f3e38ab7ccd6b8 # cilium-envoy from github.com/cilium/proxy # diff --git a/install/kubernetes/Makefile.values b/install/kubernetes/Makefile.values index bf57f86494c5d..5470048372707 100644 --- a/install/kubernetes/Makefile.values +++ b/install/kubernetes/Makefile.values @@ -44,9 +44,9 @@ export CILIUM_NODEINIT_REPO:=quay.io/cilium/startup-script export CILIUM_NODEINIT_VERSION:=62093c5c233ea914bfa26a10ba41f8780d9b737f export CILIUM_NODEINIT_DIGEST:=sha256:e1d442546e868db1a3289166c14011e0dbd32115b338b963e56f830972bc22a2 -export CILIUM_ENVOY_REPO:=quay.io/cilium/cilium-envoy -export CILIUM_ENVOY_VERSION:=v1.28.2-b26890d42321dd1ee126ee7e38274f3a675c9a23 -export CILIUM_ENVOY_DIGEST:=sha256:d53a3d10f56d5d629dd2871a6600398d56c3f6040fda5ded8681ff6dbefb4213 +export CILIUM_ENVOY_REPO:=quay.io/cilium/cilium-envoy-dev +export CILIUM_ENVOY_VERSION:=b07d5f59934804ed0fd3d3e827754b1da0b0339e +export CILIUM_ENVOY_DIGEST:=sha256:9c75fc0faf27030902f7fe6bfacfab10220fcee896c1a31cb9f3e38ab7ccd6b8 export HUBBLE_UI_BACKEND_REPO:=quay.io/cilium/hubble-ui-backend export HUBBLE_UI_BACKEND_VERSION:=v0.13.0 diff --git a/install/kubernetes/cilium/README.md b/install/kubernetes/cilium/README.md index 052ef64879765..5a4d2bd0d243e 100644 --- a/install/kubernetes/cilium/README.md +++ b/install/kubernetes/cilium/README.md @@ -343,7 +343,7 @@ contributors across the globe, there is almost always someone available to help. | envoy.extraVolumes | list | `[]` | Additional envoy volumes. | | envoy.healthPort | int | `9878` | TCP port for the health API. | | envoy.idleTimeoutDurationSeconds | int | `60` | Set Envoy upstream HTTP idle connection timeout seconds. Does not apply to connections with pending requests. Default 60s | -| envoy.image | object | `{"digest":"sha256:d53a3d10f56d5d629dd2871a6600398d56c3f6040fda5ded8681ff6dbefb4213","override":null,"pullPolicy":"Always","repository":"quay.io/cilium/cilium-envoy","tag":"v1.28.2-b26890d42321dd1ee126ee7e38274f3a675c9a23","useDigest":true}` | Envoy container image. | +| envoy.image | object | `{"digest":"sha256:9c75fc0faf27030902f7fe6bfacfab10220fcee896c1a31cb9f3e38ab7ccd6b8","override":null,"pullPolicy":"Always","repository":"quay.io/cilium/cilium-envoy-dev","tag":"b07d5f59934804ed0fd3d3e827754b1da0b0339e","useDigest":true}` | Envoy container image. | | envoy.livenessProbe.failureThreshold | int | `10` | failure threshold of liveness probe | | envoy.livenessProbe.periodSeconds | int | `30` | interval between checks of the liveness probe | | envoy.log.format | string | `"[%Y-%m-%d %T.%e][%t][%l][%n] [%g:%#] %v"` | The format string to use for laying out the log message metadata of Envoy. | diff --git a/install/kubernetes/cilium/values.yaml b/install/kubernetes/cilium/values.yaml index 902f69da2b20f..a2f50bf392bd4 100644 --- a/install/kubernetes/cilium/values.yaml +++ b/install/kubernetes/cilium/values.yaml @@ -2040,10 +2040,10 @@ envoy: # type: [null, string] # @schema override: ~ - repository: "quay.io/cilium/cilium-envoy" - tag: "v1.28.2-b26890d42321dd1ee126ee7e38274f3a675c9a23" + repository: "quay.io/cilium/cilium-envoy-dev" + tag: "b07d5f59934804ed0fd3d3e827754b1da0b0339e" pullPolicy: "Always" - digest: "sha256:d53a3d10f56d5d629dd2871a6600398d56c3f6040fda5ded8681ff6dbefb4213" + digest: "sha256:9c75fc0faf27030902f7fe6bfacfab10220fcee896c1a31cb9f3e38ab7ccd6b8" useDigest: true # -- Additional containers added to the cilium Envoy DaemonSet. extraContainers: []