Skip to content

Fix image push jobs from master branch #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 4, 2021
Merged

Fix image push jobs from master branch #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05015d2
Fix image push jobs from master branch
pdhanoyasplunk Oct 4, 2021
92897e9
Merge branch 'develop' into fix-push-to-latest
smohan-splunk Oct 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .github/workflows/automated-release-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -76,6 +72,7 @@ jobs:
- name: Run Make Package
run: |
build/package.sh
docker images

- name: Upload Release Artifacts
uses: actions/upload-artifact@v2
Expand All @@ -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 }}
8 changes: 8 additions & 0 deletions .github/workflows/build-test-push-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down