From 5d66176733a2837c26e54ccc7b4a7641846e952d Mon Sep 17 00:00:00 2001 From: Rajashekhar Gundeti Date: Sat, 4 Mar 2023 00:30:56 +0530 Subject: [PATCH 1/4] automating manifests publishing --- .github/workflows/release.yaml | 22 ++++++++++++++++--- Makefile | 15 ++++++++----- .../storage-class.yaml | 1 + .../volume-provisioner/storage-class.yaml | 1 + 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 56591c42cb..90f1c9ff26 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,10 +9,11 @@ on: jobs: build: runs-on: ubuntu-latest + permissions: write-all steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up QEMU uses: docker/setup-qemu-action@v1 @@ -26,7 +27,22 @@ jobs: run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${GITHUB_ACTOR,,} --password-stdin - name: Build Image - run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make image + run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make image - name: Push Image - run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make docker-push-all + run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make docker-push-all + + - name: Make manifests + run: RELEASE=${{ github.ref_name }} make manifests + + - name: Get current release + id: get_release + uses: bruceadams/get-release@v1.3.2 + env: + GITHUB_TOKEN: ${{ github.token }} + + - name: upload manifests + uses: shogo82148/actions-upload-release-asset@v1 + with: + upload_url: ${{ steps.get_release.outputs.upload_url }} + asset_path: ${{ github.ref_name }}/*.yaml \ No newline at end of file diff --git a/Makefile b/Makefile index cb75cfb17d..d872bdcafe 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ else endif ifeq "$(OSS_REGISTRY)" "" - OSS_REGISTRY ?= iad.ocir.io/oracle + OSS_REGISTRY ?= ghcr.io/oracle else OSS_REGISTRY ?= ${OSS_REGISTRY} endif @@ -38,7 +38,11 @@ else VERSION ?= ${VERSION} endif -RELEASE = v1.25.0 +ifeq "$(RELEASE)" "" + RELEASE = latest +else + RELEASE ?= ${RELEASE} +endif GOOS ?= linux ARCH ?= amd64 @@ -88,8 +92,10 @@ build: build-dirs manifests: build-dirs @mkdir -p ${RELEASE} @cp -a manifests/**/*.yaml ${RELEASE} + @cp -a manifests/container-storage-interface/storage-class.yaml ${RELEASE}/storage-class.yaml + @cat manifests/volume-provisioner/storage-class.yaml >> ${RELEASE}/storage-class.yaml @sed $(SED_INPLACE) \ - 's#${IMAGE}:${VERSION}#${IMAGE}:${RELEASE}#g' \ + 's#${IMAGE}:.*#${IMAGE}:${RELEASE}#g' \ ${RELEASE}/*.yaml .PHONY: vendor @@ -200,5 +206,4 @@ test-local: build-dirs .PHONY: run-ccm-e2e-tests-local run-ccm-e2e-tests-local: - ./hack/run_e2e_test.sh - + ./hack/run_e2e_test.sh \ No newline at end of file diff --git a/manifests/container-storage-interface/storage-class.yaml b/manifests/container-storage-interface/storage-class.yaml index 318f0d3c27..23235157dc 100644 --- a/manifests/container-storage-interface/storage-class.yaml +++ b/manifests/container-storage-interface/storage-class.yaml @@ -1,3 +1,4 @@ +--- apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: diff --git a/manifests/volume-provisioner/storage-class.yaml b/manifests/volume-provisioner/storage-class.yaml index 6b8e0b1e56..9be7164ff0 100644 --- a/manifests/volume-provisioner/storage-class.yaml +++ b/manifests/volume-provisioner/storage-class.yaml @@ -1,3 +1,4 @@ +--- kind: StorageClass apiVersion: storage.k8s.io/v1 metadata: From 76ec6e5b26312284750664cef3c52a4f1fd28ee6 Mon Sep 17 00:00:00 2001 From: Rajashekhar Gundeti Date: Sat, 4 Mar 2023 00:46:02 +0530 Subject: [PATCH 2/4] using CR_PAT --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 90f1c9ff26..5056ecd384 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,7 +24,7 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Log into GitHub Container Registry - run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${GITHUB_ACTOR,,} --password-stdin + run: echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${GITHUB_ACTOR,,} --password-stdin - name: Build Image run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make image From d1a6c80213c4bea48e271f4b0317a3df7d67a050 Mon Sep 17 00:00:00 2001 From: Rajashekhar Gundeti Date: Sat, 4 Mar 2023 01:21:57 +0530 Subject: [PATCH 3/4] using rsync --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d872bdcafe..f650ca38d9 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,7 @@ build: build-dirs .PHONY: manifests manifests: build-dirs @mkdir -p ${RELEASE} - @cp -a manifests/**/*.yaml ${RELEASE} + @rsync -av --exclude=manifests/**/storage-class.yaml manifests/**/*.yaml ${RELEASE} @cp -a manifests/container-storage-interface/storage-class.yaml ${RELEASE}/storage-class.yaml @cat manifests/volume-provisioner/storage-class.yaml >> ${RELEASE}/storage-class.yaml @sed $(SED_INPLACE) \ From e5635c2c0fc9c29bef7a9e3c5655c73181edc075 Mon Sep 17 00:00:00 2001 From: Rajashekhar Gundeti Date: Mon, 6 Mar 2023 16:51:47 +0530 Subject: [PATCH 4/4] reverted to original references --- .github/workflows/release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5056ecd384..b37874c652 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,13 +24,13 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Log into GitHub Container Registry - run: echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${GITHUB_ACTOR,,} --password-stdin + run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${GITHUB_ACTOR,,} --password-stdin - name: Build Image - run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make image + run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make image - name: Push Image - run: OSS_REGISTRY="ghcr.io/${GITHUB_ACTOR,,}" VERSION="${{ github.ref_name }}" make docker-push-all + run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make docker-push-all - name: Make manifests run: RELEASE=${{ github.ref_name }} make manifests