Backport: Set namespace for template server in agent (#10757) (#10784)

* Add list peers to DR secondaries (#10746) * Fix build (#10749) * Move the declaration to a OSS build tag file to not have it collide w… (#10750) * Move the declaration to a OSS build tag file to not have it collide with ent declarations * Add comment * Remove comment to trigger ci * Fix remove peers check (#10758) * Remove peer DR op token check only on secondaries (#10765) * Set namespace for template server in agent (#10757) * Set namespace for template server in agent * cl++
hashicorp · Jan 26, 2021 · b11e9e9 · b11e9e9
1 parent c685147
commit b11e9e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/changelog/10757.txt b/changelog/10757.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+agent: Set namespace for template server in agent.
+```
diff --git a/command/agent.go b/command/agent.go
@@ -370,6 +370,7 @@ func (c *AgentCommand) Run(args []string) int {
 		// Check if a default namespace has been set
 		mountPath := config.AutoAuth.Method.MountPath
 		if cns := config.AutoAuth.Method.Namespace; cns != "" {
+			namespace = cns
 			// Only set this value if the env var is empty, otherwise we end up with a nested namespace
 			if ens := os.Getenv(api.EnvVaultNamespace); ens == "" {
 				mountPath = path.Join(cns, mountPath)