From 3b946159344fb566cb164c949c7bda8439fdb223 Mon Sep 17 00:00:00 2001 From: Karl-Johan Grahn Date: Mon, 21 Mar 2022 21:51:33 +0100 Subject: [PATCH 1/8] fix(255): push image to ghcr instead of docker hub --- .github/workflows/push.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 78a4ca98..0c9c6795 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -11,6 +11,7 @@ env: KUBERNETES_VERSION: "1.18.0" KIND_VERSION: "0.7.0" HELM_REGISTRY_URL: "https://stakater.github.io/stakater-charts" + REGISTRY: ghcr.io jobs: build: @@ -83,11 +84,12 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to Registry - uses: docker/login-action@v1 + - name: Login to Docker registry ${{env.REGISTRY}} + uses: docker/login-action@v1.14.1 with: - username: ${{ secrets.STAKATER_DOCKERHUB_USERNAME }} - password: ${{ secrets.STAKATER_DOCKERHUB_PASSWORD }} + registry: ${{env.REGISTRY}} + username: ${{github.actor}} + password: ${{secrets.GITHUB_TOKEN}} - name: Generate image repository path run: | From cb39cf1a0373932623ae0900c1b06fc59aa7d75c Mon Sep 17 00:00:00 2001 From: Karl-Johan Grahn Date: Mon, 21 Mar 2022 21:57:56 +0100 Subject: [PATCH 2/8] fix(255): update pr workflow too --- .github/workflows/pull_request.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index a349654f..d41d745c 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -83,11 +83,12 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to Registry - uses: docker/login-action@v1 + - name: Login to Docker registry ${{env.REGISTRY}} + uses: docker/login-action@v1.14.1 with: - username: ${{ secrets.STAKATER_DOCKERHUB_USERNAME }} - password: ${{ secrets.STAKATER_DOCKERHUB_PASSWORD }} + registry: ${{env.REGISTRY}} + username: ${{github.actor}} + password: ${{secrets.GITHUB_TOKEN}} - name: Generate image repository path run: | From a5bb0392b1195426b55d5890b194b132dd385fad Mon Sep 17 00:00:00 2001 From: Karl-Johan Grahn Date: Mon, 21 Mar 2022 21:58:44 +0100 Subject: [PATCH 3/8] fix(255): add registry var --- .github/workflows/pull_request.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index d41d745c..69295d82 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -10,6 +10,7 @@ env: GOLANG_VERSION: 1.17.7 KUBERNETES_VERSION: "1.18.0" KIND_VERSION: "0.7.0" + REGISTRY: ghcr.io jobs: build: From 77e2df9dfbb9bb031d9dcee9c8771bfff3ebb530 Mon Sep 17 00:00:00 2001 From: Karl-Johan Grahn Date: Mon, 21 Mar 2022 22:34:45 +0100 Subject: [PATCH 4/8] fix(255): checkout does not work as expected --- .github/workflows/pull_request.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 69295d82..b1346fc5 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -20,8 +20,6 @@ jobs: steps: - name: Check out code uses: actions/checkout@v2 - with: - ref: ${{github.event.pull_request.head.sha}} # Setting up helm binary - name: Set up Helm From 72ae858c14fe23a6f39e729af5a2d04a2317fd7d Mon Sep 17 00:00:00 2001 From: Karl-Johan Grahn Date: Mon, 21 Mar 2022 22:40:17 +0100 Subject: [PATCH 5/8] fix(255): add back --- .github/workflows/pull_request.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index b1346fc5..69295d82 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -20,6 +20,8 @@ jobs: steps: - name: Check out code uses: actions/checkout@v2 + with: + ref: ${{github.event.pull_request.head.sha}} # Setting up helm binary - name: Set up Helm From 32ab2ada091afe86de8f81a06e68ded315cc96cb Mon Sep 17 00:00:00 2001 From: Hussnain Date: Wed, 5 Apr 2023 11:04:18 +0500 Subject: [PATCH 6/8] Updated github actions to push to ghcr and dockerHub --- .github/workflows/pull_request.yaml | 45 ++++++++++++++++++++++------ .github/workflows/push.yaml | 46 +++++++++++++++++++++++------ 2 files changed, 73 insertions(+), 18 deletions(-) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 798467f8..19ae53ba 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -87,18 +87,17 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to Docker registry ${{env.REGISTRY}} - uses: docker/login-action@v1.14.1 + - name: Login to Docker Registry + uses: docker/login-action@v1 with: - registry: ${{env.REGISTRY}} - username: ${{github.actor}} - password: ${{secrets.GITHUB_TOKEN}} + username: ${{ secrets.STAKATER_DOCKERHUB_USERNAME }} + password: ${{ secrets.STAKATER_DOCKERHUB_PASSWORD }} - - name: Generate image repository path + - name: Generate image repository path for Docker registry run: | - echo IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV + echo DOCKER_IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV - - name: Build and Push Docker Image + - name: Build and Push Docker Image to Docker registry uses: docker/build-push-action@v2 with: context: . @@ -109,7 +108,35 @@ jobs: cache-to: type=inline platforms: linux/amd64,linux/arm,linux/arm64 tags: | - ${{ env.IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.GIT_TAG }} + ${{ env.DOCKER_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.GIT_TAG }} + labels: | + org.opencontainers.image.source=${{ github.event.repository.clone_url }} + org.opencontainers.image.created=${{ steps.prep.outputs.created }} + org.opencontainers.image.revision=${{ github.sha }} + + - name: Login to ghcr registry + uses: docker/login-action@v1.14.1 + with: + registry: ${{env.REGISTRY}} + username: ${{github.actor}} + password: ${{secrets.GITHUB_TOKEN}} + + - name: Generate image repository path for ghcr registry + run: | + echo GHCR_IMAGE_REPOSITORY=${{env.REGISTRY}}/$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV + + - name: Build and Push Docker Image to ghcr registry + uses: docker/build-push-action@v2 + with: + context: . + file: ${{ env.DOCKER_FILE_PATH }} + pull: true + push: true + build-args: BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }} + cache-to: type=inline + platforms: linux/amd64,linux/arm,linux/arm64 + tags: | + ${{ env.GHCR_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.GIT_TAG }} labels: | org.opencontainers.image.source=${{ github.event.repository.clone_url }} org.opencontainers.image.created=${{ steps.prep.outputs.created }} diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 10450faf..9b722074 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -84,17 +84,17 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to Docker registry ${{env.REGISTRY}} - uses: docker/login-action@v1.14.1 + - name: Login to Docker Registry + uses: docker/login-action@v1 with: - registry: ${{env.REGISTRY}} - username: ${{github.actor}} - password: ${{secrets.GITHUB_TOKEN}} + username: ${{ secrets.STAKATER_DOCKERHUB_USERNAME }} + password: ${{ secrets.STAKATER_DOCKERHUB_PASSWORD }} - - name: Generate image repository path + - name: Generate image repository path for Docker registry run: | - echo IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV - - name: Build and push + echo DOCKER_IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV + + - name: Build and Push Docker Image to Docker registry uses: docker/build-push-action@v2 with: context: . @@ -105,7 +105,35 @@ jobs: cache-to: type=inline platforms: linux/amd64,linux/arm,linux/arm64 tags: | - ${{ env.IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.new_tag }} + ${{ env.DOCKER_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.new_tag }} + labels: | + org.opencontainers.image.source=${{ github.event.repository.clone_url }} + org.opencontainers.image.created=${{ steps.prep.outputs.created }} + org.opencontainers.image.revision=${{ github.sha }} + + - name: Login to ghcr registry + uses: docker/login-action@v1.14.1 + with: + registry: ${{env.REGISTRY}} + username: ${{github.actor}} + password: ${{secrets.GITHUB_TOKEN}} + + - name: Generate image repository path for ghcr registry + run: | + echo GHCR_IMAGE_REPOSITORY=${{env.REGISTRY}}/$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV + + - name: Build and Push Docker Image to ghcr registry + uses: docker/build-push-action@v2 + with: + context: . + file: ${{ env.DOCKER_FILE_PATH }} + pull: true + push: true + build-args: BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }} + cache-to: type=inline + platforms: linux/amd64,linux/arm,linux/arm64 + tags: | + ${{ env.GHCR_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.new_tag }} labels: | org.opencontainers.image.source=${{ github.event.repository.clone_url }} org.opencontainers.image.created=${{ steps.prep.outputs.created }} From 3e88e0619907e02a0d3359f663403663834bd74e Mon Sep 17 00:00:00 2001 From: Hussnain Date: Wed, 5 Apr 2023 11:04:31 +0500 Subject: [PATCH 7/8] Updated image path --- Makefile | 2 +- deployments/kubernetes/chart/reloader/values.yaml | 2 +- deployments/kubernetes/reloader.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ad810a14..b1fac8e7 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ ALL_ARCH ?= arm64 arm amd64 BUILDER_IMAGE ?= BASE_IMAGE ?= BINARY ?= Reloader -DOCKER_IMAGE ?= stakater/reloader +DOCKER_IMAGE ?= ghcr.io/stakater/reloader # Default value "dev" VERSION ?= 0.0.1 diff --git a/deployments/kubernetes/chart/reloader/values.yaml b/deployments/kubernetes/chart/reloader/values.yaml index 007cdbb7..43b9056c 100644 --- a/deployments/kubernetes/chart/reloader/values.yaml +++ b/deployments/kubernetes/chart/reloader/values.yaml @@ -64,7 +64,7 @@ reloader: group: com.stakater.platform version: v0.0.114 image: - name: stakater/reloader + name: ghcr.io/stakater/reloader tag: v0.0.114 pullPolicy: IfNotPresent # Support for extra environment variables. diff --git a/deployments/kubernetes/reloader.yaml b/deployments/kubernetes/reloader.yaml index fc18edd7..bfd741cf 100644 --- a/deployments/kubernetes/reloader.yaml +++ b/deployments/kubernetes/reloader.yaml @@ -126,7 +126,7 @@ spec: version: v0.0.114 spec: containers: - - image: "stakater/reloader:v0.0.114" + - image: "ghcr.io/stakater/reloader:v0.0.114" imagePullPolicy: IfNotPresent name: reloader-reloader From aab8f66b34e412def0602dbc99be612043eacbcf Mon Sep 17 00:00:00 2001 From: Hussnain Date: Wed, 5 Apr 2023 11:17:26 +0500 Subject: [PATCH 8/8] Updated actions dependencies --- .github/workflows/pull_request.yaml | 43 ++++++++++++----------------- .github/workflows/push.yaml | 28 +++++++++---------- 2 files changed, 32 insertions(+), 39 deletions(-) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 19ae53ba..ae96424b 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -7,7 +7,7 @@ on: env: DOCKER_FILE_PATH: Dockerfile - GOLANG_VERSION: 1.17.7 + GOLANG_VERSION: 1.17 KUBERNETES_VERSION: "1.18.0" KIND_VERSION: "0.10.0" REGISTRY: ghcr.io @@ -19,17 +19,17 @@ jobs: if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')" steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{github.event.pull_request.head.sha}} # Setting up helm binary - name: Set up Helm - uses: azure/setup-helm@v1 + uses: azure/setup-helm@v3 - name: Set up Go id: go - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: go-version: ${{ env.GOLANG_VERSION }} @@ -38,9 +38,9 @@ jobs: make install - name: Run golangci-lint - uses: golangci/golangci-lint-action@v2.3.0 + uses: golangci/golangci-lint-action@v3 with: - version: v1.45.2 + version: v1.50.1 only-new-issues: false args: --timeout 10m @@ -82,13 +82,13 @@ jobs: echo "##[set-output name=GIT_TAG;]$(echo ${tag})" - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to Docker Registry - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.STAKATER_DOCKERHUB_USERNAME }} password: ${{ secrets.STAKATER_DOCKERHUB_PASSWORD }} @@ -98,7 +98,7 @@ jobs: echo DOCKER_IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV - name: Build and Push Docker Image to Docker registry - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: context: . file: ${{ env.DOCKER_FILE_PATH }} @@ -115,7 +115,7 @@ jobs: org.opencontainers.image.revision=${{ github.sha }} - name: Login to ghcr registry - uses: docker/login-action@v1.14.1 + uses: docker/login-action@v2 with: registry: ${{env.REGISTRY}} username: ${{github.actor}} @@ -126,7 +126,7 @@ jobs: echo GHCR_IMAGE_REPOSITORY=${{env.REGISTRY}}/$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV - name: Build and Push Docker Image to ghcr registry - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: context: . file: ${{ env.DOCKER_FILE_PATH }} @@ -143,21 +143,14 @@ jobs: org.opencontainers.image.revision=${{ github.sha }} - name: Comment on PR - uses: mshick/add-pr-comment@v1 + uses: mshick/add-pr-comment@v2 + if: always() env: - GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - message: '@${{ github.actor }} Image is available for testing. `docker pull ${{ env.IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.GIT_TAG }}`' - allow-repeats: false - - - name: Notify Failure - if: failure() - uses: mshick/add-pr-comment@v1 - env: - GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }} - with: - message: '@${{ github.actor }} Yikes! You better fix it before anyone else finds out! [Build](https://github.com/${{ github.repository }}/commit/${{ github.event.pull_request.head.sha }}/checks) has Failed!' - allow-repeats: false + message-success: '@${{ github.actor }} Image is available for testing. `docker pull ghcr.io/${{ env.IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.GIT_TAG }}`' + message-failure: '@${{ github.actor }} Yikes! You better fix it before anyone else finds out! [Build](https://github.com/${{ github.repository }}/commit/${{ github.event.pull_request.head.sha }}/checks) has Failed!' + allow-repeats: true - name: Notify Slack uses: 8398a7/action-slack@v3 diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 9b722074..0562ed2c 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -21,18 +21,18 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token fetch-depth: 0 # otherwise, you will fail to push refs to dest repo # Setting up helm binary - name: Set up Helm - uses: azure/setup-helm@v1 + uses: azure/setup-helm@v3 - name: Set up Go id: go - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: go-version: ${{ env.GOLANG_VERSION }} @@ -41,9 +41,9 @@ jobs: make install - name: Run golangci-lint - uses: golangci/golangci-lint-action@v2.3.0 + uses: golangci/golangci-lint-action@v3 with: - version: v1.45.2 + version: v1.50.1 only-new-issues: false args: --timeout 10m @@ -71,7 +71,7 @@ jobs: - name: Generate Tag id: generate_tag - uses: anothrNick/github-tag-action@1.36.0 + uses: anothrNick/github-tag-action@1.61.0 env: GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }} WITH_V: true @@ -79,13 +79,13 @@ jobs: DRY_RUN: true - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to Docker Registry - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.STAKATER_DOCKERHUB_USERNAME }} password: ${{ secrets.STAKATER_DOCKERHUB_PASSWORD }} @@ -95,7 +95,7 @@ jobs: echo DOCKER_IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV - name: Build and Push Docker Image to Docker registry - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: context: . file: ${{ env.DOCKER_FILE_PATH }} @@ -112,7 +112,7 @@ jobs: org.opencontainers.image.revision=${{ github.sha }} - name: Login to ghcr registry - uses: docker/login-action@v1.14.1 + uses: docker/login-action@v2 with: registry: ${{env.REGISTRY}} username: ${{github.actor}} @@ -123,7 +123,7 @@ jobs: echo GHCR_IMAGE_REPOSITORY=${{env.REGISTRY}}/$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV - name: Build and Push Docker Image to ghcr registry - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: context: . file: ${{ env.DOCKER_FILE_PATH }} @@ -146,7 +146,7 @@ jobs: # Generate tag for operator without "v" - name: Generate Operator Tag id: generate_operator_tag - uses: anothrNick/github-tag-action@1.36.0 + uses: anothrNick/github-tag-action@1.61.0 env: GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }} WITH_V: false @@ -195,7 +195,7 @@ jobs: branch: ${{ github.ref }} - name: Push Latest Tag - uses: anothrNick/github-tag-action@1.36.0 + uses: anothrNick/github-tag-action@1.61.0 env: GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }} WITH_V: true