luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #8868 from hashicorp/b-missing-ErrMultipleNamespaces 

moved shared variable into shared-build file
This commit is contained in:
Chris Baker 2020-09-10 21:04:23 -05:00 committed by GitHub
parent 572ae37856 d0cc0a768b
commit 4e3c8ebc12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nomad/job_endpoint.go
View File

@ -34,6 +34,9 @@ const (
DispatchPayloadSizeLimit = 16 * 1024
)
// ErrMultipleNamespaces is send when multiple namespaces are used in the OSS setup
var ErrMultipleNamespaces = errors.New("multiple Vault namespaces requires Nomad Enterprise")
var (
// allowRescheduleTransition is the transition that allows failed
// allocations to be force rescheduled. We create a one off

4
nomad/job_endpoint_oss.go
View File

@ -3,7 +3,6 @@
package nomad
import (
"errors"
"fmt"
"strings"
@ -11,9 +10,6 @@ import (
vapi "github.com/hashicorp/vault/api"
)
// ErrMultipleNamespaces is send when multiple namespaces are used in the OSS setup
var ErrMultipleNamespaces = errors.New("multiple vault namespaces requires Nomad Enterprise")
// enforceSubmitJob is used to check any Sentinel policies for the submit-job scope
func (j *Job) enforceSubmitJob(override bool, job *structs.Job) (error, error) {
return nil, nil