diff --git a/CHANGELOG.md b/CHANGELOG.md index be463dd3e4..56efc718b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ FEATURES: * Helm * Support Consul 1.11.0. [[GH-935](https://github.com/hashicorp/consul-k8s/pull/935)] + * Support Envoy 1.20.0. [[GH-935](https://github.com/hashicorp/consul-k8s/pull/935)] + * * Minimum Kubernetes versions supported is 1.17+. [[GH-935](https://github.com/hashicorp/consul-k8s/pull/935)] * CLI * **BETA** Add `upgrade` command to modify Consul installation on Kubernetes. [[GH-898](https://github.com/hashicorp/consul-k8s/pull/898)] diff --git a/charts/consul/Chart.yaml b/charts/consul/Chart.yaml index 4fcc230d99..1a644d5ed6 100644 --- a/charts/consul/Chart.yaml +++ b/charts/consul/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: consul version: 0.39.0 appVersion: 1.11.0 -kubeVersion: ">=1.17.0-0" +kubeVersion: ">=1.18.0-0" description: Official HashiCorp Consul Chart home: https://www.consul.io icon: https://raw.githubusercontent.com/hashicorp/consul-k8s/main/assets/icon.png @@ -17,7 +17,7 @@ annotations: - name: consul-k8s-control-plane image: hashicorp/consul-k8s-control-plane:0.39.0 - name: envoy - image: envoyproxy/envoy-alpine:v1.18.4 + image: envoyproxy/envoy-alpine:v1.20.0 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 ee1ac5f303..c22e325771 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.18.4" ] + [ "${actual}" = "envoyproxy/envoy-alpine:v1.20.0" ] } @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 f1af2fc2b2..37464b9676 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.18.4" ] + [ "${actual}" = "envoyproxy/envoy-alpine:v1.20.0" ] } @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 e0bbdcd0a4..39f2649270 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.18.4" ] + [ "${actual}" = "envoyproxy/envoy-alpine:v1.20.0" ] } @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 6123767d75..a121ce9855 100644 --- a/charts/consul/values.yaml +++ b/charts/consul/values.yaml @@ -444,7 +444,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.18.4" + imageEnvoy: "envoyproxy/envoy-alpine:v1.20.0" # Configuration for running this Helm chart on the Red Hat OpenShift platform. # This Helm chart currently supports OpenShift v4.x+.