backport of commit 8a228c9

hashicorp · Aug 29, 2023 · fa82aec · fa82aec
1 parent 42e4b7d
commit fa82aec
Show file tree

Hide file tree

Showing 987 changed files with 4,349 additions and 64,141 deletions.
diff --git a/.changelog/1914.txt b/.changelog/1914.txt
diff --git a/.changelog/1920.txt b/.changelog/1920.txt
diff --git a/.changelog/1976.txt b/.changelog/1976.txt
@@ -0,0 +1,3 @@
+```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.
+```
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/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/2108.txt b/.changelog/2102.txt → .changelog/2108.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/2140.txt b/.changelog/2140.txt
@@ -0,0 +1,4 @@
+```release-note:improvement
+helm: update `imageConsulDataplane` value to `hashicorp/consul-dataplane:1.0.2`, `image` value to `hashicorp/consul:1.14.7`, 
+and `imageEnvoy` to `envoyproxy/envoy:v1.24.7`.
+```
diff --git a/.changelog/2143.txt b/.changelog/2143.txt
diff --git a/.changelog/2152.txt b/.changelog/2152.txt
diff --git a/.changelog/2159.txt b/.changelog/2159.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/2184.txt b/.changelog/2184.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/2225.txt b/.changelog/2225.txt
@@ -0,0 +1,3 @@
+```release-note:security
+Bump `controller-runtime` to address CVEs in dependencies.
+```
diff --git a/.changelog/2265.txt b/.changelog/2265.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/2302.txt b/.changelog/2302.txt
@@ -9,5 +9,4 @@ Add support to provide the logLevel flag via helm for multiple low level compone
 7. `meshGateway.logLevel`
 8. `ingressGateways.logLevel`
 9. `terminatingGateways.logLevel`
-10. `telemetryCollector.logLevel`
 ```
diff --git a/.changelog/2304.txt b/.changelog/2304.txt
diff --git a/.changelog/2346.txt b/.changelog/2346.txt
diff --git a/.changelog/2413.txt b/.changelog/2413.txt
diff --git a/.changelog/2420.txt b/.changelog/2420.txt
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/.changelog/2597.txt b/.changelog/2597.txt
diff --git a/.changelog/2642.txt → .changelog/2650.txt b/.changelog/2642.txt → .changelog/2650.txt
@@ -1,4 +1,4 @@
 ```release-note:security
-Upgrade to use Go 1.20.6 and `x/net/http` 0.12.0.
+Upgrade to use Go 1.19.11 and `x/net/http` 0.12.0.
 This resolves [CVE-2023-29406](https://github.com/advisories/GHSA-f8f7-69v5-w4vx)(`net/http`).
 ```
diff --git a/.changelog/2678.txt b/.changelog/2678.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+helm: do not set container securityContexts by default on OpenShift < 4.11
+```
diff --git a/.changelog/2707.txt b/.changelog/2707.txt
diff --git a/.changelog/2711.txt b/.changelog/2711.txt
diff --git a/.changelog/2710.txt → .changelog/2717.txt b/.changelog/2710.txt → .changelog/2717.txt
@@ -1,5 +1,5 @@
 ```release-note:security
-Upgrade to use Go 1.20.7 and `x/net` 0.13.0.
+Upgrade to use Go 1.19.12 and `x/net` 0.13.0.
 This resolves [CVE-2023-29409](https://nvd.nist.gov/vuln/detail/CVE-2023-29409)(`crypto/tls`) 
 and [CVE-2023-3978](https://nvd.nist.gov/vuln/detail/CVE-2023-3978)(`net/html`).
 ```
diff --git a/.changelog/2723.txt b/.changelog/2723.txt
diff --git a/.changelog/2735.txt b/.changelog/2735.txt
diff --git a/.changelog/2743.txt b/.changelog/2743.txt
diff --git a/.changelog/2748.txt b/.changelog/2748.txt
diff --git a/.changelog/2782.txt b/.changelog/2782.txt
diff --git a/.changelog/2784.txt b/.changelog/2784.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,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