From fcb869b37b5110fbf198e59ae0dbdbea14d3e14e Mon Sep 17 00:00:00 2001
From: Drew Bailey <2614075+drewbailey@users.noreply.github.com>
Date: Fri, 31 Jul 2020 10:33:21 -0400
Subject: [PATCH] ignore VAULT_NAMESPACE (#8581)

VAULT_NAMESPACE in 0.12.1 and previous versions is already ignored. \n revert change that used it as a default since it will break oss users
---
 command/job_run.go                              |  8 +-------
 website/pages/docs/upgrade/upgrade-specific.mdx | 10 ----------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/command/job_run.go b/command/job_run.go
index 3ad750c53..e64966163 100644
--- a/command/job_run.go
+++ b/command/job_run.go
@@ -103,8 +103,7 @@ Run Options:
 
   -vault-namespace
     If set, the passed Vault namespace is stored in the job before sending to the
-    Nomad servers. This overrides the namespace found in $VAULT_NAMESPACE environment
-    variable and that found in the job.
+    Nomad servers.
 
   -verbose
     Display full information.
@@ -220,11 +219,6 @@ func (c *JobRunCommand) Run(args []string) int {
 		job.VaultToken = helper.StringToPtr(vaultToken)
 	}
 
-	// Parse the Vault namespace
-	if vaultNamespace == "" {
-		vaultNamespace = os.Getenv("VAULT_NAMESPACE")
-	}
-
 	if vaultNamespace != "" {
 		job.VaultNamespace = helper.StringToPtr(vaultNamespace)
 	}
diff --git a/website/pages/docs/upgrade/upgrade-specific.mdx b/website/pages/docs/upgrade/upgrade-specific.mdx
index 3d3b31576..d26629a65 100644
--- a/website/pages/docs/upgrade/upgrade-specific.mdx
+++ b/website/pages/docs/upgrade/upgrade-specific.mdx
@@ -15,16 +15,6 @@ details provided for their upgrades as a result of new features or changed
 behavior. This page is used to document those details separately from the
 standard upgrade flow.
 
-## Nomad 0.12.2
-
-### Vault Namespace Environment Variable
-
-Nomad 0.12.2 allows Enterprise users to specify a Vault Namespace for a
-particular Job, Group, or Task. Before Nomad 0.12.2 the `VAULT_NAMESPACE`
-environment variable was ignored when submitting jobs. Nomad 0.12.2 changes the
-functionality and uses the `VAULT_NAMESPACE` environment variable when
-submitting jobs.
-
 ## Nomad 0.12.0
 
 ### Enterprise Licensing