Skip to content

Commit

Permalink
VAULT-12542 Add info encouraging users to upgrade if agent version is…
Browse files Browse the repository at this point in the history
… different to server (#18684)

* VAULT-12542 Add info encouraging users to upgrade if agent version is different to server

* VAULT-12542 Changelog

* VAULT-12542 Language update
  • Loading branch information
VioletHynes authored and AnPucel committed Feb 3, 2023
1 parent 05b3372 commit 080d007
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
3 changes: 3 additions & 0 deletions changelog/18684.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
agent: Add note in logs when starting Vault Agent indicating if the version differs to the Vault Server.
```
13 changes: 12 additions & 1 deletion command/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ func (c *AgentCommand) Run(args []string) int {
return 0
}

// Ignore any setting of agent's address. This client is used by the agent
// Ignore any setting of Agent's address. This client is used by the Agent
// to reach out to Vault. This should never loop back to agent.
c.flagAgentAddress = ""
client, err := c.Client()
Expand All @@ -261,6 +261,17 @@ func (c *AgentCommand) Run(args []string) int {
return 1
}

serverHealth, err := client.Sys().Health()
if err == nil {
// We don't exit on error here, as this is not worth stopping Agent over
serverVersion := serverHealth.Version
agentVersion := version.GetVersion().VersionNumber()
if serverVersion != agentVersion {
c.UI.Info("==> Note: Vault Agent version does not match Vault server version. " +
fmt.Sprintf("Vault Agent version: %s, Vault server version: %s", agentVersion, serverVersion))
}
}

// ctx and cancelFunc are passed to the AuthHandler, SinkServer, and
// TemplateServer that periodically listen for ctx.Done() to fire and shut
// down accordingly.
Expand Down

0 comments on commit 080d007

Please sign in to comment.