Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chart: bump to envoy 1.20.1 #958

Merged
merged 7 commits into from
Jan 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
## UNRELEASED

FEATURES:
* Helm
* Support Envoy 1.20.1. [[GH-935](https://github.com/hashicorp/consul-k8s/pull/958)]

IMPROVEMENTS:
* Helm
* Allow customization of `terminationGracePeriodSeconds` on the ingress gateways. [[GH-947](https://github.com/hashicorp/consul-k8s/pull/947)]
Expand Down
2 changes: 1 addition & 1 deletion charts/consul/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.20.0
image: envoyproxy/envoy-alpine:v1.20.1
artifacthub.io/license: MPL-2.0
artifacthub.io/links: |
- name: Documentation
Expand Down
2 changes: 1 addition & 1 deletion charts/consul/test/unit/ingress-gateways-deployment.bats
Original file line number Diff line number Diff line change
Expand Up @@ -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.0" ]
[ "${actual}" = "envoyproxy/envoy-alpine:v1.20.1" ]
}

@test "ingressGateways/Deployment: envoy image can be set using the global value" {
Expand Down
4 changes: 2 additions & 2 deletions charts/consul/test/unit/mesh-gateway-deployment.bats
Original file line number Diff line number Diff line change
Expand Up @@ -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.0" ]
[ "${actual}" = "envoyproxy/envoy-alpine:v1.20.1" ]
}

@test "meshGateway/Deployment: setting meshGateway.imageEnvoy fails" {
Expand Down Expand Up @@ -1530,4 +1530,4 @@ EOF
--set 'meshGateway.enabled=true' .
[ "$status" -eq 1 ]
[[ "$output" =~ "global.enableConsulNamespaces must be true if global.adminPartitions.enabled=true" ]]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.0" ]
[ "${actual}" = "envoyproxy/envoy-alpine:v1.20.1" ]
}

@test "terminatingGateways/Deployment: envoy image can be set using the global value" {
Expand Down
2 changes: 1 addition & 1 deletion charts/consul/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:<latest supported version>
imageEnvoy: "envoyproxy/envoy-alpine:v1.20.0"
imageEnvoy: "envoyproxy/envoy-alpine:v1.20.1"

# Configuration for running this Helm chart on the Red Hat OpenShift platform.
# This Helm chart currently supports OpenShift v4.x+.
Expand Down