backport of commit 3810663

hashicorp · Aug 2, 2023 · e046ce6 · e046ce6
1 parent a33001f
commit e046ce6
Show file tree

Hide file tree

Showing 8,037 changed files with 88,512 additions and 248,215 deletions.
diff --git a/.changelog/13023.txt b/.changelog/13023.txt
diff --git a/.changelog/15654.txt b/.changelog/15654.txt
diff --git a/.changelog/15987.txt b/.changelog/15987.txt
diff --git a/.changelog/16224.txt b/.changelog/16224.txt
diff --git a/.changelog/16251.txt b/.changelog/16251.txt
diff --git a/.changelog/16259.txt b/.changelog/16259.txt
diff --git a/.changelog/16262.txt b/.changelog/16262.txt
diff --git a/.changelog/16266.txt b/.changelog/16266.txt
diff --git a/.changelog/16292.txt b/.changelog/16292.txt
diff --git a/.changelog/16298.txt b/.changelog/16298.txt
diff --git a/.changelog/16412.txt b/.changelog/16412.txt
diff --git a/.changelog/16428.txt b/.changelog/16428.txt
diff --git a/.changelog/16519.txt b/.changelog/16519.txt
diff --git a/.changelog/16577.txt b/.changelog/16577.txt
diff --git a/.changelog/16651.txt b/.changelog/16651.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+gateway: **(Enterprise only)** Fix bug where namespace/partition would fail to unmarshal.
+```
diff --git a/.changelog/16673.txt → .changelog/16675.txt b/.changelog/16673.txt → .changelog/16675.txt
diff --git a/.changelog/16871.txt b/.changelog/16871.txt
diff --git a/.changelog/16877.txt b/.changelog/16877.txt
diff --git a/.changelog/16957.txt b/.changelog/16957.txt
diff --git a/.changelog/17035.txt b/.changelog/17035.txt
diff --git a/.changelog/17066.txt b/.changelog/17066.txt
diff --git a/.changelog/17075.txt b/.changelog/17075.txt
diff --git a/.changelog/17086.txt b/.changelog/17086.txt
diff --git a/.changelog/17138.txt b/.changelog/17138.txt
diff --git a/.changelog/17155.txt b/.changelog/17155.txt
diff --git a/.changelog/17183.txt b/.changelog/17183.txt
diff --git a/.changelog/17424.txt b/.changelog/17424.txt
diff --git a/.changelog/17452.txt b/.changelog/17452.txt
diff --git a/.changelog/17481.txt b/.changelog/17481.txt
diff --git a/.changelog/17487.txt b/.changelog/17487.txt
diff --git a/.changelog/17495.txt b/.changelog/17495.txt
diff --git a/.changelog/17505.txt b/.changelog/17505.txt
diff --git a/.changelog/17525.txt b/.changelog/17525.txt
diff --git a/.changelog/17545.txt b/.changelog/17545.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+connect: update supported envoy versions to 1.22.11, 1.23.9, 1.24.7, 1.25.6
+```
diff --git a/.changelog/17546.txt b/.changelog/17546.txt
diff --git a/.changelog/17636.txt b/.changelog/17636.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+cache: fix a few minor goroutine leaks in leaf certs and the agent cache
+```
diff --git a/.changelog/17694.txt b/.changelog/17694.txt
diff --git a/.changelog/17719.txt b/.changelog/17719.txt
diff --git a/.changelog/17754.txt b/.changelog/17754.txt
diff --git a/.changelog/17755.txt b/.changelog/17755.txt
diff --git a/.changelog/17757.txt b/.changelog/17757.txt
diff --git a/.changelog/17759.txt b/.changelog/17759.txt
diff --git a/.changelog/17775.txt b/.changelog/17775.txt
diff --git a/.changelog/17831.txt b/.changelog/17831.txt
diff --git a/.changelog/17911.txt b/.changelog/17911.txt
diff --git a/.changelog/17939.txt b/.changelog/17939.txt
diff --git a/.changelog/17978.txt b/.changelog/17978.txt
diff --git a/.changelog/18007.txt b/.changelog/18007.txt
diff --git a/.changelog/18068.txt b/.changelog/18068.txt
diff --git a/.changelog/18112.txt b/.changelog/18112.txt
diff --git a/.changelog/18184.txt b/.changelog/18184.txt
diff --git a/.changelog/18300.txt b/.changelog/18300.txt
diff --git a/.changelog/18304.txt b/.changelog/18304.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+connect: update supported envoy versions to 1.22.11, 1.23.12, 1.24.10, 1.25.9
+```
diff --git a/.changelog/18325.txt b/.changelog/18325.txt
diff --git a/.changelog/18358.txt b/.changelog/18358.txt
@@ -0,0 +1,7 @@
+```release-note:security
+Upgrade to use Go 1.20.7.
+This resolves vulnerability [CVE-2023-29409](https://nvd.nist.gov/vuln/detail/CVE-2023-29409)(`crypto/tls`).
+```
+```release-note:security
+Update `golang.org/x/net` to v0.13.0 to address [CVE-2023-3978](https://nvd.nist.gov/vuln/detail/CVE-2023-3978).
+```
diff --git a/.changelog/18558.txt b/.changelog/18558.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+check: prevent go routine leakage when existing Defercheck of same check id is not nil
+```
diff --git a/.changelog/18584.txt b/.changelog/18584.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+Reduce the frequency of metric exports from Consul to HCP from every 10s to every 1m
+```
diff --git a/.changelog/4633.txt b/.changelog/4633.txt
diff --git a/.changelog/5200.txt b/.changelog/5200.txt
diff --git a/.changelog/_4734.txt b/.changelog/_4734.txt
diff --git a/.changelog/_4821.txt b/.changelog/_4821.txt
diff --git a/.changelog/_5669.txt b/.changelog/_5669.txt
diff --git a/.changelog/_5740.txt b/.changelog/_5740.txt
diff --git a/.changelog/_5750.txt b/.changelog/_5750.txt
diff --git a/.changelog/_5805.txt b/.changelog/_5805.txt
diff --git a/.copywrite.hcl b/.copywrite.hcl
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -8,3 +8,34 @@
 # release configuration
 /.release/                              @hashicorp/release-engineering @hashicorp/github-consul-core
 /.github/workflows/build.yml            @hashicorp/release-engineering @hashicorp/github-consul-core
