diff --git a/.changelog/3668.txt b/.changelog/3668.txt new file mode 100644 index 0000000000..797590f713 --- /dev/null +++ b/.changelog/3668.txt @@ -0,0 +1,3 @@ +```release-note:improvement +control-plane: publish `consul-k8s-control-plane` and `consul-k8s-control-plane-fips` images to official HashiCorp AWS ECR. +``` 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 }}