diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bf20347..82dd703 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,8 +15,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - with: - token: ${{ secrets.BOT_TOKEN }} - name: Get New Chart Version id: nv @@ -144,13 +142,15 @@ jobs: helm package ../helm-charts/* helm repo index --url https://puppetlabs.github.io/vmpooler-deployment/ . - - name: Git Commit and Push Helm Charts - run: | - git config user.name "puppetlabs-jenkins" - git config user.email "team-quality-engineering@puppet.com" - git add docs - git commit -m "release helm-chart version ${{ steps.nv.outputs.version }}" - git push + # Re-enable this and remove step 4 for manually building the chart if/when + # GitHub allows a way to bypass required status checks on a protected branch. + # - name: Git Commit and Push Helm Charts + # run: | + # git config user.name "puppetlabs-jenkins" + # git config user.email "team-quality-engineering@puppet.com" + # git add docs + # git commit -m "release helm-chart version ${{ steps.nv.outputs.version }}" + # git push - name: Tag Release uses: ncipollo/release-action@v1 diff --git a/README.md b/README.md index a160a6d..0cfea7f 100644 --- a/README.md +++ b/README.md @@ -105,15 +105,18 @@ Artifactory Example: ## Releasing -Create a GitHub tag and release, publish a new docker image, and helm chart by opening a release prep pull request and running the release action: +Create a GitHub tag and release, publish a new docker image, and helm chart by opening a release prep pull request and running the release action below. + +**NOTE**: Due to the GitHub limitation that does not allow any method of bypassing status checks on a protected branch, the process below will technically publish the helm chart pointing to a nonexistent docker tag until the release workflow is run. 1. Bump the "appVersion" key in `helm-charts/vmpooler/Chart.yaml` appropriately based on changes to `docker/Gemfile` and `docker/Gemfile.lock` in merged pull requests since the last release. - This key pertains to the docker tag that will be pushed upon release. 2. Bump the "version" key in `helm-charts/vmpooler/Chart.yaml` appropriately based on changes to the chart itself and increments of the "appVersion" in merged pull requests since the last release. - This key pertains to the helm chart verison that will be pushed upon release. 3. Run `./update-changelog` to update `CHANGELOG.md`. -4. Commit and push changes to a new branch, then open a pull request against `main` and be sure to add the "maintenance" label. -5. After the pull request is approved and merged, then navigate to Actions --> Docker and Helm Release --> run workflow --> Branch: main --> Run workflow. +4. Run `./build-chart` to package the new chart and update the repo index. +5. Commit and push changes to a new branch, then open a pull request against `main` and be sure to add the "maintenance" label. +6. After the pull request is approved and merged, then navigate to Actions --> Docker and Helm Release --> run workflow --> Branch: main --> Run workflow. - This action will push a tagged docker image to the GitHub container registry and helm chart to GitHub pages. ## Contributing diff --git a/docs/index.yaml b/docs/index.yaml index 5bb748d..f1beb9f 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -1,9 +1,24 @@ apiVersion: v1 entries: vmpooler: + - apiVersion: v2 + appVersion: 4.0.0 + created: "2023-01-30T18:28:05.780798345Z" + dependencies: + - name: redis + repository: https://charts.bitnami.com/bitnami + version: 16.13.2 + description: A Helm chart to deploy vmpooler + digest: 80398ade361e8e01187cdff841749083929e27023abd7da31fba80eceb43a2b8 + icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png + name: vmpooler + type: application + urls: + - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-2.0.0.tgz + version: 2.0.0 - apiVersion: v2 appVersion: 1.7.0-prod-all-providers - created: "2022-07-26T13:40:19.309277-05:00" + created: "2023-01-30T18:28:05.502191636Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -18,7 +33,7 @@ entries: version: 1.19.0 - apiVersion: v2 appVersion: 1.7.0-prod-all-providers - created: "2022-07-26T13:40:19.303464-05:00" + created: "2023-01-30T18:28:05.458725553Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -33,7 +48,7 @@ entries: version: 1.18.0 - apiVersion: v2 appVersion: 1.7.0-prod-all-providers - created: "2022-07-26T13:40:19.297544-05:00" + created: "2023-01-30T18:28:05.418607803Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -48,7 +63,7 @@ entries: version: 1.17.0 - apiVersion: v2 appVersion: 1.6.0-prod-all-providers - created: "2022-07-26T13:40:19.290363-05:00" + created: "2023-01-30T18:28:05.37681222Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -63,7 +78,7 @@ entries: version: 1.16.0 - apiVersion: v2 appVersion: 1.6.0-prod-all-providers - created: "2022-07-26T13:40:19.283765-05:00" + created: "2023-01-30T18:28:05.335228636Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -78,7 +93,7 @@ entries: version: 1.15.0 - apiVersion: v2 appVersion: 1.6.0-prod-all-providers - created: "2022-07-26T13:40:19.273245-05:00" + created: "2023-01-30T18:28:05.296018386Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -93,7 +108,7 @@ entries: version: 1.14.0 - apiVersion: v2 appVersion: 1.5.0-prod-all-providers - created: "2022-07-26T13:40:19.265276-05:00" + created: "2023-01-30T18:28:05.254360053Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -108,7 +123,7 @@ entries: version: 1.13.0 - apiVersion: v2 appVersion: 1.5.0-prod-all-providers - created: "2022-07-26T13:40:19.241595-05:00" + created: "2023-01-30T18:28:05.212740053Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -123,7 +138,7 @@ entries: version: 1.12.0 - apiVersion: v2 appVersion: 1.4.0-prod-all-providers - created: "2022-07-26T13:40:19.23447-05:00" + created: "2023-01-30T18:28:05.166248095Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -138,7 +153,7 @@ entries: version: 1.11.1 - apiVersion: v2 appVersion: 1.3.0-prod-all-providers - created: "2022-07-26T13:40:19.227105-05:00" + created: "2023-01-30T18:28:05.113784428Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -153,7 +168,7 @@ entries: version: 1.11.0 - apiVersion: v2 appVersion: 1.2.0-prod-all-providers - created: "2022-07-26T13:40:19.219749-05:00" + created: "2023-01-30T18:28:05.078388928Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -168,7 +183,7 @@ entries: version: 1.10.1 - apiVersion: v2 appVersion: 1.2.0-prod-all-providers - created: "2022-07-26T13:40:19.212795-05:00" + created: "2023-01-30T18:28:05.036165886Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -183,7 +198,7 @@ entries: version: 1.10.0 - apiVersion: v2 appVersion: 1.2.0-prod-all-providers - created: "2022-07-26T13:40:19.38233-05:00" + created: "2023-01-30T18:28:05.73918897Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -198,7 +213,7 @@ entries: version: 1.9.0 - apiVersion: v2 appVersion: 1.2.0-prod-all-providers - created: "2022-07-26T13:40:19.37631-05:00" + created: "2023-01-30T18:28:05.711456178Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -213,7 +228,7 @@ entries: version: 1.8.0 - apiVersion: v2 appVersion: 1.0.0-prod-all-providers - created: "2022-07-26T13:40:19.368419-05:00" + created: "2023-01-30T18:28:05.68457097Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -228,7 +243,7 @@ entries: version: 1.7.1 - apiVersion: v2 appVersion: 1.0.0-prod-all-providers - created: "2022-07-26T13:40:19.362069-05:00" + created: "2023-01-30T18:28:05.644316803Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -243,7 +258,7 @@ entries: version: 1.7.0 - apiVersion: v2 appVersion: 1.3.0 - created: "2022-07-26T13:40:19.337857-05:00" + created: "2023-01-30T18:28:05.617632678Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -258,7 +273,7 @@ entries: version: 1.6.3 - apiVersion: v2 appVersion: 1.3.0 - created: "2022-07-26T13:40:19.329764-05:00" + created: "2023-01-30T18:28:05.584078845Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -273,7 +288,7 @@ entries: version: 1.6.2 - apiVersion: v2 appVersion: 1.3.0 - created: "2022-07-26T13:40:19.322639-05:00" + created: "2023-01-30T18:28:05.557336803Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -288,7 +303,7 @@ entries: version: 1.6.1 - apiVersion: v2 appVersion: 1.3.0 - created: "2022-07-26T13:40:19.314257-05:00" + created: "2023-01-30T18:28:05.530967303Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -301,4 +316,4 @@ entries: urls: - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz version: 1.6.0 -generated: "2022-07-26T13:40:19.197161-05:00" +generated: "2023-01-30T18:28:04.978950803Z" diff --git a/docs/vmpooler-2.0.0.tgz b/docs/vmpooler-2.0.0.tgz new file mode 100644 index 0000000..5f6b80d Binary files /dev/null and b/docs/vmpooler-2.0.0.tgz differ