chore(ci): updating branch reference from master to develop(HEAD) (#382)

* updating branch reference from master to develop(HEAD) * updates build branch to 'develop' in github workflow * add ghcr as an additional container repository to host container images Signed-off-by: mittachaitu <[email protected]>
openebs-archive · Sep 10, 2021 · 1224b3a · 1224b3a
1 parent 0f32713
commit 1224b3a
Show file tree

Hide file tree

Showing 18 changed files with 139 additions and 59 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ on:
   create:
   push:
     branches:
-    - 'master'
+    - 'develop'
     - 'v*'
     paths-ignore:
     - 'docs/**'
@@ -88,7 +88,7 @@ jobs:
         run: |
           BRANCH="${GITHUB_REF##*/}"
           CI_TAG=${BRANCH#v}-ci
-          if [ ${BRANCH} = "master" ]; then
+          if [ ${BRANCH} = "develop" ]; then
             CI_TAG="ci"
           fi
           echo "TAG=${CI_TAG}" >> $GITHUB_ENV
@@ -117,7 +117,7 @@ jobs:
         run: |
           BRANCH="${GITHUB_REF##*/}"
           CI_TAG=${BRANCH#v}-ci
-          if [ ${BRANCH} = "master" ]; then
+          if [ ${BRANCH} = "develop" ]; then
             CI_TAG="ci"
           fi
           echo "TAG=${CI_TAG}" >> $GITHUB_ENV
@@ -136,6 +136,7 @@ jobs:
           images: |
             ${{ env.IMAGE_ORG }}/cspc-operator
             quay.io/${{ env.IMAGE_ORG }}/cspc-operator
+            ghcr.io/${{ env.IMAGE_ORG }}/cspc-operator
           tag-latest: false
           tag-custom-only: true
           tag-custom: |
@@ -170,6 +171,13 @@ jobs:
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_TOKEN }}
 
+      - name: Login to GHCR
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build & Push Image
         uses: docker/build-push-action@v2
         with:
@@ -202,7 +210,7 @@ jobs:
         run: |
           BRANCH="${GITHUB_REF##*/}"
           CI_TAG=${BRANCH#v}-ci
-          if [ ${BRANCH} = "master" ]; then
+          if [ ${BRANCH} = "develop" ]; then
             CI_TAG="ci"
           fi
           echo "TAG=${CI_TAG}" >> $GITHUB_ENV
@@ -221,6 +229,7 @@ jobs:
           images: |
             ${{ env.IMAGE_ORG }}/cvc-operator
             quay.io/${{ env.IMAGE_ORG }}/cvc-operator
+            ghcr.io/${{ env.IMAGE_ORG }}/cvc-operator
           tag-latest: false
           tag-custom-only: true
           tag-custom: |
@@ -255,6 +264,13 @@ jobs:
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_TOKEN }}
 
+      - name: Login to GHCR
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build & Push Image
         uses: docker/build-push-action@v2
         with:
@@ -287,7 +303,7 @@ jobs:
         run: |
           BRANCH="${GITHUB_REF##*/}"
           CI_TAG=${BRANCH#v}-ci
-          if [ ${BRANCH} = "master" ]; then
+          if [ ${BRANCH} = "develop" ]; then
             CI_TAG="ci"
           fi
           echo "TAG=${CI_TAG}" >> $GITHUB_ENV
@@ -306,6 +322,7 @@ jobs:
           images: |
             ${{ env.IMAGE_ORG }}/cstor-pool-manager
             quay.io/${{ env.IMAGE_ORG }}/cstor-pool-manager
+            ghcr.io/${{ env.IMAGE_ORG }}/cstor-pool-manager
           tag-latest: false
           tag-custom-only: true
           tag-custom: |
@@ -340,6 +357,13 @@ jobs:
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_TOKEN }}
 
+      - name: Login to GHCR
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build & Push Image
         uses: docker/build-push-action@v2
         with:
