From 0b59df2d607e10c727a3f7df20c5ab5b62af4c9f Mon Sep 17 00:00:00 2001 From: hasheddan Date: Mon, 10 Oct 2022 13:02:05 -0400 Subject: [PATCH 1/2] Update Makefile to push to crossplane-contrib Updates Makefile to push to crossplane-contrib. Signed-off-by: hasheddan --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9e88261..c478350 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ IMAGES = provider-helm # ==================================================================================== # Setup XPKG -XPKG_REG_ORGS ?= xpkg.upbound.io/crossplane index.docker.io/crossplane +XPKG_REG_ORGS ?= xpkg.upbound.io/crossplane-contrib index.docker.io/crossplanecontrib # NOTE(hasheddan): skip promoting on xpkg.upbound.io as channel tags are # inferred. XPKG_REG_ORGS_NO_PROMOTE ?= xpkg.upbound.io/crossplane From 67a060acb82db8d867b172371bd321efac62db4d Mon Sep 17 00:00:00 2001 From: hasheddan Date: Mon, 10 Oct 2022 13:02:29 -0400 Subject: [PATCH 2/2] Use contrib Docker user in CI Updates CI to use the contrib Docker user credentials. Signed-off-by: hasheddan --- .github/workflows/ci.yml | 17 ++++++----------- .github/workflows/promote.yml | 13 +++++-------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3796f0..91ee9d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,9 +17,8 @@ env: # Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run # a step 'if env.AWS_USR' != ""', so we copy these to succinctly test whether # credentials have been provided before trying to run steps that need them. - DOCKER_USR: ${{ secrets.DOCKER_USR }} + CONTRIB_DOCKER_USR: ${{ secrets.CONTRIB_DOCKER_USR }} XPKG_ACCESS_ID: ${{ secrets.XPKG_ACCESS_ID }} - AWS_USR: ${{ secrets.AWS_USR }} jobs: detect-noop: @@ -297,10 +296,10 @@ jobs: - name: Login to Docker uses: docker/login-action@v1 - if: env.DOCKER_USR != '' + if: env.CONTRIB_DOCKER_USR != '' with: - username: ${{ secrets.DOCKER_USR }} - password: ${{ secrets.DOCKER_PSW }} + username: ${{ secrets.CONTRIB_DOCKER_USR }} + password: ${{ secrets.CONTRIB_DOCKER_PSW }} - name: Login to Upbound uses: docker/login-action@v1 @@ -312,17 +311,13 @@ jobs: - name: Publish Artifacts to S3 and Docker Hub run: make -j2 publish BRANCH_NAME=${GITHUB_REF##*/} - if: env.AWS_USR != '' && env.DOCKER_USR != '' + if: env.CONTRIB_DOCKER_USR != '' env: - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_USR }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PSW }} GIT_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Promote Artifacts in S3 and Docker Hub - if: github.ref == 'refs/heads/master' && env.AWS_USR != '' && env.DOCKER_USR != '' + if: github.ref == 'refs/heads/master' && env.CONTRIB_DOCKER_USR != '' run: make -j2 promote env: BRANCH_NAME: master CHANNEL: master - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_USR }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PSW }} diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml index abd5acf..581a17f 100644 --- a/.github/workflows/promote.yml +++ b/.github/workflows/promote.yml @@ -15,8 +15,7 @@ env: # Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run # a step 'if env.AWS_USR' != ""', so we copy these to succinctly test whether # credentials have been provided before trying to run steps that need them. - DOCKER_USR: ${{ secrets.DOCKER_USR }} - AWS_USR: ${{ secrets.AWS_USR }} + CONTRIB_DOCKER_USR: ${{ secrets.CONTRIB_DOCKER_USR }} jobs: promote-artifacts: @@ -33,17 +32,15 @@ jobs: - name: Login to Docker uses: docker/login-action@v1 - if: env.DOCKER_USR != '' + if: env.CONTRIB_DOCKER_USR != '' with: - username: ${{ secrets.DOCKER_USR }} - password: ${{ secrets.DOCKER_PSW }} + username: ${{ secrets.CONTRIB_DOCKER_USR }} + password: ${{ secrets.CONTRIB_DOCKER_PSW }} - name: Promote Artifacts in S3 and Docker Hub - if: env.AWS_USR != '' && env.DOCKER_USR != '' + if: env.CONTRIB_DOCKER_USR != '' run: make -j2 promote BRANCH_NAME=${GITHUB_REF##*/} env: VERSION: ${{ github.event.inputs.version }} CHANNEL: ${{ github.event.inputs.channel }} - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_USR }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PSW }} \ No newline at end of file