Browse Source

http: add PrimaryDatacenter to the /v1/agent/self response

This field is available in DebugConfig, but that field is not stable and could change at any time.

The consul-k8s needs to be able to detect the primary DC for tests, so adding this field to the
stable part of the API response.
pull/10378/head
Daniel Nephin 4 years ago
parent
commit
3726cb52c7
  1. 26
      agent/agent_endpoint.go

26
agent/agent_endpoint.go

@ -74,19 +74,21 @@ func (s *HTTPHandlers) AgentSelf(resp http.ResponseWriter, req *http.Request) (i
} }
config := struct { config := struct {
Datacenter string Datacenter string
NodeName string PrimaryDatacenter string
NodeID string NodeName string
Revision string NodeID string
Server bool Revision string
Version string Server bool
Version string
}{ }{
Datacenter: s.agent.config.Datacenter, Datacenter: s.agent.config.Datacenter,
NodeName: s.agent.config.NodeName, PrimaryDatacenter: s.agent.config.PrimaryDatacenter,
NodeID: string(s.agent.config.NodeID), NodeName: s.agent.config.NodeName,
Revision: s.agent.config.Revision, NodeID: string(s.agent.config.NodeID),
Server: s.agent.config.ServerMode, Revision: s.agent.config.Revision,
Version: s.agent.config.Version, Server: s.agent.config.ServerMode,
Version: s.agent.config.Version,
} }
return Self{ return Self{
Config: config, Config: config,

Loading…
Cancel
Save