@@ -373,7 +397,7 @@ jobs:
         run: |
           BRANCH="${GITHUB_REF##*/}"
           CI_TAG=${BRANCH#v}-ci
-          if [ ${BRANCH} = "master" ]; then
+          if [ ${BRANCH} = "develop" ]; then
             CI_TAG="ci"
           fi
           echo "TAG=${CI_TAG}" >> $GITHUB_ENV
@@ -392,6 +416,7 @@ jobs:
           images: |
             ${{ env.IMAGE_ORG }}/cstor-volume-manager
             quay.io/${{ env.IMAGE_ORG }}/cstor-volume-manager
+            ghcr.io/${{ env.IMAGE_ORG }}/cstor-volume-manager
           tag-latest: false
           tag-custom-only: true
           tag-custom: |
@@ -426,6 +451,13 @@ jobs:
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_TOKEN }}
 
+      - name: Login to GHCR
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build & Push Image
         uses: docker/build-push-action@v2
         with:
@@ -458,7 +490,7 @@ jobs:
         run: |
           BRANCH="${GITHUB_REF##*/}"
           CI_TAG=${BRANCH#v}-ci
-          if [ ${BRANCH} = "master" ]; then
+          if [ ${BRANCH} = "develop" ]; then
             CI_TAG="ci"
           fi
           echo "TAG=${CI_TAG}" >> $GITHUB_ENV
@@ -477,6 +509,7 @@ jobs:
           images: |
             ${{ env.IMAGE_ORG }}/cstor-webhook
             quay.io/${{ env.IMAGE_ORG }}/cstor-webhook
+            ghcr.io/${{ env.IMAGE_ORG }}/cstor-webhook
           tag-latest: false
           tag-custom-only: true
           tag-custom: |
@@ -511,6 +544,13 @@ jobs:
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_TOKEN }}
 
+      - name: Login to GHCR
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build & Push Image
         uses: docker/build-push-action@v2
         with:

diff --git a/.github/workflows/chart-lint-test.yml b/.github/workflows/chart-lint-test.yml
@@ -5,12 +5,12 @@ on:
     paths:
       - 'deploy/helm/**'
     branches:
-      - master
+      - develop
   pull_request:
     paths:
       - 'deploy/helm/**'
     branches:
-      - master
+      - develop
 
 jobs:
   lint-test:

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -22,8 +22,8 @@ on:
       - 'changelogs/**'
       - 'CHANGELOG.md'
     branches:
-      # on pull requests to master and release branches
-      - master
+      # on pull requests to develop and release branches
+      - develop
       - 'v*'
 
 jobs:

diff --git a/.github/workflows/release-charts.yml b/.github/workflows/release-charts.yml
@@ -5,7 +5,7 @@ on:
     paths:
       - 'deploy/helm/**'
     branches:
-      - master
+      - develop
 
 jobs:
   release:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -51,6 +51,7 @@ jobs:
           images: |
             ${{ env.IMAGE_ORG }}/cspc-operator
             quay.io/${{ env.IMAGE_ORG }}/cspc-operator
+            ghcr.io/${{ env.IMAGE_ORG }}/cspc-operator
           tag-latest: true
           tag-semver: |
             {{version}}
@@ -84,6 +85,13 @@ jobs:
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_TOKEN }}
 
+      - name: Login to GHCR
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build & Push Image
         uses: docker/build-push-action@v2
         with:
@@ -131,6 +139,7 @@ jobs:
           images: |
             ${{ env.IMAGE_ORG }}/cvc-operator
             quay.io/${{ env.IMAGE_ORG }}/cvc-operator
+            ghcr.io/${{ env.IMAGE_ORG }}/cvc-operator
           tag-latest: true
           tag-semver: |
             {{version}}
@@ -164,6 +173,13 @@ jobs:
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_TOKEN }}
 
+      - name: Login to GHCR
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build & Push Image
         uses: docker/build-push-action@v2
         with:
@@ -211,6 +227,7 @@ jobs:
           images: |
             ${{ env.IMAGE_ORG }}/cstor-pool-manager
             quay.io/${{ env.IMAGE_ORG }}/cstor-pool-manager
+            ghcr.io/${{ env.IMAGE_ORG }}/cstor-pool-manager
           tag-latest: true
           tag-semver: |
             {{version}}
@@ -244,6 +261,13 @@ jobs:
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_TOKEN }}
 
+      - name: Login to GHCR
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build & Push Image
         uses: docker/build-push-action@v2
         with:
@@ -292,6 +316,7 @@ jobs:
           images: |
             ${{ env.IMAGE_ORG }}/cstor-volume-manager
             quay.io/${{ env.IMAGE_ORG }}/cstor-volume-manager
+            ghcr.io/${{ env.IMAGE_ORG }}/cstor-volume-manager
           tag-latest: true
           tag-semver: |
             {{version}}
@@ -325,6 +350,13 @@ jobs:
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_TOKEN }}
 
+      - name: Login to GHCR
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build & Push Image
         uses: docker/build-push-action@v2
         with:
@@ -372,6 +404,7 @@ jobs:
           images: |
             ${{ env.IMAGE_ORG }}/cstor-webhook
             quay.io/${{ env.IMAGE_ORG }}/cstor-webhook
+            ghcr.io/${{ env.IMAGE_ORG }}/cstor-webhook
           tag-latest: true
           tag-semver: |
             {{version}}
@@ -405,6 +438,13 @@ jobs:
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_TOKEN }}
 
+      - name: Login to GHCR
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build & Push Image
         uses: docker/build-push-action@v2
         with:

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -1,3 +1,3 @@
 ## Community Code of Conduct
 
-This project follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
+This project follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 
 ## Project Status: Beta
 
-We are always happy to list users who run cStor in production, check out our existing [adopters](https://github.com/openebs/openebs/tree/master/adopters), and their [feedbacks](https://github.com/openebs/openebs/issues/2719).
+We are always happy to list users who run cStor in production, check out our existing [adopters](https://github.com/openebs/openebs/tree/HEAD/adopters), and their [feedbacks](https://github.com/openebs/openebs/issues/2719).
 
 The new cStor Operators support the following Operations on cStor pools and volumes:
 1. Provisioning and De-provisioning of cStor pools.
@@ -37,7 +37,7 @@ in the CSPC. A cStor pool is provisioned on node by utilising the disks attached
 CStorPoolInstance(CSPI) custom resource in a Kubernetes cluster. One has freedom to specify the disks that they
 want to use for pool provisioning.
 
-CSPC API comes with a variety of tunables and features and the API can be viewed for [here](https://github.com/openebs/api/blob/master/pkg/apis/cstor/v1/cstorpoolcluster.go)
+CSPC API comes with a variety of tunables and features and the API can be viewed for [here](https://github.com/openebs/api/blob/HEAD/pkg/apis/cstor/v1/cstorpoolcluster.go)
 
 Once a CSPC is created, cspc-operator provision CSPI CR and **pool-manager** deployment on each node where cStor pool should 
 be created. The pool-manager deployment watches for its corresponding CSPI on the node and finally executes commands to

diff --git a/build/push b/build/push
@@ -70,7 +70,7 @@ fi
 # set the tag CI (fixed) and build tags.
 BUILD_TAG="${CURRENT_BRANCH}-${BUILD_ID}"
 CI_TAG="${CURRENT_BRANCH}-ci"
-if [ ${CURRENT_BRANCH} = "master" ]; then
+if [ ${CURRENT_BRANCH} = "develop" ]; then
   CI_TAG="ci"
 fi
 

diff --git a/docs/developer-guide/cstor-volume.md b/docs/developer-guide/cstor-volume.md
@@ -185,4 +185,4 @@ commands after reading the configuration from the CVR.
 ``` 
 
 8. `Node plugin` component is not shown in the above diagram to keep it simple. But the work of node plugin is to
-finally make the volume available for a pod scheduled on the node by staging and publishing it.
+finally make the volume available for a pod scheduled on the node by staging and publishing it.
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ on: @@
         paths:
           - 'deploy/helm/**'
         branches:
-          - master
+          - develop
     jobs:
       release:
@@ Expand Down @@