From 8fba327180f3506c824b760e09eecc4450b7ed10 Mon Sep 17 00:00:00 2001
From: David Yu <dyu@hashicorp.com>
Date: Tue, 20 Feb 2024 19:46:51 -0800
Subject: [PATCH 1/3] Update build.yml

---
 .github/workflows/build.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f09ca93c32..094a2ac31c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -291,6 +291,7 @@ jobs:
           workdir: control-plane
           tags: |
             docker.io/hashicorp/${{ env.repo }}-control-plane:${{ env.version }}
+            public.ecr.aws/hashicorp/${{ env.repo }}-control-plane:${{ env.version }}
           dev_tags: |
             docker.io/hashicorppreview/${{ env.repo }}-control-plane:${{ env.full_dev_tag }}
             docker.io/hashicorppreview/${{ env.repo }}-control-plane:${{ env.full_dev_tag }}-${{ github.sha }}
@@ -318,6 +319,7 @@ jobs:
           workdir: control-plane
           tags: |
             docker.io/hashicorp/${{ env.repo }}-control-plane-fips:${{ env.version }}
+            public.ecr.aws/hashicorp/${{ env.repo }}-control-plane-fips:${{ env.version }}
           dev_tags: |
             docker.io/hashicorppreview/${{ env.repo }}-control-plane-fips:${{ env.full_dev_tag }}
             docker.io/hashicorppreview/${{ env.repo }}-control-plane-fips:${{ env.full_dev_tag }}-${{ github.sha }}
@@ -381,6 +383,7 @@ jobs:
           workdir: control-plane
           tags: |
             docker.io/hashicorp/${{ env.repo }}-control-plane:${{ env.version }}-ubi
+            public.ecr.aws/hashicorp/${{ env.repo }}-control-plane:${{ env.version }}-ubi
           dev_tags: |
             docker.io/hashicorppreview/${{ env.repo }}-control-plane:${{ env.full_dev_tag }}-ubi
             docker.io/hashicorppreview/${{ env.repo }}-control-plane:${{ env.full_dev_tag }}-ubi-${{ github.sha }}
@@ -407,6 +410,8 @@ jobs:
           pkg_name: consul-k8s-control-plane_${{ env.version }}
           bin_name: consul-k8s-control-plane
           workdir: control-plane
+          tags: 
+            public.ecr.aws/hashicorp/${{ env.repo }}-control-plane-fips:${{ env.version }}-ubi
           redhat_tag: quay.io/redhat-isv-containers/6486b1beabfc4e51588c0416:${{env.version}}-ubi # this is different than the non-FIPS one
           extra_build_args: |
             GOLANG_VERSION=${{ needs.get-go-version.outputs.go-version }}

From 9a73765ae5cfab2796201092184823c8fbf6a08f Mon Sep 17 00:00:00 2001
From: David Yu <dyu@hashicorp.com>
Date: Tue, 20 Feb 2024 19:51:50 -0800
Subject: [PATCH 2/3] Create 3668.txt

---
 .changelog/3668.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .changelog/3668.txt

diff --git a/.changelog/3668.txt b/.changelog/3668.txt
new file mode 100644
index 0000000000..2a91b3ebed
--- /dev/null
+++ b/.changelog/3668.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+control-plane: publish `consul-k8s-controlplane` and `consul-k8s-control-plane-fips` images to official HashiCorp AWS ECR. 
+```

From dd2222f5e39d3f9092fab710bcd1868502c49573 Mon Sep 17 00:00:00 2001
From: David Yu <dyu@hashicorp.com>
Date: Thu, 22 Feb 2024 12:06:56 -0800
Subject: [PATCH 3/3] Update 3668.txt

---
 .changelog/3668.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changelog/3668.txt b/.changelog/3668.txt
index 2a91b3ebed..797590f713 100644
--- a/.changelog/3668.txt
+++ b/.changelog/3668.txt
@@ -1,3 +1,3 @@
 ```release-note:improvement
-control-plane: publish `consul-k8s-controlplane` 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. 
 ```