backport of commit ffa2fd6

hashicorp · Jul 25, 2024 · b17e311 · b17e311
1 parent 18f135e
commit b17e311
Show file tree

Hide file tree

Showing 437 changed files with 38,648 additions and 11,762 deletions.
diff --git a/.changelog/2909.txt b/.changelog/2909.txt
diff --git a/.changelog/2962.txt b/.changelog/2962.txt
@@ -1,3 +1,3 @@
-```release-note:feature
+```releast-note:feature
 api-gateway: (Consul Enterprise) Add JWT authentication and authorization for API Gateway and HTTPRoutes.
 ```
diff --git a/.changelog/3000.txt b/.changelog/3000.txt
diff --git a/.changelog/3116.txt → .changelog/3118.txt b/.changelog/3116.txt → .changelog/3118.txt
diff --git a/.changelog/3184.txt b/.changelog/3184.txt
diff --git a/.changelog/3418.txt b/.changelog/3418.txt
@@ -1,3 +1,3 @@
 ```release-note:security
-Upgrade OpenShift container images to use `ubi9-minimal:9.3` as the base image.
+Upgrade OpenShift container images to use `ubi-minimal:9.3` as the base image.
 ```
diff --git a/.changelog/3635.txt b/.changelog/3635.txt
diff --git a/.changelog/3668.txt b/.changelog/3668.txt
@@ -1,3 +1,3 @@
 ```release-note:improvement
-control-plane: publish `consul-k8s-control-plane` and `consul-k8s-control-plane-fips` images to official HashiCorp AWS ECR. 
-```
+ control-plane: publish `consul-k8s-control-plane` and `consul-k8s-control-plane-fips` images to official HashiCorp AWS ECR. 
+ ```
diff --git a/.changelog/3675.txt b/.changelog/3675.txt
diff --git a/.changelog/3685.txt b/.changelog/3685.txt
diff --git a/.changelog/3718.txt b/.changelog/3718.txt
diff --git a/.changelog/3767.txt b/.changelog/3767.txt
diff --git a/.changelog/3795.txt b/.changelog/3795.txt
diff --git a/.changelog/3811.txt b/.changelog/3811.txt
diff --git a/.changelog/3829.txt b/.changelog/3829.txt
diff --git a/.changelog/3893.txt → .changelog/3902.txt b/.changelog/3893.txt → .changelog/3902.txt
diff --git a/.changelog/3943.txt b/.changelog/3943.txt
diff --git a/.changelog/3959.txt b/.changelog/3959.txt
diff --git a/.changelog/3991.txt b/.changelog/3991.txt
diff --git a/.changelog/4003.txt → .changelog/4001.txt b/.changelog/4003.txt → .changelog/4001.txt
diff --git a/.changelog/4040.txt b/.changelog/4040.txt
diff --git a/.changelog/4152.txt b/.changelog/4152.txt
diff --git a/.changelog/4153.txt b/.changelog/4153.txt
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,13 +1,14 @@
-### Changes proposed in this PR ###  
+Changes proposed in this PR:
 -
 -
 
-### How I've tested this PR ###
+How I've tested this PR:
 
+How I expect reviewers to test this PR:
 
-### How I expect reviewers to test this PR ###
 
-
-### Checklist ###
+Checklist:
 - [ ] Tests added
 - [ ] [CHANGELOG entry added](https://github.com/hashicorp/consul-k8s/blob/main/CONTRIBUTING.md#adding-a-changelog-entry) 
+
+
diff --git a/.github/scripts/skip_check_ci.sh b/.github/scripts/skip_check_ci.sh