mirror of https://github.com/status-im/consul.git
connect: add support for envoy 1.16.0, drop support for 1.12.x, and bump point releases as well (#8944)
Supported versions will be: "1.16.0", "1.15.2", "1.14.5", "1.13.6"
This commit is contained in:
parent
8ffebeb793
commit
a2c50d3303
|
@ -739,13 +739,13 @@ jobs:
|
|||
command: bash <(curl -s https://codecov.io/bash) -v -c -C $CIRCLE_SHA1 -F ui
|
||||
- run: *notify-slack-failure
|
||||
|
||||
envoy-integration-test-1.12.6:
|
||||
envoy-integration-test-1.13.6:
|
||||
docker:
|
||||
# We only really need bash and docker-compose which is installed on all
|
||||
# Circle images but pick Go since we have to pick one of them.
|
||||
- image: *GOLANG_IMAGE
|
||||
environment:
|
||||
ENVOY_VERSION: "1.12.6"
|
||||
ENVOY_VERSION: "1.13.6"
|
||||
steps: &ENVOY_INTEGRATION_TEST_STEPS
|
||||
- checkout
|
||||
# Get go binary from workspace
|
||||
|
@ -774,25 +774,25 @@ jobs:
|
|||
path: *TEST_RESULTS_DIR
|
||||
- run: *notify-slack-failure
|
||||
|
||||
envoy-integration-test-1.13.4:
|
||||
envoy-integration-test-1.14.5:
|
||||
docker:
|
||||
- image: *GOLANG_IMAGE
|
||||
environment:
|
||||
ENVOY_VERSION: "1.13.4"
|
||||
ENVOY_VERSION: "1.14.5"
|
||||
steps: *ENVOY_INTEGRATION_TEST_STEPS
|
||||
|
||||
envoy-integration-test-1.14.4:
|
||||
envoy-integration-test-1.15.2:
|
||||
docker:
|
||||
- image: *GOLANG_IMAGE
|
||||
environment:
|
||||
ENVOY_VERSION: "1.14.4"
|
||||
ENVOY_VERSION: "1.15.2"
|
||||
steps: *ENVOY_INTEGRATION_TEST_STEPS
|
||||
|
||||
envoy-integration-test-1.15.0:
|
||||
envoy-integration-test-1.16.0:
|
||||
docker:
|
||||
- image: *GOLANG_IMAGE
|
||||
environment:
|
||||
ENVOY_VERSION: "1.15.0"
|
||||
ENVOY_VERSION: "1.16.0"
|
||||
steps: *ENVOY_INTEGRATION_TEST_STEPS
|
||||
|
||||
# run integration tests for the connect ca providers
|
||||
|
@ -929,16 +929,16 @@ workflows:
|
|||
- nomad-integration-0_8:
|
||||
requires:
|
||||
- dev-build
|
||||
- envoy-integration-test-1.12.6:
|
||||
- envoy-integration-test-1.13.6:
|
||||
requires:
|
||||
- dev-build
|
||||
- envoy-integration-test-1.13.4:
|
||||
- envoy-integration-test-1.14.5:
|
||||
requires:
|
||||
- dev-build
|
||||
- envoy-integration-test-1.14.4:
|
||||
- envoy-integration-test-1.15.2:
|
||||
requires:
|
||||
- dev-build
|
||||
- envoy-integration-test-1.15.0:
|
||||
- envoy-integration-test-1.16.0:
|
||||
requires:
|
||||
- dev-build
|
||||
website:
|
||||
|
|
|
@ -11,24 +11,9 @@ import (
|
|||
var (
|
||||
// minSupportedVersion is the oldest mainline version we support. This should always be
|
||||
// the zero'th point release of the last element of proxysupport.EnvoyVersions.
|
||||
minSupportedVersion = version.Must(version.NewVersion("1.12.0"))
|
||||
minSupportedVersion = version.Must(version.NewVersion("1.13.0"))
|
||||
|
||||
specificUnsupportedVersions = []unsupportedVersion{
|
||||
{
|
||||
Version: version.Must(version.NewVersion("1.12.0")),
|
||||
UpgradeTo: "1.12.3+",
|
||||
Why: "does not support RBAC rules using url_path",
|
||||
},
|
||||
{
|
||||
Version: version.Must(version.NewVersion("1.12.1")),
|
||||
UpgradeTo: "1.12.3+",
|
||||
Why: "does not support RBAC rules using url_path",
|
||||
},
|
||||
{
|
||||
Version: version.Must(version.NewVersion("1.12.2")),
|
||||
UpgradeTo: "1.12.3+",
|
||||
Why: "does not support RBAC rules using url_path",
|
||||
},
|
||||
{
|
||||
Version: version.Must(version.NewVersion("1.13.0")),
|
||||
UpgradeTo: "1.13.1+",
|
||||
|
|
|
@ -72,7 +72,6 @@ func TestDetermineEnvoyVersionFromNode(t *testing.T) {
|
|||
|
||||
func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
|
||||
const (
|
||||
err1_12 = "is too old of a point release and is not supported by Consul because it does not support RBAC rules using url_path. Please upgrade to version 1.12.3+."
|
||||
err1_13 = "is too old of a point release and is not supported by Consul because it does not support RBAC rules using url_path. Please upgrade to version 1.13.1+."
|
||||
errTooOld = "is too old and is not supported by Consul"
|
||||
)
|
||||
|
@ -87,18 +86,22 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
|
|||
"1.9.0": {expectErr: "Envoy 1.9.0 " + errTooOld},
|
||||
"1.10.0": {expectErr: "Envoy 1.10.0 " + errTooOld},
|
||||
"1.11.0": {expectErr: "Envoy 1.11.0 " + errTooOld},
|
||||
"1.12.0": {expectErr: "Envoy 1.12.0 " + err1_12},
|
||||
"1.12.1": {expectErr: "Envoy 1.12.1 " + err1_12},
|
||||
"1.12.2": {expectErr: "Envoy 1.12.2 " + err1_12},
|
||||
"1.12.0": {expectErr: "Envoy 1.12.0 " + errTooOld},
|
||||
"1.12.1": {expectErr: "Envoy 1.12.1 " + errTooOld},
|
||||
"1.12.2": {expectErr: "Envoy 1.12.2 " + errTooOld},
|
||||
"1.12.3": {expectErr: "Envoy 1.12.3 " + errTooOld},
|
||||
"1.12.4": {expectErr: "Envoy 1.12.4 " + errTooOld},
|
||||
"1.12.5": {expectErr: "Envoy 1.12.5 " + errTooOld},
|
||||
"1.12.6": {expectErr: "Envoy 1.12.6 " + errTooOld},
|
||||
"1.12.7": {expectErr: "Envoy 1.12.7 " + errTooOld},
|
||||
"1.13.0": {expectErr: "Envoy 1.13.0 " + err1_13},
|
||||
}
|
||||
|
||||
// Insert a bunch of valid versions.
|
||||
for _, v := range []string{
|
||||
"1.12.3", "1.12.4", "1.12.5", "1.12.6", "1.12.7",
|
||||
"1.13.1", "1.13.2", "1.13.3", "1.13.4", "1.13.6", "1.14.1",
|
||||
"1.14.2", "1.14.3", "1.14.4", "1.14.5",
|
||||
"1.15.0", "1.15.1", "1.15.2",
|
||||
"1.15.0", "1.15.1", "1.15.2", "1.16.0",
|
||||
} {
|
||||
cases[v] = testcase{expect: supportedProxyFeatures{}}
|
||||
}
|
||||
|
|
|
@ -7,8 +7,8 @@ package proxysupport
|
|||
//
|
||||
// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
|
||||
var EnvoyVersions = []string{
|
||||
"1.15.0",
|
||||
"1.14.4",
|
||||
"1.13.4",
|
||||
"1.12.6",
|
||||
"1.16.0",
|
||||
"1.15.2",
|
||||
"1.14.5",
|
||||
"1.13.6",
|
||||
}
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue