From ea8049f30d77ff4419597781393b48dd7737de55 Mon Sep 17 00:00:00 2001 From: Akhil Mohan Date: Tue, 4 May 2021 12:46:29 +0530 Subject: [PATCH] chore(crd): add rule to copy auto generated CRDs (#319) Signed-off-by: Akhil Mohan --- .github/workflows/release-charts.yml | 13 +++++++++++++ Makefile | 7 +++++++ buildscripts/generate-manifests.sh | 4 ---- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-charts.yml b/.github/workflows/release-charts.yml index 5e9a258..5bd18a5 100644 --- a/.github/workflows/release-charts.yml +++ b/.github/workflows/release-charts.yml @@ -26,6 +26,19 @@ jobs: with: version: v3.4.0 + - name: Copy generated CRDs + run: make helm + + - name: Check diff, commit and push + run: | + git diff --quiet deploy/helm/charts/crds || CHANGED=$? + if [[ $CHANGED -ne 0 ]]; then + echo "Commiting changes to deploy/helm/charts/crds" + git add deploy/helm/charts/crds + git commit -s -m 'chore(crd): add auto generated crds to helm release' + git push origin master + fi + - name: Run chart-releaser uses: helm/chart-releaser-action@v1.1.0 env: diff --git a/Makefile b/Makefile index 75d5465..ee9b775 100644 --- a/Makefile +++ b/Makefile @@ -215,6 +215,13 @@ manifests: @echo "+ Generating zfs localPV crds" $(PWD)/buildscripts/generate-manifests.sh +helm: + @echo "+ Copying generated CRDs to helm charts" + @cp deploy/yamls/zfsbackup-crd.yaml deploy/helm/charts/crds/zfsbackup.yaml + @cp deploy/yamls/zfsrestore-crd.yaml deploy/helm/charts/crds/zfsrestore.yaml + @cp deploy/yamls/zfssnapshot-crd.yaml deploy/helm/charts/crds/zfssnapshot.yaml + @cp deploy/yamls/zfsvolume-crd.yaml deploy/helm/charts/crds/zfsvolume.yaml + .PHONY: zfs-driver zfs-driver: format @echo "--------------------------------" diff --git a/buildscripts/generate-manifests.sh b/buildscripts/generate-manifests.sh index d92a1e3..3a242b2 100755 --- a/buildscripts/generate-manifests.sh +++ b/buildscripts/generate-manifests.sh @@ -46,7 +46,6 @@ echo ' cat deploy/yamls/zfs.openebs.io_zfsvolumes.yaml >> deploy/yamls/zfsvolume-crd.yaml rm deploy/yamls/zfs.openebs.io_zfsvolumes.yaml -cp deploy/yamls/zfsvolume-crd.yaml deploy/helm/charts/crds/zfsvolume.yaml echo ' @@ -62,7 +61,6 @@ echo ' cat deploy/yamls/zfs.openebs.io_zfssnapshots.yaml >> deploy/yamls/zfssnapshot-crd.yaml rm deploy/yamls/zfs.openebs.io_zfssnapshots.yaml -cp deploy/yamls/zfssnapshot-crd.yaml deploy/helm/charts/crds/zfssnapshot.yaml echo ' @@ -78,7 +76,6 @@ echo ' cat deploy/yamls/zfs.openebs.io_zfsbackups.yaml >> deploy/yamls/zfsbackup-crd.yaml rm deploy/yamls/zfs.openebs.io_zfsbackups.yaml -cp deploy/yamls/zfsbackup-crd.yaml deploy/helm/charts/crds/zfsbackup.yaml echo ' @@ -94,7 +91,6 @@ echo ' cat deploy/yamls/zfs.openebs.io_zfsrestores.yaml >> deploy/yamls/zfsrestore-crd.yaml rm deploy/yamls/zfs.openebs.io_zfsrestores.yaml -cp deploy/yamls/zfsrestore-crd.yaml deploy/helm/charts/crds/zfsrestore.yaml ## create the operator file using all the yamls