backport of commit 0bfecd1

hashicorp · Jun 22, 2023 · 5f86968 · 5f86968
1 parent 4141f6f
commit 5f86968
Show file tree

Hide file tree

Showing 984 changed files with 32,871 additions and 85,457 deletions.
diff --git a/.changelog/1808.txt b/.changelog/1808.txt
diff --git a/.changelog/1920.txt b/.changelog/1920.txt
diff --git a/.changelog/1953.txt b/.changelog/1953.txt
diff --git a/.changelog/1975.txt b/.changelog/1975.txt
@@ -0,0 +1,11 @@
+```release-note:security
+upgrade to use Go 1.19.6. This resolves vulnerabilities CVE-2022-41724 in crypto/tls and CVE-2022-41723 in net/http.
+```
+
+```release-note:improvement
+cli: update minimum go version for project to 1.19.
+```
+
+```release-note:improvement
+control-plane: update minimum go version for project to 1.19.
+```
diff --git a/.changelog/2013.txt b/.changelog/2013.txt
diff --git a/.changelog/2029.txt b/.changelog/2029.txt
diff --git a/.changelog/2030.txt b/.changelog/2030.txt
diff --git a/.changelog/2048.txt b/.changelog/2048.txt
diff --git a/.changelog/2068.txt b/.changelog/2068.txt
diff --git a/.changelog/2075.txt b/.changelog/2075.txt
diff --git a/.changelog/2078.txt b/.changelog/2078.txt
diff --git a/.changelog/2083.txt b/.changelog/2083.txt
diff --git a/.changelog/2086.txt b/.changelog/2086.txt
diff --git a/.changelog/2093.txt b/.changelog/2093.txt
diff --git a/.changelog/2097.txt b/.changelog/2097.txt
diff --git a/.changelog/2098.txt b/.changelog/2098.txt
diff --git a/.changelog/2100.txt b/.changelog/2100.txt
diff --git a/.changelog/2102.txt → .changelog/2110.txt b/.changelog/2102.txt → .changelog/2110.txt
@@ -1,5 +1,5 @@
 ```release-note:security
-Upgrade to use Go 1.20.4.
+Upgrade to use Go 1.19.9.
 This resolves vulnerabilities [CVE-2023-24537](https://github.com/advisories/GHSA-9f7g-gqwh-jpf5)(`go/scanner`),
 [CVE-2023-24538](https://github.com/advisories/GHSA-v4m2-x4rp-hv22)(`html/template`),
 [CVE-2023-24534](https://github.com/advisories/GHSA-8v5j-pwr7-w5f8)(`net/textproto`) and
@@ -9,13 +9,4 @@ Also, `golang.org/x/net` has been updated to v0.7.0 to resolve CVEs [CVE-2022-41
 ), [CVE-2022-27664](https://github.com/advisories/GHSA-69cg-p879-7622) and [CVE-2022-41723
 ](https://github.com/advisories/GHSA-vvpx-j8f3-3w6h
 .)
-```
-
-```release-note:improvement
-cli: update minimum go version for project to 1.20.
-```
-
-```release-note:improvement
-control-plane: update minimum go version for project to 1.20.
-```
-
+```
diff --git a/.changelog/2124.txt b/.changelog/2124.txt
diff --git a/.changelog/2134.txt b/.changelog/2134.txt
diff --git a/.changelog/2143.txt b/.changelog/2143.txt
diff --git a/.changelog/2152.txt b/.changelog/2152.txt
diff --git a/.changelog/2156.txt b/.changelog/2156.txt
diff --git a/.changelog/2165.txt b/.changelog/2165.txt
diff --git a/.changelog/2166.txt b/.changelog/2166.txt
diff --git a/.changelog/2170.txt b/.changelog/2170.txt
diff --git a/.changelog/2176.txt b/.changelog/2176.txt
diff --git a/.changelog/2183.txt b/.changelog/2183.txt
diff --git a/.changelog/2195.txt b/.changelog/2195.txt
diff --git a/.changelog/2205.txt b/.changelog/2205.txt
diff --git a/.changelog/2209.txt b/.changelog/2209.txt
diff --git a/.changelog/2213.txt b/.changelog/2213.txt
diff --git a/.changelog/2265.txt b/.changelog/2265.txt
diff --git a/.changelog/2266.txt b/.changelog/2266.txt
diff --git a/.changelog/2293.txt b/.changelog/2293.txt
diff --git a/.changelog/2304.txt b/.changelog/2304.txt
diff --git a/.changelog/2310.txt b/.changelog/2310.txt
diff --git a/.changelog/2346.txt b/.changelog/2346.txt
diff --git a/.changelog/2357.txt b/.changelog/2357.txt
diff --git a/.changelog/2390.txt b/.changelog/2390.txt
diff --git a/.copywrite.hcl b/.copywrite.hcl
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,11 +1,5 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 blank_issues_enabled: false
 contact_links:
-  - name: Consul Community Support
-    url: https://discuss.hashicorp.com/c/consul/29
-    about: If you have a question or are looking for advice on Consul K8s, please post on our Discuss forum! The community loves to chime in to help. Happy Coding!
   - name: Consul on Kubernetes Learn Tutorials
     url: https://learn.hashicorp.com/collections/consul/kubernetes
     about: Please check out our Learn Tutorials. These hands on tutorials deal with many of the tasks common to using Consul on Kubernetes.
diff --git a/.github/workflows/backport-checker.yml b/.github/workflows/backport-checker.yml
@@ -1,5 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-
 # This workflow checks that there is either a 'pr/no-backport' label applied to a PR
 # or there is a backport/<pr number>.txt file associated with a PR for a backport label
 

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -1,10 +1,8 @@
-# Copyright (c) HashiCorp, Inc.
-
 ---
 name: Backport Assistant Runner
 
 on:
-  pull_request_target:
+  pull_request:
     types:
       - closed
       - labeled
@@ -13,7 +11,7 @@ jobs:
   backport:
     if: github.event.pull_request.merged
     runs-on: ubuntu-latest
-    container: hashicorpdev/backport-assistant:0.3.4
+    container: hashicorpdev/backport-assistant:0.3.3
     steps:
       - name: Run Backport Assistant
         run: backport-assistant backport -merge-method=squash -gh-automerge