backport of commit 064e05a

hashicorp · Jul 12, 2023 · a43102f · a43102f
1 parent 64a1679
commit a43102f
Show file tree

Hide file tree

Showing 820 changed files with 2,292 additions and 49,194 deletions.
diff --git a/.changelog/1770.txt b/.changelog/1770.txt
diff --git a/.changelog/1914.txt b/.changelog/1914.txt
diff --git a/.changelog/1934.txt b/.changelog/1934.txt
diff --git a/.changelog/1953.txt b/.changelog/1953.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/2075.txt b/.changelog/2075.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/2100.txt b/.changelog/2100.txt
diff --git a/.changelog/2102.txt → .changelog/2104.txt b/.changelog/2102.txt → .changelog/2104.txt
@@ -10,12 +10,3 @@ Also, `golang.org/x/net` has been updated to v0.7.0 to resolve CVEs [CVE-2022-41
 ](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/2152.txt b/.changelog/2152.txt
diff --git a/.changelog/2160.txt b/.changelog/2160.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+control-plane: fix issue with json tags of service defaults fields EnforcingConsecutive5xx, MaxEjectionPercent and BaseEjectionTime.
+```
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/2183.txt b/.changelog/2183.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/2226.txt b/.changelog/2226.txt
@@ -0,0 +1,3 @@
+```release-note:security
+Bump `controller-runtime` to address CVEs in dependencies.
+```
diff --git a/.changelog/2262.txt b/.changelog/2262.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+cli: add consul-telemetry-gateway allow-all intention for -demo
+```
diff --git a/.changelog/2304.txt b/.changelog/2304.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/2265.txt → .changelog/2369.txt b/.changelog/2265.txt → .changelog/2369.txt
@@ -1,3 +1,3 @@
 ```release-note:improvement
 (Consul Enterprise) Add support to provide inputs via helm for audit log related configuration
-```
+```
diff --git a/.changelog/2476.txt b/.changelog/2476.txt
diff --git a/.changelog/2478.txt b/.changelog/2478.txt
diff --git a/.changelog/2520.txt b/.changelog/2520.txt
diff --git a/.changelog/2524.txt b/.changelog/2524.txt
diff --git a/.copywrite.hcl b/.copywrite.hcl
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 blank_issues_enabled: false
 contact_links:
   - name: Consul Community Support

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -9,6 +9,7 @@ How I expect reviewers to test this PR:
 
 Checklist:
 - [ ] Tests added
-- [ ] [CHANGELOG entry added](https://github.com/hashicorp/consul-k8s/blob/main/CONTRIBUTING.md#adding-a-changelog-entry) 
-
+- [ ] CHANGELOG entry added 
+  > HashiCorp engineers only, community PRs should not add a changelog entry.
+  > Entries should use present tense (e.g. Add support for...)
 
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,5 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-
 ---
 name: Backport Assistant Runner
 
@@ -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