backport of commit 855dc2a

hashicorp · Jul 25, 2023 · e0e1231 · e0e1231
1 parent 937d927
commit e0e1231
Show file tree

Hide file tree

Showing 3,690 changed files with 6,917 additions and 47,888 deletions.
diff --git a/.changelog/11041.txt b/.changelog/11041.txt
diff --git a/.changelog/13343.txt b/.changelog/13343.txt
diff --git a/.changelog/16099.txt b/.changelog/16099.txt
diff --git a/.changelog/16134.txt b/.changelog/16134.txt
diff --git a/.changelog/16221.txt b/.changelog/16221.txt
diff --git a/.changelog/16228.txt b/.changelog/16228.txt
diff --git a/.changelog/16243.txt b/.changelog/16243.txt
diff --git a/.changelog/16463.txt b/.changelog/16463.txt
diff --git a/.changelog/16743.txt b/.changelog/16743.txt
diff --git a/.changelog/16763.txt b/.changelog/16763.txt
diff --git a/.changelog/16908.txt b/.changelog/16908.txt
diff --git a/.changelog/16932.txt b/.changelog/16932.txt
diff --git a/.changelog/17010.txt b/.changelog/17010.txt
diff --git a/.changelog/17017.txt b/.changelog/17017.txt
diff --git a/.changelog/17041.txt b/.changelog/17041.txt
diff --git a/.changelog/17044.txt b/.changelog/17044.txt
diff --git a/.changelog/17045.txt b/.changelog/17045.txt
diff --git a/.changelog/17065.txt b/.changelog/17065.txt
diff --git a/.changelog/17074.txt b/.changelog/17074.txt
diff --git a/.changelog/17084.txt b/.changelog/17084.txt
diff --git a/.changelog/17138.txt b/.changelog/17138.txt
diff --git a/.changelog/17196.txt b/.changelog/17196.txt
diff --git a/.changelog/17214.txt b/.changelog/17214.txt
diff --git a/.changelog/17309.txt b/.changelog/17309.txt
diff --git a/.changelog/17334.txt b/.changelog/17334.txt
diff --git a/.changelog/17341.txt b/.changelog/17341.txt
diff --git a/.changelog/17343.txt b/.changelog/17343.txt
diff --git a/.changelog/17345.txt b/.changelog/17345.txt
diff --git a/.changelog/17354.txt b/.changelog/17354.txt
diff --git a/.changelog/17421.txt b/.changelog/17421.txt
diff --git a/.changelog/17576.txt b/.changelog/17576.txt
diff --git a/.changelog/17579.txt b/.changelog/17579.txt
diff --git a/.changelog/17645.txt b/.changelog/17645.txt
diff --git a/.changelog/17647.txt b/.changelog/17647.txt
diff --git a/.changelog/17652.txt b/.changelog/17652.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+scheduler: Fixed a bug that could cause replacements for failed allocations to be placed in the wrong datacenter during a canary deployment
+```
diff --git a/.changelog/17752.txt b/.changelog/17752.txt
diff --git a/.changelog/17754.txt b/.changelog/17754.txt
diff --git a/.changelog/17783.txt b/.changelog/17783.txt
diff --git a/.changelog/17843.txt b/.changelog/17843.txt
diff --git a/.changelog/17911.txt b/.changelog/17911.txt
diff --git a/.changelog/17915.txt b/.changelog/17915.txt
diff --git a/.changelog/17932.txt b/.changelog/17932.txt
diff --git a/.changelog/17933.txt b/.changelog/17933.txt
diff --git a/.changelog/17935.txt b/.changelog/17935.txt
diff --git a/.changelog/17938.txt b/.changelog/17938.txt
diff --git a/.changelog/18017.txt b/.changelog/18017.txt
diff --git a/.changelog/18021.txt b/.changelog/18021.txt
diff --git a/.changelog/18051.txt b/.changelog/18051.txt
diff --git a/.copywrite.hcl b/.copywrite.hcl
@@ -7,8 +7,5 @@ project {
   header_ignore = [
     "command/asset/*.hcl",
     "command/agent/bindata_assetfs.go",
-    // Enterprise files do not fall under the open source licensing. OSS-ENT
-    // merge conflicts might happen here, please be sure to put new OSS
-    // exceptions above this comment.
   ]
 }
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,5 +1,2 @@
 # This commit just fixes some typos and isn't useful
 b0a20b4dc965a38b0c843f47c16685ccad7439da
-
-# giant copywrite headers commit
-f005448366ed3e796a2f22696d8c063dff4677f8
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -80,7 +80,7 @@ jobs:
     strategy:
       matrix:
         goos: [windows]
-        goarch: ["amd64"]
+        goarch: ["386", "amd64"]
       fail-fast: true
 
     name: Go ${{ needs.get-go-version.outputs.go-version }} ${{ matrix.goos }} ${{ matrix.goarch }} build
@@ -132,7 +132,7 @@ jobs:
     strategy:
       matrix:
         goos: [linux]
-        goarch: ["arm", "arm64", "amd64"]
+        goarch: ["arm", "arm64", "386", "amd64"]
       fail-fast: true
 
     name: Go ${{ needs.get-go-version.outputs.go-version }} ${{ matrix.goos }} ${{ matrix.goarch }} build
@@ -167,7 +167,12 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y software-properties-common
+          sudo dpkg --add-architecture i386
           sudo apt-get update
+          sudo apt-get install -y \
+            libc6-dev-i386 \
+            libpcre3-dev \
+            linux-libc-dev:i386
           sudo apt-get install -y \
             binutils-aarch64-linux-gnu \
             binutils-arm-linux-gnueabihf \

diff --git a/.github/workflows/copywrite.yml b/.github/workflows/copywrite.yml
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 run:
   # Timeout for analysis.
   deadline: 10m

diff --git a/.release/linux/package/etc/nomad.d/nomad.hcl b/.release/linux/package/etc/nomad.d/nomad.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 # Full configuration options can be found at https://www.nomadproject.io/docs/configuration
 
 data_dir  = "/opt/nomad/data"

diff --git a/.release/release-metadata.hcl b/.release/release-metadata.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 url_license           = "https://github.com/hashicorp/nomad/blob/main/LICENSE"
 url_project_website   = "https://www.nomadproject.io/"
 url_source_repository = "https://github.com/hashicorp/nomad"
diff --git a/.release/security-scan.hcl b/.release/security-scan.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 container {
   secrets {
     all = false

diff --git a/.semgrep/api_errorf.yml b/.semgrep/api_errorf.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: "fmt_errorf_unformatted_use"
     patterns:

diff --git a/.semgrep/changelog.yml b/.semgrep/changelog.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   # Check `release-note` in changelog entries.
   # https://semgrep.dev/s/DyRW

diff --git a/.semgrep/fsm_time.yml b/.semgrep/fsm_time.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: "no-time-in-fsm"
     patterns:

diff --git a/.semgrep/go_tests.yml b/.semgrep/go_tests.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   # Check `require` or `assert` testify overrides.
   # https://semgrep.dev/s/PgAq

diff --git a/.semgrep/http_endpoint.yml b/.semgrep/http_endpoint.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: "http-endpoint-request-decode-error-code"
     patterns:

diff --git a/.semgrep/loopclosure.yml b/.semgrep/loopclosure.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: loopclosure
     patterns:

diff --git a/.semgrep/protect_globals.yml b/.semgrep/protect_globals.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: "no-overriding-struct-globals"
     patterns:

diff --git a/.semgrep/rpc_endpoint.yml b/.semgrep/rpc_endpoint.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   # Check potentially unauthenticated RPC endpoints. Technically more
   # authorization (authz) oriented than authn, but before Nomad 1.4/1.5 that

diff --git a/.semgrep/rpc_metrics.yml b/.semgrep/rpc_metrics.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   # Check for server RPC endpoints without metrics
   - id: "rpc-missing-metrics"

diff --git a/.semgrep/time_after.yml b/.semgrep/time_after.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: "time-after-leak"
     patterns:

diff --git a/.semgrep/ui.yml b/.semgrep/ui.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 rules:
   - id: ui-no-string-extensions
     patterns: