diff --git a/.github/workflows/automated-release-workflow.yml b/.github/workflows/automated-release-workflow.yml index 9779e5b49..86e8e13b8 100644 --- a/.github/workflows/automated-release-workflow.yml +++ b/.github/workflows/automated-release-workflow.yml @@ -37,10 +37,6 @@ jobs: run: | echo "SHORT_SHA=${GITHUB_SHA::12}" >> $GITHUB_ENV echo $SHORT_SHA - - - name: Get current date - id: date - run: echo "::set-output name=date::$(date +'%Y-%m-%d')" - name: Configure Docker Credentials uses: docker/login-action@v1 @@ -76,6 +72,7 @@ jobs: - name: Run Make Package run: | build/package.sh + docker images - name: Upload Release Artifacts uses: actions/upload-artifact@v2 @@ -97,11 +94,15 @@ jobs: tag: "${{ github.event.inputs.release_version }}" draft: true - - name: Tag Splunk Operator Image + - name: Promote LATEST Splunk Operator Image to Release TAG + run: | + docker tag splunk/splunk-operator:latest splunk/splunk-operator:${{ github.event.inputs.release_version }} + + - name: Tag Splunk Operator Image if not same as release tag if: github.event.inputs.release_version != github.event.inputs.operator_image_tag run: | docker tag splunk/splunk-operator:${{ github.event.inputs.release_version }} splunk/splunk-operator:${{ github.event.inputs.operator_image_tag }} - - name: Tag and Push release RC Image + - name: Push Release Image run: | docker push splunk/splunk-operator:${{ github.event.inputs.operator_image_tag }} \ No newline at end of file diff --git a/.github/workflows/build-test-push-workflow.yml b/.github/workflows/build-test-push-workflow.yml index f76aeae62..18507b3a7 100644 --- a/.github/workflows/build-test-push-workflow.yml +++ b/.github/workflows/build-test-push-workflow.yml @@ -246,6 +246,14 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PUSH_TOKEN}} + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: ${{ secrets.AWS_DEFAULT_REGION }} + - name: Login to Amazon ECR + uses: aws-actions/amazon-ecr-login@v1 - name: Pull Splunk Operator Image Locally run: | docker pull ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA