Skip to content

Commit de727f7

Browse files
sumo-drosieksumo-drosiek
authored
Merge pull request #6 from sumo-drosiek/drosiek-kubectl
chore: adjust workflows to push kubectl image to ecr
2 parents 16d54a8 + 3a4494a commit de727f7

File tree

5 files changed

+65
-19
lines changed

5 files changed

+65
-19
lines changed

‎.github/workflows/build_and_push_image.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ on:
2626
required: true
2727
AWS_SECRET_ACCESS_KEY:
2828
required: true
29+
SUFFIX:
30+
required: true
2931

3032

3133
jobs:
@@ -49,19 +51,19 @@ jobs:
4951
# https://github.com/aws/containers-roadmap/issues/876
5052
- name: Build and push image build cache to Docker Hub
5153
if: ${{ inputs.push_cache }}
52-
run: make push-image-cache
54+
run: make push-image-cache-${{ secrets.SUFFIX }}
5355
- name: Build and push image to Docker Hub
54-
run: make push-image BUILD_TAG=${{ inputs.build_tag }}
56+
run: make push-image-${{ secrets.SUFFIX }} BUILD_TAG=${{ inputs.build_tag }}
5557
- name: Tag latest to point to most recent release in Docker Hub
5658
if: ${{ inputs.tag_latest }}
57-
run: make tag-release-image-with-latest BUILD_TAG=${{ inputs.build_tag }}
59+
run: make tag-release-image-with-latest-${{ secrets.SUFFIX }} BUILD_TAG=${{ inputs.build_tag }}
5860
- name: Login to ECR
5961
run: make login-ecr
6062
env:
6163
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
6264
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
6365
- name: Build and push image to ECR
64-
run: make push-image-ecr BUILD_TAG=${{ inputs.build_tag }}
66+
run: make push-image-ecr-${{ secrets.SUFFIX }} BUILD_TAG=${{ inputs.build_tag }}
6567
- name: Tag latest to point to most recent release in ECR
6668
if: ${{ inputs.tag_latest }}
67-
run: make tag-release-image-with-latest-ecr BUILD_TAG=${{ inputs.build_tag }}
69+
run: make tag-release-image-with-latest-ecr-${{ secrets.SUFFIX }} BUILD_TAG=${{ inputs.build_tag }}

‎.github/workflows/dev_builds.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Print tag
2424
run: echo "Running dev build for ${{ steps.extract_tag.outputs.tag }}"
2525
build-and-push-image:
26-
uses: SumoLogic/sumologic-kubernetes-tools/.github/workflows/build_and_push_image.yml@main
26+
uses: ./.github/workflows/build_and_push_image.yml
2727
needs: extract-image-tag
2828
with:
2929
build_tag: ${{ needs.extract-image-tag.outputs.build_tag }}
@@ -33,5 +33,17 @@ jobs:
3333
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
3434
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
3535
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
36+
SUFFIX: tools
37+
build-and-push-image-kubectl:
38+
uses: ./.github/workflows/build_and_push_image.yml
39+
needs: extract-image-tag
40+
with:
41+
build_tag: ${{ needs.extract-image-tag.outputs.build_tag }}
42+
secrets:
43+
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
44+
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
45+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_KUBECTL }}
46+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_KUBECTL }}
47+
SUFFIX: kubectl
3648
build-binaries:
37-
uses: SumoLogic/sumologic-kubernetes-tools/.github/workflows/build_binaries.yml@main
49+
uses: ./.github/workflows/build_binaries.yml

‎.github/workflows/pre_release_builds.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Print tag
2121
run: echo "Running pre release build for ${{ steps.extract_tag.outputs.tag }}"
2222
build-and-push-image:
23-
uses: SumoLogic/sumologic-kubernetes-tools/.github/workflows/build_and_push_image.yml@main
23+
uses: ./.github/workflows/build_and_push_image.yml
2424
needs: extract-image-tag
2525
with:
2626
build_tag: ${{ needs.extract-image-tag.outputs.build_tag }}
@@ -29,3 +29,15 @@ jobs:
2929
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
3030
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
3131
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
32+
SUFFIX: tools
33+
build-and-push-image-kubectl:
34+
uses: ./.github/workflows/build_and_push_image.yml
35+
needs: extract-image-tag
36+
with:
37+
build_tag: ${{ needs.extract-image-tag.outputs.build_tag }}
38+
secrets:
39+
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
40+
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
41+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_KUBECTL }}
42+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_KUBECTL }}
43+
SUFFIX: kubectl

‎.github/workflows/release_builds.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Print tag
1919
run: echo "Running release build for ${{ steps.extract_tag.outputs.tag }}"
2020
build-and-push-image:
21-
uses: SumoLogic/sumologic-kubernetes-tools/.github/workflows/build_and_push_image.yml@main
21+
uses: ./.github/workflows/build_and_push_image.yml
2222
needs: extract-image-tag
2323
with:
2424
build_tag: ${{ needs.extract-image-tag.outputs.build_tag }}
@@ -28,8 +28,21 @@ jobs:
2828
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
2929
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
3030
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
31+
SUFFIX: tools
32+
build-and-push-image-kubectl:
33+
uses: ./.github/workflows/build_and_push_image.yml
34+
needs: extract-image-tag
35+
with:
36+
build_tag: ${{ needs.extract-image-tag.outputs.build_tag }}
37+
tag_latest: true
38+
secrets:
39+
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
40+
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
41+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_KUBECTL }}
42+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_KUBECTL }}
43+
SUFFIX: kubectl
3144
build-binaries:
32-
uses: SumoLogic/sumologic-kubernetes-tools/.github/workflows/build_binaries.yml@main
45+
uses: ./.github/workflows/build_binaries.yml
3346
create-release:
3447
name: Create Github release
3548
runs-on: ubuntu-20.04

‎Makefile

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,30 +50,37 @@ build-image-multiplatform-tools:
5050
build-image-multiplatform-kubectl:
5151
TAG=$(BUILD_TAG) docker buildx bake kubectl-multiplatform
5252

53-
tag-release-image-with-latest:
54-
make push-image BUILD_TAG=latest
53+
tag-release-image-with-latest-tools:
54+
make push-image-tools BUILD_TAG=latest
5555

56-
tag-release-image-with-latest-ecr:
57-
make tag-release-image-with-latest REPO_URL=$(ECR_REPO_URL)
56+
tag-release-image-with-latest-kubectl:
57+
make push-image-kubectl BUILD_TAG=latest
58+
59+
tag-release-image-with-latest-ecr-tools:
60+
make tag-release-image-with-latest-tools REPO_URL=$(ECR_REPO_URL)
61+
62+
tag-release-image-with-latest-ecr-kubectl:
63+
make tag-release-image-with-latest-kubectl REPO_URL=$(ECR_REPO_URL)
5864

5965
test-image:
6066
./scripts/test-image.sh "$(IMAGE_NAME):$(BUILD_TAG)"
6167

62-
push-image-cache:
68+
push-image-cache-tools:
6369
# only push cache to Dockerhub as ECR doesn't support it yet
6470
# https://github.com/aws/containers-roadmap/issues/876
6571
docker buildx bake cache-multiplatform
6672

67-
push-image: push-image-tools push-image-kubectl
68-
6973
push-image-tools:
7074
IMAGE=$(REPO_URL) TAG=$(BUILD_TAG) docker buildx bake tools-multiplatform --push
7175

7276
push-image-kubectl:
7377
IMAGE=$(REPO_URL) TAG=$(BUILD_TAG) docker buildx bake kubectl-multiplatform --push
7478

75-
push-image-ecr:
76-
make push-image REPO_URL=$(ECR_REPO_URL)
79+
push-image-ecr-tools:
80+
make push-image-tools REPO_URL=$(ECR_REPO_URL)
81+
82+
push-image-ecr-kubectl:
83+
make push-image-kubectl REPO_URL=$(ECR_REPO_URL)
7784

7885
login:
7986
echo "${DOCKER_PASSWORD}" | docker login -u sumodocker --password-stdin

0 commit comments

Comments
 (0)