diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cc5e91da3..9dfb33b600 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## UNRELEASED +BUG FIXES: +* Helm + * Support Envoy 1.20.2. [[GH-1051](https://github.com/hashicorp/consul-k8s/pull/1051)] + ## 0.41.0 (February 23, 2022) FEATURES: diff --git a/charts/consul/Chart.yaml b/charts/consul/Chart.yaml index dc57082d06..e57d11ae26 100644 --- a/charts/consul/Chart.yaml +++ b/charts/consul/Chart.yaml @@ -17,7 +17,7 @@ annotations: - name: consul-k8s-control-plane image: hashicorp/consul-k8s-control-plane:0.41.0 - name: envoy - image: envoyproxy/envoy-alpine:v1.20.1 + image: envoyproxy/envoy-alpine:v1.20.2 artifacthub.io/license: MPL-2.0 artifacthub.io/links: | - name: Documentation diff --git a/charts/consul/test/unit/ingress-gateways-deployment.bats b/charts/consul/test/unit/ingress-gateways-deployment.bats index d2c02d1dda..76b20dd501 100644 --- a/charts/consul/test/unit/ingress-gateways-deployment.bats +++ b/charts/consul/test/unit/ingress-gateways-deployment.bats @@ -83,7 +83,7 @@ load _helpers --set 'connectInject.enabled=true' \ . | tee /dev/stderr | yq -s -r '.[0].spec.template.spec.containers[0].image' | tee /dev/stderr) - [ "${actual}" = "envoyproxy/envoy-alpine:v1.20.1" ] + [ "${actual}" = "envoyproxy/envoy-alpine:v1.20.2" ] } @test "ingressGateways/Deployment: envoy image can be set using the global value" { diff --git a/charts/consul/test/unit/mesh-gateway-deployment.bats b/charts/consul/test/unit/mesh-gateway-deployment.bats index c434fce1c5..e8a2b1eeec 100755 --- a/charts/consul/test/unit/mesh-gateway-deployment.bats +++ b/charts/consul/test/unit/mesh-gateway-deployment.bats @@ -335,7 +335,7 @@ key2: value2' \ --set 'connectInject.enabled=true' \ . | tee /dev/stderr | yq -r '.spec.template.spec.containers[0].image' | tee /dev/stderr) - [ "${actual}" = "envoyproxy/envoy-alpine:v1.20.1" ] + [ "${actual}" = "envoyproxy/envoy-alpine:v1.20.2" ] } @test "meshGateway/Deployment: setting meshGateway.imageEnvoy fails" { diff --git a/charts/consul/test/unit/terminating-gateways-deployment.bats b/charts/consul/test/unit/terminating-gateways-deployment.bats index 1cc2fbdd16..4a23a232ba 100644 --- a/charts/consul/test/unit/terminating-gateways-deployment.bats +++ b/charts/consul/test/unit/terminating-gateways-deployment.bats @@ -83,7 +83,7 @@ load _helpers --set 'connectInject.enabled=true' \ . | tee /dev/stderr | yq -s -r '.[0].spec.template.spec.containers[0].image' | tee /dev/stderr) - [ "${actual}" = "envoyproxy/envoy-alpine:v1.20.1" ] + [ "${actual}" = "envoyproxy/envoy-alpine:v1.20.2" ] } @test "terminatingGateways/Deployment: envoy image can be set using the global value" { diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml index 45423a6586..a37946b2b6 100644 --- a/charts/consul/values.yaml +++ b/charts/consul/values.yaml @@ -490,7 +490,7 @@ global: # connect-injected sidecar proxies and mesh, terminating, and ingress gateways. # See https://www.consul.io/docs/connect/proxies/envoy for full compatibility matrix between Consul and Envoy. # @default: envoyproxy/envoy-alpine: - imageEnvoy: "envoyproxy/envoy-alpine:v1.20.1" + imageEnvoy: "envoyproxy/envoy-alpine:v1.20.2" # Configuration for running this Helm chart on the Red Hat OpenShift platform. # This Helm chart currently supports OpenShift v4.x+.