ed13e5723f
As newer versions of Consul are released, the minimum version of Envoy it supports as a sidecar proxy also gets bumped. Starting with the upcoming Consul v1.9.X series, Envoy v1.11.X will no longer be supported. Current versions of Nomad hardcode a version of Envoy v1.11.2 to be used as the default implementation of Connect sidecar proxy. This PR introduces a change such that each Nomad Client will query its local Consul for a list of Envoy proxies that it supports (https://github.com/hashicorp/consul/pull/8545) and then launch the Connect sidecar proxy task using the latest supported version of Envoy. If the `SupportedProxies` API component is not available from Consul, Nomad will fallback to the old version of Envoy supported by old versions of Consul. Setting the meta configuration option `meta.connect.sidecar_image` or setting the `connect.sidecar_task` stanza will take precedence as is the current behavior for sidecar proxies. Setting the meta configuration option `meta.connect.gateway_image` will take precedence as is the current behavior for connect gateways. `meta.connect.sidecar_image` and `meta.connect.gateway_image` may make use of the special `${NOMAD_envoy_version}` variable interpolation, which resolves to the newest version of Envoy supported by the Consul agent. Addresses #8585 #7665
78 lines
2.2 KiB
Go
78 lines
2.2 KiB
Go
package client
|
|
|
|
import (
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/hashicorp/nomad/client/config"
|
|
consulapi "github.com/hashicorp/nomad/client/consul"
|
|
"github.com/hashicorp/nomad/client/fingerprint"
|
|
agentconsul "github.com/hashicorp/nomad/command/agent/consul"
|
|
"github.com/hashicorp/nomad/helper/pluginutils/catalog"
|
|
"github.com/hashicorp/nomad/helper/pluginutils/singleton"
|
|
"github.com/hashicorp/nomad/helper/testlog"
|
|
testing "github.com/mitchellh/go-testing-interface"
|
|
)
|
|
|
|
// TestClient creates an in-memory client for testing purposes and returns a
|
|
// cleanup func to shutdown the client and remove the alloc and state dirs.
|
|
//
|
|
// There is no need to override the AllocDir or StateDir as they are randomized
|
|
// and removed in the returned cleanup function. If they are overridden in the
|
|
// callback then the caller still must run the returned cleanup func.
|
|
func TestClient(t testing.T, cb func(c *config.Config)) (*Client, func() error) {
|
|
conf, cleanup := config.TestClientConfig(t)
|
|
|
|
// Tighten the fingerprinter timeouts (must be done in client package
|
|
// to avoid circular dependencies)
|
|
if conf.Options == nil {
|
|
conf.Options = make(map[string]string)
|
|
}
|
|
conf.Options[fingerprint.TightenNetworkTimeoutsConfig] = "true"
|
|
|
|
logger := testlog.HCLogger(t)
|
|
conf.Logger = logger
|
|
|
|
if cb != nil {
|
|
cb(conf)
|
|
}
|
|
|
|
// Set the plugin loaders
|
|
if conf.PluginLoader == nil {
|
|
conf.PluginLoader = catalog.TestPluginLoaderWithOptions(t, "", conf.Options, nil)
|
|
}
|
|
if conf.PluginSingletonLoader == nil {
|
|
conf.PluginSingletonLoader = singleton.NewSingletonLoader(logger, conf.PluginLoader)
|
|
}
|
|
mockCatalog := agentconsul.NewMockCatalog(logger)
|
|
mockService := consulapi.NewMockConsulServiceClient(t, logger)
|
|
client, err := NewClient(conf, mockCatalog, nil, mockService)
|
|
if err != nil {
|
|
cleanup()
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
return client, func() error {
|
|
ch := make(chan error)
|
|
|
|
go func() {
|
|
defer close(ch)
|
|
|
|
// Shutdown client
|
|
err := client.Shutdown()
|
|
if err != nil {
|
|
ch <- fmt.Errorf("failed to shutdown client: %v", err)
|
|
}
|
|
|
|
// Call TestClientConfig cleanup
|
|
cleanup()
|
|
}()
|
|
|
|
select {
|
|
case e := <-ch:
|
|
return e
|
|
case <-time.After(1 * time.Minute):
|
|
return fmt.Errorf("timed out while shutting down client")
|
|
}
|
|
}
|
|
}
|