From 1af78926f8d9e3c98303401f169dd93ec1ddca24 Mon Sep 17 00:00:00 2001
From: "ian.nara" <ian.nara@thetradedesk.com>
Date: Wed, 7 Aug 2024 13:11:45 -0600
Subject: [PATCH] tag images correctly

---
 .github/actions/update_operator_version/action.yaml       | 8 ++++++--
 .../workflows/publish-aws-eks-nitro-enclave-docker.yaml   | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/actions/update_operator_version/action.yaml b/.github/actions/update_operator_version/action.yaml
index 41429dc52..d21f40c7b 100644
--- a/.github/actions/update_operator_version/action.yaml
+++ b/.github/actions/update_operator_version/action.yaml
@@ -8,6 +8,10 @@ inputs:
   version_number_input:
     description: If set, the version number will not be incremented and the given number will be used.
     default: ''
+  image_tag_suffix:
+    description: Suffix to apply to the docker image tag
+    default: ${{ env.ENCLAVE_PROTOCOL }}
+
 
 outputs:
   new_version:
@@ -17,7 +21,7 @@ outputs:
     description: Whether to create a release
     value: ${{ steps.checkRelease.outputs.is_release }}
   image_tag:
-    description: The tag to use for the docker image for eks
+    description: The tag to use for the docker image
     value: ${{ steps.updatePom.outputs.image_tag }}
 
 runs:
@@ -86,7 +90,7 @@ runs:
         new_version=${{ steps.version.outputs.new_version }} 
         sed -i "0,/$current_version/s/$current_version/$new_version/" pom.xml
         echo "Version number updated from $current_version to $new_version"
-        echo "image_tag=${{ steps.version.outputs.new_version }}-eks-nitro" >> $GITHUB_OUTPUT
+        echo "image_tag=${{ steps.version.outputs.new_version }}-${{ inputs.image_tag_suffix }}" >> $GITHUB_OUTPUT
 
     - name: Commit pom.xml and version.json
       if: ${{ inputs.version_number_input == '' && steps.checkRelease.outputs.is_release != 'true' }}
diff --git a/.github/workflows/publish-aws-eks-nitro-enclave-docker.yaml b/.github/workflows/publish-aws-eks-nitro-enclave-docker.yaml
index 5ae48ad65..0f7210540 100644
--- a/.github/workflows/publish-aws-eks-nitro-enclave-docker.yaml
+++ b/.github/workflows/publish-aws-eks-nitro-enclave-docker.yaml
@@ -44,6 +44,7 @@ jobs:
         with:
           release_type: ${{ inputs.release_type }}
           version_number_input: ${{ inputs.version_number_input }}
+          image_tag_suffix: eks-nitro
 
     outputs:
       new_version: ${{ steps.update_version.outputs.new_version }}