Skip to content
This repository was archived by the owner on Jul 11, 2023. It is now read-only.

Commit 784d680

Browse files
whitneygriffithjaellio
authored andcommitted
fix(): remove support for incompatible tls versions for envoy TLSMaxProtocolVersion (#5298)
Removes support for TLSv1_0 and TLSv1_1 from the envoy TLSMaxProtocolVersion options Signed-off-by: Whitney Griffith <[email protected]> Signed-off-by: jaellio <[email protected]>
1 parent 0582092 commit 784d680

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

cmd/osm-bootstrap/crds/config_meshconfig.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ spec:
9999
- TLSv1_3
100100
default: TLSv1_2
101101
tlsMaxProtocolVersion:
102-
description: The maximum TLS protocol version that the sidecar supports. Valid TLS protocol versions are TLS_AUTO, TLSv1_0, TLSv1_1, TLSv1_2 and TLSv1_3.
102+
description: The maximum TLS protocol version that the sidecar supports. Valid TLS protocol versions are TLS_AUTO, TLSv1_0 (deprecated), TLSv1_1 (deprecated), TLSv1_2 and TLSv1_3.
103103
type: string
104104
enum:
105105
- TLS_AUTO

pkg/apis/config/v1alpha2/mesh_config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ type SidecarSpec struct {
7979
// TLSMinProtocolVersion defines the minimum TLS protocol version that the sidecar supports. Valid TLS protocol versions are TLS_AUTO, TLSv1_0, TLSv1_1, TLSv1_2 and TLSv1_3.
8080
TLSMinProtocolVersion string `json:"tlsMinProtocolVersion,omitempty"`
8181

82-
// TLSMaxProtocolVersion defines the maximum TLS protocol version that the sidecar supports. Valid TLS protocol versions are TLS_AUTO, TLSv1_0, TLSv1_1, TLSv1_2 and TLSv1_3.
82+
// TLSMaxProtocolVersion defines the maximum TLS protocol version that the sidecar supports. Valid TLS protocol versions are TLS_AUTO, TLSv1_0 (deprecated), TLSv1_1 (deprecated), TLSv1_2 and TLSv1_3.
8383
TLSMaxProtocolVersion string `json:"tlsMaxProtocolVersion,omitempty"`
8484

8585
// CipherSuites defines a list of ciphers that listener supports when negotiating TLS 1.0-1.2. This setting has no effect when negotiating TLS 1.3. For valid cipher names, see the latest OpenSSL ciphers manual page. E.g. https://www.openssl.org/docs/man1.1.1/apps/ciphers.html.

tests/e2e/e2e_envoy_max_mtls_version_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414

1515
// Prior iterations of OSM supported a wide range of min and max MTLS versions for the envoy sidecar (TLS_AUTO, TLSv1_0, TLSv1_1, TLSv1_2 and TLSv1_3)
1616
// even though the OSM Control Plane's minimum version has been upgraded to TLSv1_2
17-
// This test verifies that the envoy sidecar maxTLSVersion is compatible with the current osm control plane's minTLSVersion
18-
var _ = OSMDescribe("Test envoy maxTLSVersion is compatible with osm control plane's minTLSVersion",
17+
// This test verifies that the envoy sidecar maxTLSVersion is compatible with the current OSM control plane's minTLSVersion
18+
var _ = OSMDescribe("Test envoy maxTLSVersion is compatible with OSM control plane's minTLSVersion",
1919
OSMDescribeInfo{
2020
Tier: 1,
2121
Bucket: 12,
@@ -110,7 +110,7 @@ func testEnvoyMaxMtlsVersionIsNotCompatibileWithOSMControlPlane(envoyMaxTLSVersi
110110
Td.T.Logf("> (%s) HTTP Req failed correctly: %v", srcToDestStr, result.Err)
111111
return true
112112
}, 5, 150*time.Second)
113-
Expect(cond).To(BeTrue(), "envoy maxTLSVersion %s is not compatible with osm control plane", envoyMaxTLSVersion)
113+
Expect(cond).To(BeTrue(), "envoy maxTLSVersion %s is not compatible with OSM control plane", envoyMaxTLSVersion)
114114
})
115115
}
116116

0 commit comments

Comments
 (0)