Oss license support for ent builds (#8054)

* changes necessary to support oss licesning shims

revert nomad fmt changes

update test to work with enterprise changes

update tests to work with new ent enforcements

make check

update cas test to use scheduler algorithm

back out preemption changes

add comments

* remove unused method
This commit is contained in:
Drew Bailey
2020-05-27 13:46:52 -04:00
committed by GitHub
parent 5453e84ca3
commit 7fc495e30e
27 changed files with 953 additions and 85 deletions

View File

@@ -59,6 +59,9 @@ type Agent struct {
httpLogger log.Logger
logOutput io.Writer
// EnterpriseAgent holds information and methods for enterprise functionality
EnterpriseAgent *EnterpriseAgent
// consulService is Nomad's custom Consul client for managing services
// and checks.
consulService *consul.ServiceClient
@@ -121,6 +124,7 @@ func NewAgent(config *Config, logger log.InterceptLogger, logOutput io.Writer, i
if err := a.setupClient(); err != nil {
return nil, err
}
if err := a.setupEnterpriseAgent(logger); err != nil {
return nil, err
}