mirror of https://github.com/status-im/consul.git
Merge pull request #7484 from hashicorp/dnephin/fix-envoy-tests
Fix tests failing on master
This commit is contained in:
commit
9f46759ba2
|
@ -69,6 +69,8 @@ type cmd struct {
|
|||
meshGatewaySvcName string
|
||||
}
|
||||
|
||||
const defaultEnvoyVersion = "1.13.1"
|
||||
|
||||
func (c *cmd) init() {
|
||||
c.flags = flag.NewFlagSet("", flag.ContinueOnError)
|
||||
|
||||
|
@ -112,7 +114,7 @@ func (c *cmd) init() {
|
|||
"Set the agent's gRPC address and port (in http(s)://host:port format). "+
|
||||
"Alternatively, you can specify CONSUL_GRPC_ADDR in ENV.")
|
||||
|
||||
c.flags.StringVar(&c.envoyVersion, "envoy-version", "1.13.1",
|
||||
c.flags.StringVar(&c.envoyVersion, "envoy-version", defaultEnvoyVersion,
|
||||
"Sets the envoy-version that the envoy binary has.")
|
||||
|
||||
c.flags.BoolVar(&c.register, "register", false,
|
||||
|
|
|
@ -83,7 +83,7 @@ func TestGenerateConfig(t *testing.T) {
|
|||
Flags: []string{"-proxy-id", "test-proxy"},
|
||||
Env: []string{},
|
||||
WantArgs: BootstrapTplArgs{
|
||||
EnvoyVersion: "1.13.0",
|
||||
EnvoyVersion: defaultEnvoyVersion,
|
||||
ProxyCluster: "test-proxy",
|
||||
ProxyID: "test-proxy",
|
||||
AgentAddress: "127.0.0.1",
|
||||
|
@ -100,7 +100,7 @@ func TestGenerateConfig(t *testing.T) {
|
|||
"-token", "c9a52720-bf6c-4aa6-b8bc-66881a5ade95"},
|
||||
Env: []string{},
|
||||
WantArgs: BootstrapTplArgs{
|
||||
EnvoyVersion: "1.13.0",
|
||||
EnvoyVersion: defaultEnvoyVersion,
|
||||
ProxyCluster: "test-proxy",
|
||||
ProxyID: "test-proxy",
|
||||
AgentAddress: "127.0.0.1",
|
||||
|
@ -119,7 +119,7 @@ func TestGenerateConfig(t *testing.T) {
|
|||
"CONSUL_HTTP_TOKEN=c9a52720-bf6c-4aa6-b8bc-66881a5ade95",
|
||||
},
|
||||
WantArgs: BootstrapTplArgs{
|
||||
EnvoyVersion: "1.13.0",
|
||||
EnvoyVersion: defaultEnvoyVersion,
|
||||
ProxyCluster: "test-proxy",
|
||||
ProxyID: "test-proxy",
|
||||
AgentAddress: "127.0.0.1",
|
||||
|
@ -141,7 +141,7 @@ func TestGenerateConfig(t *testing.T) {
|
|||
"token.txt": "c9a52720-bf6c-4aa6-b8bc-66881a5ade95",
|
||||
},
|
||||
WantArgs: BootstrapTplArgs{
|
||||
EnvoyVersion: "1.13.0",
|
||||
EnvoyVersion: defaultEnvoyVersion,
|
||||
ProxyCluster: "test-proxy",
|
||||
ProxyID: "test-proxy",
|
||||
AgentAddress: "127.0.0.1",
|
||||
|
@ -163,7 +163,7 @@ func TestGenerateConfig(t *testing.T) {
|
|||
"token.txt": "c9a52720-bf6c-4aa6-b8bc-66881a5ade95",
|
||||
},
|
||||
WantArgs: BootstrapTplArgs{
|
||||
EnvoyVersion: "1.13.0",
|
||||
EnvoyVersion: defaultEnvoyVersion,
|
||||
ProxyCluster: "test-proxy",
|
||||
ProxyID: "test-proxy",
|
||||
AgentAddress: "127.0.0.1",
|
||||
|
@ -181,7 +181,7 @@ func TestGenerateConfig(t *testing.T) {
|
|||
"-grpc-addr", "localhost:9999"},
|
||||
Env: []string{},
|
||||
WantArgs: BootstrapTplArgs{
|
||||
EnvoyVersion: "1.13.0",
|
||||
EnvoyVersion: defaultEnvoyVersion,
|
||||
ProxyCluster: "test-proxy",
|
||||
ProxyID: "test-proxy",
|
||||
// Should resolve IP, note this might not resolve the same way
|
||||
|
@ -202,7 +202,7 @@ func TestGenerateConfig(t *testing.T) {
|
|||
"CONSUL_GRPC_ADDR=localhost:9999",
|
||||
},
|
||||
WantArgs: BootstrapTplArgs{
|
||||
EnvoyVersion: "1.13.0",
|
||||
EnvoyVersion: defaultEnvoyVersion,
|
||||
ProxyCluster: "test-proxy",
|
||||
ProxyID: "test-proxy",
|
||||
// Should resolve IP, note this might not resolve the same way
|
||||
|
@ -222,7 +222,7 @@ func TestGenerateConfig(t *testing.T) {
|
|||
"-grpc-addr", "unix:///var/run/consul.sock"},
|
||||
Env: []string{},
|
||||
WantArgs: BootstrapTplArgs{
|
||||
EnvoyVersion: "1.13.0",
|
||||
EnvoyVersion: defaultEnvoyVersion,
|
||||
ProxyCluster: "test-proxy",
|
||||
ProxyID: "test-proxy",
|
||||
AgentSocket: "/var/run/consul.sock",
|
||||
|
@ -237,7 +237,7 @@ func TestGenerateConfig(t *testing.T) {
|
|||
Flags: []string{"-proxy-id", "test-proxy"},
|
||||
GRPCPort: 9999,
|
||||
WantArgs: BootstrapTplArgs{
|
||||
EnvoyVersion: "1.13.0",
|
||||
EnvoyVersion: defaultEnvoyVersion,
|
||||
ProxyCluster: "test-proxy",
|
||||
ProxyID: "test-proxy",
|
||||
// Should resolve IP, note this might not resolve the same way
|
||||
|
@ -256,7 +256,7 @@ func TestGenerateConfig(t *testing.T) {
|
|||
Flags: []string{"-proxy-id", "test-proxy", "-admin-access-log-path", "/some/path/access.log"},
|
||||
Env: []string{},
|
||||
WantArgs: BootstrapTplArgs{
|
||||
EnvoyVersion: "1.13.0",
|
||||
EnvoyVersion: defaultEnvoyVersion,
|
||||
ProxyCluster: "test-proxy",
|
||||
ProxyID: "test-proxy",
|
||||
// Should resolve IP, note this might not resolve the same way
|
||||
|
@ -275,7 +275,7 @@ func TestGenerateConfig(t *testing.T) {
|
|||
Flags: []string{"-proxy-id", "test-proxy", "-ca-file", "some/path"},
|
||||
Env: []string{},
|
||||
WantArgs: BootstrapTplArgs{
|
||||
EnvoyVersion: "1.13.0",
|
||||
EnvoyVersion: defaultEnvoyVersion,
|
||||
ProxyCluster: "test-proxy",
|
||||
ProxyID: "test-proxy",
|
||||
// Should resolve IP, note this might not resolve the same way
|
||||
|
@ -291,7 +291,7 @@ func TestGenerateConfig(t *testing.T) {
|
|||
Flags: []string{"-proxy-id", "test-proxy", "-ca-file", "../../../test/ca/root.cer"},
|
||||
Env: []string{"CONSUL_HTTP_SSL=1"},
|
||||
WantArgs: BootstrapTplArgs{
|
||||
EnvoyVersion: "1.13.0",
|
||||
EnvoyVersion: defaultEnvoyVersion,
|
||||
ProxyCluster: "test-proxy",
|
||||
ProxyID: "test-proxy",
|
||||
// Should resolve IP, note this might not resolve the same way
|
||||
|
@ -334,7 +334,7 @@ func TestGenerateConfig(t *testing.T) {
|
|||
}`,
|
||||
},
|
||||
WantArgs: BootstrapTplArgs{
|
||||
EnvoyVersion: "1.13.0",
|
||||
EnvoyVersion: defaultEnvoyVersion,
|
||||
ProxyCluster: "test-proxy",
|
||||
ProxyID: "test-proxy",
|
||||
AgentAddress: "127.0.0.1",
|
||||
|
@ -367,7 +367,7 @@ func TestGenerateConfig(t *testing.T) {
|
|||
}`,
|
||||
},
|
||||
WantArgs: BootstrapTplArgs{
|
||||
EnvoyVersion: "1.13.0",
|
||||
EnvoyVersion: defaultEnvoyVersion,
|
||||
ProxyCluster: "test-proxy",
|
||||
ProxyID: "test-proxy",
|
||||
AgentAddress: "127.0.0.1",
|
||||
|
@ -405,7 +405,7 @@ func TestGenerateConfig(t *testing.T) {
|
|||
} , { "name": "fake_sink_2" }`,
|
||||
},
|
||||
WantArgs: BootstrapTplArgs{
|
||||
EnvoyVersion: "1.13.0",
|
||||
EnvoyVersion: defaultEnvoyVersion,
|
||||
ProxyCluster: "test-proxy",
|
||||
ProxyID: "test-proxy",
|
||||
AgentAddress: "127.0.0.1",
|
||||
|
@ -430,7 +430,7 @@ func TestGenerateConfig(t *testing.T) {
|
|||
}`,
|
||||
},
|
||||
WantArgs: BootstrapTplArgs{
|
||||
EnvoyVersion: "1.13.0",
|
||||
EnvoyVersion: defaultEnvoyVersion,
|
||||
ProxyCluster: "test-proxy",
|
||||
ProxyID: "test-proxy",
|
||||
AgentAddress: "127.0.0.1",
|
||||
|
@ -485,7 +485,7 @@ func TestGenerateConfig(t *testing.T) {
|
|||
}`,
|
||||
},
|
||||
WantArgs: BootstrapTplArgs{
|
||||
EnvoyVersion: "1.13.0",
|
||||
EnvoyVersion: defaultEnvoyVersion,
|
||||
ProxyCluster: "test-proxy",
|
||||
ProxyID: "test-proxy",
|
||||
AgentAddress: "127.0.0.1",
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
"id": "test-proxy",
|
||||
"metadata": {
|
||||
"namespace": "default",
|
||||
"envoy_version": "1.13.0"
|
||||
"envoy_version": "1.13.1"
|
||||
}
|
||||
},
|
||||
"static_resources": {
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
"id": "test-proxy",
|
||||
"metadata": {
|
||||
"namespace": "default",
|
||||
"envoy_version": "1.13.0"
|
||||
"envoy_version": "1.13.1"
|
||||
}
|
||||
},
|
||||
"static_resources": {
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
"id": "test-proxy",
|
||||
"metadata": {
|
||||
"namespace": "default",
|
||||
"envoy_version": "1.13.0"
|
||||
"envoy_version": "1.13.1"
|
||||
}
|
||||
},
|
||||
"static_resources": {
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
"id": "test-proxy",
|
||||
"metadata": {
|
||||
"namespace": "default",
|
||||
"envoy_version": "1.13.0"
|
||||
"envoy_version": "1.13.1"
|
||||
}
|
||||
},
|
||||
"static_resources": {
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
"id": "test-proxy",
|
||||
"metadata": {
|
||||
"namespace": "default",
|
||||
"envoy_version": "1.13.0"
|
||||
"envoy_version": "1.13.1"
|
||||
}
|
||||
},
|
||||
"static_resources": {
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
"id": "test-proxy",
|
||||
"metadata": {
|
||||
"namespace": "default",
|
||||
"envoy_version": "1.13.0"
|
||||
"envoy_version": "1.13.1"
|
||||
}
|
||||
},
|
||||
"static_resources": {
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
"id": "test-proxy",
|
||||
"metadata": {
|
||||
"namespace": "default",
|
||||
"envoy_version": "1.13.0"
|
||||
"envoy_version": "1.13.1"
|
||||
}
|
||||
},
|
||||
"static_resources": {
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
"id": "test-proxy",
|
||||
"metadata": {
|
||||
"namespace": "default",
|
||||
"envoy_version": "1.13.0"
|
||||
"envoy_version": "1.13.1"
|
||||
}
|
||||
},
|
||||
"static_resources": {
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
"id": "test-proxy",
|
||||
"metadata": {
|
||||
"namespace": "default",
|
||||
"envoy_version": "1.13.0"
|
||||
"envoy_version": "1.13.1"
|
||||
}
|
||||
},
|
||||
"static_resources": {
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
"id": "test-proxy",
|
||||
"metadata": {
|
||||
"namespace": "default",
|
||||
"envoy_version": "1.13.0"
|
||||
"envoy_version": "1.13.1"
|
||||
}
|
||||
},
|
||||
"static_resources": {
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
"id": "test-proxy",
|
||||
"metadata": {
|
||||
"namespace": "default",
|
||||
"envoy_version": "1.13.0"
|
||||
"envoy_version": "1.13.1"
|
||||
}
|
||||
},
|
||||
"static_resources": {
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
"id": "test-proxy",
|
||||
"metadata": {
|
||||
"namespace": "default",
|
||||
"envoy_version": "1.13.0"
|
||||
"envoy_version": "1.13.1"
|
||||
}
|
||||
},
|
||||
"static_resources": {
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
"id": "test-proxy",
|
||||
"metadata": {
|
||||
"namespace": "default",
|
||||
"envoy_version": "1.13.0"
|
||||
"envoy_version": "1.13.1"
|
||||
}
|
||||
},
|
||||
"static_resources": {
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
"id": "test-proxy",
|
||||
"metadata": {
|
||||
"namespace": "default",
|
||||
"envoy_version": "1.13.0"
|
||||
"envoy_version": "1.13.1"
|
||||
}
|
||||
},
|
||||
"static_resources": {
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
"id": "test-proxy",
|
||||
"metadata": {
|
||||
"namespace": "default",
|
||||
"envoy_version": "1.13.0"
|
||||
"envoy_version": "1.13.1"
|
||||
}
|
||||
},
|
||||
"static_resources": {
|
||||
|
|
Loading…
Reference in New Issue