diff --git a/.github/workflows/build.yaml b/.github/workflows/build-release.yaml similarity index 76% rename from .github/workflows/build.yaml rename to .github/workflows/build-release.yaml index c7ea8f2..3259376 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build-release.yaml @@ -1,4 +1,4 @@ -name: Build Container Image +name: Build and Release on: push: @@ -52,8 +52,24 @@ jobs: VERSION="${TAG_VERSION#v}" make bundle bundle-build bundle-push IMAGE_TAG_BASE=ghcr.io/${{ github.repository }} VERSION=$VERSION IMG=ghcr.io/${{ github.repository }}:$TAG_VERSION + helm-chart: + name: helm-chart + needs: build-push-docker + runs-on: ubuntu-latest + steps: + - name: Chart | Push + uses: appany/helm-oci-chart-releaser@v0.3.0 + with: + name: s3-operator + repository: helm-charts/s3-operator + tag: ${{ github.ref_name }} + path: charts/s3-operator # Default charts/{name} + registry: ghcr.io + registry_username: ${{ github.repository_owner }} + registry_password: ${{ secrets.GITHUB_TOKEN }} + release: - needs: build-push-bundle + needs: build-push-docker name: release runs-on: ubuntu-latest steps: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml deleted file mode 100644 index d3276bf..0000000 --- a/.github/workflows/release.yaml +++ /dev/null @@ -1,31 +0,0 @@ -name: Release Helm Chart - -on: - push: - branches: - - main - -jobs: - release: - name: release - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Configure Git - run: | - git config user.name "$GITHUB_ACTOR" - git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - - - name: Install Helm - uses: azure/setup-helm@v3 - - - name: Run chart-releaser - uses: helm/chart-releaser-action@v1.5.0 - env: - CR_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - charts_dir: deploy/charts diff --git a/deploy/charts/s3-operator/.helmignore b/charts/s3-operator/.helmignore similarity index 100% rename from deploy/charts/s3-operator/.helmignore rename to charts/s3-operator/.helmignore diff --git a/deploy/charts/s3-operator/Chart.yaml b/charts/s3-operator/Chart.yaml similarity index 98% rename from deploy/charts/s3-operator/Chart.yaml rename to charts/s3-operator/Chart.yaml index dd2caa0..e8038ae 100644 --- a/deploy/charts/s3-operator/Chart.yaml +++ b/charts/s3-operator/Chart.yaml @@ -13,7 +13,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.3.0 +version: 0.2.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/deploy/charts/s3-operator/templates/_helpers.tpl b/charts/s3-operator/templates/_helpers.tpl similarity index 100% rename from deploy/charts/s3-operator/templates/_helpers.tpl rename to charts/s3-operator/templates/_helpers.tpl diff --git a/deploy/charts/s3-operator/templates/clusterresourcequota-updater-binding-rbac.yaml b/charts/s3-operator/templates/clusterresourcequota-updater-binding-rbac.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/clusterresourcequota-updater-binding-rbac.yaml rename to charts/s3-operator/templates/clusterresourcequota-updater-binding-rbac.yaml diff --git a/deploy/charts/s3-operator/templates/clusterresourcequota-updater-rbac.yaml b/charts/s3-operator/templates/clusterresourcequota-updater-rbac.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/clusterresourcequota-updater-rbac.yaml rename to charts/s3-operator/templates/clusterresourcequota-updater-rbac.yaml diff --git a/deploy/charts/s3-operator/templates/controller-manager-config.yaml b/charts/s3-operator/templates/controller-manager-config.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/controller-manager-config.yaml rename to charts/s3-operator/templates/controller-manager-config.yaml diff --git a/deploy/charts/s3-operator/templates/deployment.yaml b/charts/s3-operator/templates/deployment.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/deployment.yaml rename to charts/s3-operator/templates/deployment.yaml diff --git a/deploy/charts/s3-operator/templates/leader-election-rbac.yaml b/charts/s3-operator/templates/leader-election-rbac.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/leader-election-rbac.yaml rename to charts/s3-operator/templates/leader-election-rbac.yaml diff --git a/deploy/charts/s3-operator/templates/manager-rbac.yaml b/charts/s3-operator/templates/manager-rbac.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/manager-rbac.yaml rename to charts/s3-operator/templates/manager-rbac.yaml diff --git a/deploy/charts/s3-operator/templates/metrics-reader-rbac.yaml b/charts/s3-operator/templates/metrics-reader-rbac.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/metrics-reader-rbac.yaml rename to charts/s3-operator/templates/metrics-reader-rbac.yaml diff --git a/deploy/charts/s3-operator/templates/metrics-service.yaml b/charts/s3-operator/templates/metrics-service.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/metrics-service.yaml rename to charts/s3-operator/templates/metrics-service.yaml diff --git a/deploy/charts/s3-operator/templates/proxy-rbac.yaml b/charts/s3-operator/templates/proxy-rbac.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/proxy-rbac.yaml rename to charts/s3-operator/templates/proxy-rbac.yaml diff --git a/deploy/charts/s3-operator/templates/resourcequota-status-updater-binding-rbac.yaml b/charts/s3-operator/templates/resourcequota-status-updater-binding-rbac.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/resourcequota-status-updater-binding-rbac.yaml rename to charts/s3-operator/templates/resourcequota-status-updater-binding-rbac.yaml diff --git a/deploy/charts/s3-operator/templates/resourcequota-status-updater-rbac.yaml b/charts/s3-operator/templates/resourcequota-status-updater-rbac.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/resourcequota-status-updater-rbac.yaml rename to charts/s3-operator/templates/resourcequota-status-updater-rbac.yaml diff --git a/deploy/charts/s3-operator/templates/s3bucket-crd.yaml b/charts/s3-operator/templates/s3bucket-crd.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/s3bucket-crd.yaml rename to charts/s3-operator/templates/s3bucket-crd.yaml diff --git a/deploy/charts/s3-operator/templates/s3user-crd.yaml b/charts/s3-operator/templates/s3user-crd.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/s3user-crd.yaml rename to charts/s3-operator/templates/s3user-crd.yaml diff --git a/deploy/charts/s3-operator/templates/s3userclaim-crd.yaml b/charts/s3-operator/templates/s3userclaim-crd.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/s3userclaim-crd.yaml rename to charts/s3-operator/templates/s3userclaim-crd.yaml diff --git a/deploy/charts/s3-operator/templates/selfsigned-issuer.yaml b/charts/s3-operator/templates/selfsigned-issuer.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/selfsigned-issuer.yaml rename to charts/s3-operator/templates/selfsigned-issuer.yaml diff --git a/deploy/charts/s3-operator/templates/serviceaccount.yaml b/charts/s3-operator/templates/serviceaccount.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/serviceaccount.yaml rename to charts/s3-operator/templates/serviceaccount.yaml diff --git a/deploy/charts/s3-operator/templates/serving-cert.yaml b/charts/s3-operator/templates/serving-cert.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/serving-cert.yaml rename to charts/s3-operator/templates/serving-cert.yaml diff --git a/deploy/charts/s3-operator/templates/validating-webhook-configuration.yaml b/charts/s3-operator/templates/validating-webhook-configuration.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/validating-webhook-configuration.yaml rename to charts/s3-operator/templates/validating-webhook-configuration.yaml diff --git a/deploy/charts/s3-operator/templates/webhook-service.yaml b/charts/s3-operator/templates/webhook-service.yaml similarity index 100% rename from deploy/charts/s3-operator/templates/webhook-service.yaml rename to charts/s3-operator/templates/webhook-service.yaml diff --git a/deploy/charts/s3-operator/values.yaml b/charts/s3-operator/values.yaml similarity index 100% rename from deploy/charts/s3-operator/values.yaml rename to charts/s3-operator/values.yaml