Skip to content

Commit

Permalink
Revert "1.22.1 not 1.22.2"
Browse files Browse the repository at this point in the history 
This reverts commit db0e19c.
  • Loading branch information
@eculver
eculver committed Jun 14, 2022
1 parent db0e19c commit 951f2b5
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ BUG FIXES:
* Helm
* Update client-snapshot-agent so that setting `client.snapshotAgent.caCert` no longer requires root access to modify the trust store. [[GH-1190](https://github.com/hashicorp/consul-k8s/pull/1190/)]
* Add missing vault agent annotations to the `api-gateway-controller-deployment`. [[GH-1247](https://github.com/hashicorp/consul-k8s/pull/1247)]
* Bump default Envoy version to 1.22.1. [[GH-1276](https://github.com/hashicorp/consul-k8s/pull/1276)]
* Bump default Envoy version to 1.22.2. [[GH-1276](https://github.com/hashicorp/consul-k8s/pull/1276)]

## 0.44.0 (May 17, 2022)

Expand Down
2 changes: 1 addition & 1 deletion charts/consul/Chart.yaml
View file
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.44.0
- name: envoy
image: envoyproxy/envoy:v1.22.1
image: envoyproxy/envoy:v1.22.2
artifacthub.io/license: MPL-2.0
artifacthub.io/links: |
- name: Documentation
Expand Down
4 changes: 2 additions & 2 deletions charts/consul/templates/crd-ingressgateways.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ spec:
tlsMinVersion:
description: TLSMinVersion sets the default minimum TLS
version supported. One of `TLS_AUTO`, `TLSv1_0`, `TLSv1_1`,
`TLSv1_2`, or `TLSv1_3`. If unspecified, Envoy v1.22.0
`TLSv1_2`, or `TLSv1_3`. If unspecified, Envoy v1.22.2
and newer will default to TLS 1.2 as a min version, while
older releases of Envoy default to TLS 1.0.
type: string
Expand Down Expand Up @@ -276,7 +276,7 @@ spec:
tlsMinVersion:
description: TLSMinVersion sets the default minimum TLS version
supported. One of `TLS_AUTO`, `TLSv1_0`, `TLSv1_1`, `TLSv1_2`,
or `TLSv1_3`. If unspecified, Envoy v1.22.0 and newer will default
or `TLSv1_3`. If unspecified, Envoy v1.22.2 and newer will default
to TLS 1.2 as a min version, while older releases of Envoy default
to TLS 1.0.
type: string
Expand Down
4 changes: 2 additions & 2 deletions charts/consul/templates/crd-meshes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ spec:
tlsMinVersion:
description: TLSMinVersion sets the default minimum TLS version
supported. One of `TLS_AUTO`, `TLSv1_0`, `TLSv1_1`, `TLSv1_2`,
or `TLSv1_3`. If unspecified, Envoy v1.22.1 and newer will
or `TLSv1_3`. If unspecified, Envoy v1.22.2 and newer will
default to TLS 1.2 as a min version, while older releases
of Envoy default to TLS 1.0.
type: string
Expand Down Expand Up @@ -119,7 +119,7 @@ spec:
tlsMinVersion:
description: TLSMinVersion sets the default minimum TLS version
supported. One of `TLS_AUTO`, `TLSv1_0`, `TLSv1_1`, `TLSv1_2`,
or `TLSv1_3`. If unspecified, Envoy v1.22.1 and newer will
or `TLSv1_3`. If unspecified, Envoy v1.22.2 and newer will
default to TLS 1.2 as a min version, while older releases
of Envoy default to TLS 1.0.
type: string
Expand Down
2 changes: 1 addition & 1 deletion charts/consul/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,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:v1.22.1"
imageEnvoy: "envoyproxy/envoy:v1.22.2"

# Configuration for running this Helm chart on the Red Hat OpenShift platform.
# This Helm chart currently supports OpenShift v4.x+.
Expand Down
2 changes: 1 addition & 1 deletion control-plane/api/v1alpha1/ingressgateway_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ type GatewayTLSConfig struct {
SDS *GatewayTLSSDSConfig `json:"sds,omitempty"`
// TLSMinVersion sets the default minimum TLS version supported.
// One of `TLS_AUTO`, `TLSv1_0`, `TLSv1_1`, `TLSv1_2`, or `TLSv1_3`.
// If unspecified, Envoy v1.22.0 and newer will default to TLS 1.2 as a min version,
// If unspecified, Envoy v1.22.2 and newer will default to TLS 1.2 as a min version,
// while older releases of Envoy default to TLS 1.0.
TLSMinVersion string `json:"tlsMinVersion,omitempty"`
// TLSMaxVersion sets the default maximum TLS version supported. Must be greater than or equal to `TLSMinVersion`.
Expand Down
2 changes: 1 addition & 1 deletion control-plane/api/v1alpha1/mesh_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ type MeshTLSConfig struct {
type MeshDirectionalTLSConfig struct {
// TLSMinVersion sets the default minimum TLS version supported.
// One of `TLS_AUTO`, `TLSv1_0`, `TLSv1_1`, `TLSv1_2`, or `TLSv1_3`.
// If unspecified, Envoy v1.22.1 and newer will default to TLS 1.2 as a min version,
// If unspecified, Envoy v1.22.2 and newer will default to TLS 1.2 as a min version,
// while older releases of Envoy default to TLS 1.0.
TLSMinVersion string `json:"tlsMinVersion,omitempty"`
// TLSMaxVersion sets the default maximum TLS version supported. Must be greater than or equal to `TLSMinVersion`.
Expand Down
4 changes: 2 additions & 2 deletions control-plane/config/crd/bases/consul.hashicorp.com_ingressgateways.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ spec:
tlsMinVersion:
description: TLSMinVersion sets the default minimum TLS
version supported. One of `TLS_AUTO`, `TLSv1_0`, `TLSv1_1`,
`TLSv1_2`, or `TLSv1_3`. If unspecified, Envoy v1.22.0
`TLSv1_2`, or `TLSv1_3`. If unspecified, Envoy v1.22.2
and newer will default to TLS 1.2 as a min version, while
older releases of Envoy default to TLS 1.0.
type: string
Expand Down Expand Up @@ -269,7 +269,7 @@ spec:
tlsMinVersion:
description: TLSMinVersion sets the default minimum TLS version
supported. One of `TLS_AUTO`, `TLSv1_0`, `TLSv1_1`, `TLSv1_2`,
or `TLSv1_3`. If unspecified, Envoy v1.22.0 and newer will default
or `TLSv1_3`. If unspecified, Envoy v1.22.2 and newer will default
to TLS 1.2 as a min version, while older releases of Envoy default
to TLS 1.0.
type: string
Expand Down
4 changes: 2 additions & 2 deletions control-plane/config/crd/bases/consul.hashicorp.com_meshes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ spec:
tlsMinVersion:
description: TLSMinVersion sets the default minimum TLS version
supported. One of `TLS_AUTO`, `TLSv1_0`, `TLSv1_1`, `TLSv1_2`,
or `TLSv1_3`. If unspecified, Envoy v1.22.1 and newer will
or `TLSv1_3`. If unspecified, Envoy v1.22.2 and newer will
default to TLS 1.2 as a min version, while older releases
of Envoy default to TLS 1.0.
type: string
Expand Down Expand Up @@ -112,7 +112,7 @@ spec:
tlsMinVersion:
description: TLSMinVersion sets the default minimum TLS version
supported. One of `TLS_AUTO`, `TLSv1_0`, `TLSv1_1`, `TLSv1_2`,
or `TLSv1_3`. If unspecified, Envoy v1.22.1 and newer will
or `TLSv1_3`. If unspecified, Envoy v1.22.2 and newer will
default to TLS 1.2 as a min version, while older releases
of Envoy default to TLS 1.0.
type: string
Expand Down

0 comments on commit 951f2b5

Please sign in to comment.