+
+
+# Staff Engineer Review (protocol buffer definitions)
+/proto-public/   @hashicorp/consul-core-staff
+/proto/          @hashicorp/consul-core-staff
+
+# Staff Engineer Review (v1 architecture shared components)
+/agent/cache/                  @hashicorp/consul-core-staff
+/agent/consul/fsm/             @hashicorp/consul-core-staff
+/agent/consul/leader*.go       @hashicorp/consul-core-staff
+/agent/consul/server*.go       @hashicorp/consul-core-staff
+/agent/consul/state/           @hashicorp/consul-core-staff
+/agent/consul/stream/          @hashicorp/consul-core-staff
+/agent/submatview/             @hashicorp/consul-core-staff
+/agent/blockingquery/          @hashicorp/consul-core-staff
+
+# Staff Engineer Review (raft/autopilot)
+/agent/consul/autopilotevents/  @hashicorp/consul-core-staff
+/agent/consul/autopilot*.go     @hashicorp/consul-core-staff
+
+# Staff Engineer Review (v2 architecture shared components)
+/internal/controller/                   @hashicorp/consul-core-staff
+/internal/resource/                     @hashicorp/consul-core-staff
+/internal/storage/                      @hashicorp/consul-core-staff
+/agent/consul/controller/               @hashicorp/consul-core-staff
+/agent/grpc-external/services/resource/ @hashicorp/consul-core-staff
+
+# Staff Engineer Review (v1 security)
+/acl/                   @hashicorp/consul-core-staff
+/agent/xds/rbac*.go     @hashicorp/consul-core-staff
+/agent/xds/jwt*.go      @hashicorp/consul-core-staff
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -161,7 +161,8 @@ When you're ready to submit a pull request:
    | --- | --- |
    | `pr/no-changelog` | This PR does not have an intended changelog entry |
    | `pr/no-metrics-test` | This PR does not require any testing for metrics |
-   | `backport/1.12.x` | Backport the changes in this PR to the targeted release branch. Consult the [Consul Release Notes](https://www.consul.io/docs/release-notes) page to view active releases. Website documentation merged to the latest release branch is deployed immediately |
+   | `backport/stable-website` | This PR contains documentation changes that are ready to be deployed immediately. Changes will also automatically get backported to the latest release branch |
+   | `backport/1.12.x` | Backport the changes in this PR to the targeted release branch. Consult the [Consul Release Notes](https://www.consul.io/docs/release-notes) page to view active releases. |
    Other labels may automatically be added by the Github Action CI.
 7. After you submit, the Consul maintainers team needs time to carefully review your
    contribution and ensure it is production-ready, considering factors such as: security,