backport of commit da61d27

hashicorp · Nov 16, 2023 · 43b348d · 43b348d
1 parent 18e22e6
commit 43b348d
Show file tree

Hide file tree

Showing 3,555 changed files with 30,239 additions and 49,109 deletions.
diff --git a/.changelog/11572.txt b/.changelog/11572.txt
@@ -1,5 +1,5 @@
 ```release-note:breaking-change
-raft: The default raft protocol version is now 3 so you must follow the [Upgrading to Raft Protocol 3](https://developer.hashicorp.com/nomad/docs/upgrade#upgrading-to-raft-protocol-3) guide when upgrading an existing cluster to Nomad 1.3.0. Downgrading the raft protocol version is not supported.
+raft: The default raft protocol version is now 3 so you must follow the [Upgrading to Raft Protocol 3](https://www.nomadproject.io/docs/upgrade#upgrading-to-raft-protocol-3) guide when upgrading an existing cluster to Nomad 1.3.0. Downgrading the raft protocol version is not supported.
 ```
 
 ```release-note:improvement

diff --git a/.changelog/15617.txt b/.changelog/15617.txt
diff --git a/.changelog/15618.txt b/.changelog/15618.txt
diff --git a/.changelog/16872.txt b/.changelog/16872.txt
diff --git a/.changelog/17383.txt b/.changelog/17383.txt
diff --git a/.changelog/18035.txt b/.changelog/18035.txt
diff --git a/.changelog/18069.txt b/.changelog/18069.txt
diff --git a/.changelog/18070.txt b/.changelog/18070.txt
diff --git a/.changelog/18123.txt b/.changelog/18123.txt
diff --git a/.changelog/18146.txt b/.changelog/18146.txt
diff --git a/.changelog/18262.txt b/.changelog/18262.txt
diff --git a/.changelog/18371.txt b/.changelog/18371.txt
diff --git a/.changelog/18426.txt b/.changelog/18426.txt
diff --git a/.changelog/18520.txt b/.changelog/18520.txt
diff --git a/.changelog/18553.txt b/.changelog/18553.txt
diff --git a/.changelog/18562.txt b/.changelog/18562.txt
diff --git a/.changelog/18595.txt b/.changelog/18595.txt
diff --git a/.changelog/18681.txt b/.changelog/18681.txt
diff --git a/.changelog/18691.txt b/.changelog/18691.txt
diff --git a/.changelog/18745.txt b/.changelog/18745.txt
diff --git a/.changelog/18794.txt b/.changelog/18794.txt
diff --git a/.changelog/18836.txt b/.changelog/18836.txt
diff --git a/.changelog/18843.txt b/.changelog/18843.txt
diff --git a/.changelog/18873.txt b/.changelog/18873.txt
@@ -1,3 +1,3 @@
 ```release-note:bug
-scheduler: Ensure duplicate allocation indexes are tracked and fixed when performing job updates
+scheduler: Ensure duplicate allocation IDs are tracked and fixed when performing job updates
 ```
diff --git a/.changelog/18882.txt b/.changelog/18882.txt
diff --git a/.changelog/18943.txt b/.changelog/18943.txt
diff --git a/.changelog/18961.txt b/.changelog/18961.txt
diff --git a/.changelog/18996.txt b/.changelog/18996.txt
diff --git a/.changelog/19037.txt b/.changelog/19037.txt
diff --git a/.changelog/19051.txt b/.changelog/19051.txt
diff --git a/.changelog/19104.txt b/.changelog/19104.txt
diff --git a/.changelog/5311.txt b/.changelog/5311.txt
diff --git a/.copywrite.hcl b/.copywrite.hcl
@@ -1,16 +1,11 @@
 # Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
+# SPDX-License-Identifier: MPL-2.0
 
 schema_version = 1
 
 project {
   header_ignore = [
     "command/asset/*.hcl",
     "command/agent/bindata_assetfs.go",
-    "ui/node_modules",
-
-    // 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/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,7 +9,7 @@ Hi there,
 
 Thank you for opening an issue. Please note that we try to keep the Nomad issue
 tracker reserved for bug reports and feature requests. For general usage
-questions, please see: https://developer.hashicorp.com/nomad/community
+questions, please see: https://www.nomadproject.io/community
 
 -->
 

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 # Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
+# SPDX-License-Identifier: MPL-2.0
 
 blank_issues_enabled: false
 contact_links:

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -9,7 +9,7 @@ Hi there,
 
 Thank you for opening an issue. Please note that we try to keep the Nomad issue
 tracker reserved for bug reports and feature requests. For general usage
-questions, please see: https://developer.hashicorp.com/nomad/community
+questions, please see: https://www.nomadproject.io/community
 
 -->
 

diff --git a/.github/actionlint.yml b/.github/actionlint.yml
@@ -1,5 +1,5 @@
 # Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
+# SPDX-License-Identifier: MPL-2.0
 
 self-hosted-runner:
   # Labels of self-hosted runner in array of string

diff --git a/.github/actions/install-vault/action.yml b/.github/actions/install-vault/action.yml
@@ -1,5 +1,5 @@
 # Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
+# SPDX-License-Identifier: MPL-2.0
 
 name: install-vault
 inputs:

diff --git a/.github/actions/setup-js/action.yml b/.github/actions/setup-js/action.yml
@@ -1,5 +1,5 @@
 # Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
+# SPDX-License-Identifier: MPL-2.0
 
 name: setup-js
 description: install node and yarn, and run yarn install

diff --git a/.github/actions/vault-secrets/action.yml b/.github/actions/vault-secrets/action.yml
@@ -1,5 +1,5 @@
 # Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
+# SPDX-License-Identifier: MPL-2.0
 
 name: vault-secrets
 description: 'pull secrets from CI Vault into environment vars'

diff --git a/.github/secret-scanning.yml b/.github/secret-scanning.yml
@@ -1,5 +1,5 @@
 # Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
+# SPDX-License-Identifier: MPL-2.0
 
 paths-ignore:
   - "website/content/*"
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -11,11 +11,11 @@ jobs:
   backport:
     if: github.event.pull_request.merged
     runs-on: ubuntu-latest
-    container: hashicorpdev/backport-assistant:0.3.4
+    container: hashicorpdev/backport-assistant:0.2.3
     steps:
       - name: Backport changes to stable-website
         run: |
-          backport-assistant backport -merge-method=squash
+          backport-assistant backport -merge-method=squash -automerge
         env:
           BACKPORT_LABEL_REGEXP: "backport/(?P<target>website)"
           BACKPORT_TARGET_TEMPLATE: "stable-{{.target}}"
@@ -24,7 +24,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
       - name: Backport changes to targeted release branch
         run: |
-          backport-assistant backport -merge-method=squash
+          backport-assistant backport -merge-method=squash -automerge
         env:
           BACKPORT_LABEL_REGEXP: "backport/(?P<target>\\d+\\.\\d+\\.[+\\w]+)"
           BACKPORT_TARGET_TEMPLATE: "release/{{.target}}"

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -207,7 +207,7 @@ jobs:
           version: ${{ needs.get-product-version.outputs.product-version }}
           maintainer: "HashiCorp"
           homepage: "https://github.com/hashicorp/nomad"
-          license: "BUSL-1.1"
+          license: "MPL-2.0"
           binary: "pkg/${{ matrix.goos }}_${{ matrix.goarch }}/${{ env.PKG_NAME }}"
           deb_depends: "openssl"
           rpm_depends: "openssl"

diff --git a/.github/workflows/copywrite.yml b/.github/workflows/copywrite.yml
diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml
@@ -9,14 +9,13 @@ jobs:
   semgrep:
     name: Semgrep Scan
     runs-on: ubuntu-latest
-    container:
-      image: returntocorp/semgrep:1.36.0
     env:
       SEMGREP_SEND_METRICS: 0
     # Skip any PR created by dependabot to avoid permission issues
     if: (github.actor != 'dependabot[bot]')
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - run: semgrep ci --config=.semgrep/
+      - uses: returntocorp/semgrep-action@245bf11ddb2f3d4e35f116608cf6e27ae0f9aa04 # v1
 permissions:
   contents: read
+
diff --git a/.github/workflows/test-core.yaml b/.github/workflows/test-core.yaml
@@ -63,8 +63,8 @@ jobs:
       - uses: hashicorp/setup-golang@v1
       - name: Get Go modules
         run: |
-          make bootstrap
           make tidy
+          make bootstrap
   checks:
     uses: ./.github/workflows/checks.yaml
     needs: [mods]

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -35,7 +35,7 @@ on:
       - 'website/**'
 
 jobs:
-  test-e2e-vault:
+  test-e2e:
     runs-on: ${{ endsWith(github.repository, '-enterprise') && fromJSON('["self-hosted", "ondemand", "linux"]') || 'ubuntu-latest' }}
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@@ -51,22 +51,6 @@ jobs:
       - name: Vault Compatability
         run: make integration-test
       - run: make e2e-test
-
-  test-e2e-consul:
-    runs-on: 'ubuntu-22.04' # this job requires sudo, so not currently suitable for self-hosted runners
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - name: Git config token
-        if: endsWith(github.repository, '-enterprise')
-        run: git config --global url.'https://${{ secrets.ELEVATED_GITHUB_TOKEN }}@github.com'.insteadOf 'https://github.com'
-      - uses: hashicorp/setup-golang@v1
-      - name: Consul Compatability
-        run: |
-          make deps
-          sudo make cni
-          sudo sed -i 's!Defaults!#Defaults!g' /etc/sudoers
-          sudo -E env "PATH=$PATH" make integration-test-consul
-
 permissions:
   contents: read
   id-token: write
diff --git a/.github/workflows/test-ui.yml b/.github/workflows/test-ui.yml
@@ -1,15 +1,39 @@
 name: test-ui
 on:
   pull_request:
-    paths:
-      - 'ui/**'
+    paths-ignore:
+      - 'README.md'
+      - 'CHANGELOG.md'
+      - '.changelog/**'
+      - '.tours/**'
+      - 'contributing/**'
+      - 'demo/**'
+      - 'dev/**'
+      - 'e2e/**'
+      - 'integrations/**'
+      - 'pkg/**'
+      - 'scripts/**'
+      - 'terraform/**'
+      - 'website/**'
   push:
     branches:
       - main
       - release/**
       - test-ui
-    paths:
-      - 'ui/**'
+    paths-ignore:
+      - 'README.md'
+      - 'CHANGELOG.md'
+      - '.changelog/**'
+      - '.tours/**'
+      - 'contributing/**'
+      - 'demo/**'
+      - 'dev/**'
+      - 'e2e/**'
+      - 'integrations/**'
+      - 'pkg/**'
+      - 'scripts/**'
+      - 'terraform/**'
+      - 'website/**'
 
 jobs:
   pre-test:

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,5 +1,5 @@
 # Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
+# SPDX-License-Identifier: MPL-2.0
 
 run:
   # Timeout for analysis.

diff --git a/.release/ci.hcl b/.release/ci.hcl
@@ -1,5 +1,5 @@
 # Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
+# SPDX-License-Identifier: MPL-2.0
 
 schema = "1"
 

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