Skip to content

Commit fca7ca0

Browse files
yachubyachub
authored
Merge pull request #90 from puppetlabs/revert_helm_release_process
Manually generate chart due to github limitation
2 parents 95807de + 00c3c40 commit fca7ca0

File tree

4 files changed

+51
-33
lines changed

4 files changed

+51
-33
lines changed

‎.github/workflows/release.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v3
18-
with:
19-
token: ${{ secrets.BOT_TOKEN }}
2018

2119
- name: Get New Chart Version
2220
id: nv
@@ -144,13 +142,15 @@ jobs:
144142
helm package ../helm-charts/*
145143
helm repo index --url https://puppetlabs.github.io/vmpooler-deployment/ .
146144
147-
- name: Git Commit and Push Helm Charts
148-
run: |
149-
git config user.name "puppetlabs-jenkins"
150-
git config user.email "[email protected]"
151-
git add docs
152-
git commit -m "release helm-chart version ${{ steps.nv.outputs.version }}"
153-
git push
145+
# Re-enable this and remove step 4 for manually building the chart if/when
146+
# GitHub allows a way to bypass required status checks on a protected branch.
147+
# - name: Git Commit and Push Helm Charts
148+
# run: |
149+
# git config user.name "puppetlabs-jenkins"
150+
# git config user.email "[email protected]"
151+
# git add docs
152+
# git commit -m "release helm-chart version ${{ steps.nv.outputs.version }}"
153+
# git push
154154

155155
- name: Tag Release
156156
uses: ncipollo/release-action@v1

‎README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,18 @@ Artifactory Example:
105105

106106
## Releasing
107107

108-
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:
108+
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.
109+
110+
**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.
109111

110112
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.
111113
- This key pertains to the docker tag that will be pushed upon release.
112114
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.
113115
- This key pertains to the helm chart verison that will be pushed upon release.
114116
3. Run `./update-changelog` to update `CHANGELOG.md`.
115-
4. Commit and push changes to a new branch, then open a pull request against `main` and be sure to add the "maintenance" label.
116-
5. After the pull request is approved and merged, then navigate to Actions --> Docker and Helm Release --> run workflow --> Branch: main --> Run workflow.
117+
4. Run `./build-chart` to package the new chart and update the repo index.
118+
5. Commit and push changes to a new branch, then open a pull request against `main` and be sure to add the "maintenance" label.
119+
6. After the pull request is approved and merged, then navigate to Actions --> Docker and Helm Release --> run workflow --> Branch: main --> Run workflow.
117120
- This action will push a tagged docker image to the GitHub container registry and helm chart to GitHub pages.
118121

119122
## Contributing

‎docs/index.yaml‎

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,24 @@
11
apiVersion: v1
22
entries:
33
vmpooler:
4+
- apiVersion: v2
5+
appVersion: 4.0.0
6+
created: "2023-01-30T18:28:05.780798345Z"
7+
dependencies:
8+
- name: redis
9+
repository: https://charts.bitnami.com/bitnami
10+
version: 16.13.2
11+
description: A Helm chart to deploy vmpooler
12+
digest: 80398ade361e8e01187cdff841749083929e27023abd7da31fba80eceb43a2b8
13+
icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png
14+
name: vmpooler
15+
type: application
16+
urls:
17+
- https://puppetlabs.github.io/vmpooler-deployment/vmpooler-2.0.0.tgz
18+
version: 2.0.0
419
- apiVersion: v2
520
appVersion: 1.7.0-prod-all-providers
6-
created: "2022-07-26T13:40:19.309277-05:00"
21+
created: "2023-01-30T18:28:05.502191636Z"
722
dependencies:
823
- name: redis
924
repository: https://charts.bitnami.com/bitnami
@@ -18,7 +33,7 @@ entries:
1833
version: 1.19.0
1934
- apiVersion: v2
2035
appVersion: 1.7.0-prod-all-providers
21-
created: "2022-07-26T13:40:19.303464-05:00"
36+
created: "2023-01-30T18:28:05.458725553Z"
2237
dependencies:
2338
- name: redis
2439
repository: https://charts.bitnami.com/bitnami
@@ -33,7 +48,7 @@ entries:
3348
version: 1.18.0
3449
- apiVersion: v2
3550
appVersion: 1.7.0-prod-all-providers
36-
created: "2022-07-26T13:40:19.297544-05:00"
51+
created: "2023-01-30T18:28:05.418607803Z"
3752
dependencies:
3853
- name: redis
3954
repository: https://charts.bitnami.com/bitnami
@@ -48,7 +63,7 @@ entries:
4863
version: 1.17.0
4964
- apiVersion: v2
5065
appVersion: 1.6.0-prod-all-providers
51-
created: "2022-07-26T13:40:19.290363-05:00"
66+
created: "2023-01-30T18:28:05.37681222Z"
5267
dependencies:
5368
- name: redis
5469
repository: https://charts.bitnami.com/bitnami
@@ -63,7 +78,7 @@ entries:
6378
version: 1.16.0
6479
- apiVersion: v2
6580
appVersion: 1.6.0-prod-all-providers
66-
created: "2022-07-26T13:40:19.283765-05:00"
81+
created: "2023-01-30T18:28:05.335228636Z"
6782
dependencies:
6883
- name: redis
6984
repository: https://charts.bitnami.com/bitnami
@@ -78,7 +93,7 @@ entries:
7893
version: 1.15.0
7994
- apiVersion: v2
8095
appVersion: 1.6.0-prod-all-providers
81-
created: "2022-07-26T13:40:19.273245-05:00"
96+
created: "2023-01-30T18:28:05.296018386Z"
8297
dependencies:
8398
- name: redis
8499
repository: https://charts.bitnami.com/bitnami
@@ -93,7 +108,7 @@ entries:
93108
version: 1.14.0
94109
- apiVersion: v2
95110
appVersion: 1.5.0-prod-all-providers
96-
created: "2022-07-26T13:40:19.265276-05:00"
111+
created: "2023-01-30T18:28:05.254360053Z"
97112
dependencies:
98113
- name: redis
99114
repository: https://charts.bitnami.com/bitnami
@@ -108,7 +123,7 @@ entries:
108123
version: 1.13.0
109124
- apiVersion: v2
110125
appVersion: 1.5.0-prod-all-providers
111-
created: "2022-07-26T13:40:19.241595-05:00"
126+
created: "2023-01-30T18:28:05.212740053Z"
112127
dependencies:
113128
- name: redis
114129
repository: https://charts.bitnami.com/bitnami
@@ -123,7 +138,7 @@ entries:
123138
version: 1.12.0
124139
- apiVersion: v2
125140
appVersion: 1.4.0-prod-all-providers
126-
created: "2022-07-26T13:40:19.23447-05:00"
141+
created: "2023-01-30T18:28:05.166248095Z"
127142
dependencies:
128143
- name: redis
129144
repository: https://charts.bitnami.com/bitnami
@@ -138,7 +153,7 @@ entries:
138153
version: 1.11.1
139154
- apiVersion: v2
140155
appVersion: 1.3.0-prod-all-providers
141-
created: "2022-07-26T13:40:19.227105-05:00"
156+
created: "2023-01-30T18:28:05.113784428Z"
142157
dependencies:
143158
- name: redis
144159
repository: https://charts.bitnami.com/bitnami
@@ -153,7 +168,7 @@ entries:
153168
version: 1.11.0
154169
- apiVersion: v2
155170
appVersion: 1.2.0-prod-all-providers
156-
created: "2022-07-26T13:40:19.219749-05:00"
171+
created: "2023-01-30T18:28:05.078388928Z"
157172
dependencies:
158173
- name: redis
159174
repository: https://charts.bitnami.com/bitnami
@@ -168,7 +183,7 @@ entries:
168183
version: 1.10.1
169184
- apiVersion: v2
170185
appVersion: 1.2.0-prod-all-providers
171-
created: "2022-07-26T13:40:19.212795-05:00"
186+
created: "2023-01-30T18:28:05.036165886Z"
172187
dependencies:
173188
- name: redis
174189
repository: https://charts.bitnami.com/bitnami
@@ -183,7 +198,7 @@ entries:
183198
version: 1.10.0
184199
- apiVersion: v2
185200
appVersion: 1.2.0-prod-all-providers
186-
created: "2022-07-26T13:40:19.38233-05:00"
201+
created: "2023-01-30T18:28:05.73918897Z"
187202
dependencies:
188203
- name: redis
189204
repository: https://charts.bitnami.com/bitnami
@@ -198,7 +213,7 @@ entries:
198213
version: 1.9.0
199214
- apiVersion: v2
200215
appVersion: 1.2.0-prod-all-providers
201-
created: "2022-07-26T13:40:19.37631-05:00"
216+
created: "2023-01-30T18:28:05.711456178Z"
202217
dependencies:
203218
- name: redis
204219
repository: https://charts.bitnami.com/bitnami
@@ -213,7 +228,7 @@ entries:
213228
version: 1.8.0
214229
- apiVersion: v2
215230
appVersion: 1.0.0-prod-all-providers
216-
created: "2022-07-26T13:40:19.368419-05:00"
231+
created: "2023-01-30T18:28:05.68457097Z"
217232
dependencies:
218233
- name: redis
219234
repository: https://charts.bitnami.com/bitnami
@@ -228,7 +243,7 @@ entries:
228243
version: 1.7.1
229244
- apiVersion: v2
230245
appVersion: 1.0.0-prod-all-providers
231-
created: "2022-07-26T13:40:19.362069-05:00"
246+
created: "2023-01-30T18:28:05.644316803Z"
232247
dependencies:
233248
- name: redis
234249
repository: https://charts.bitnami.com/bitnami
@@ -243,7 +258,7 @@ entries:
243258
version: 1.7.0
244259
- apiVersion: v2
245260
appVersion: 1.3.0
246-
created: "2022-07-26T13:40:19.337857-05:00"
261+
created: "2023-01-30T18:28:05.617632678Z"
247262
dependencies:
248263
- name: redis
249264
repository: https://charts.bitnami.com/bitnami
@@ -258,7 +273,7 @@ entries:
258273
version: 1.6.3
259274
- apiVersion: v2
260275
appVersion: 1.3.0
261-
created: "2022-07-26T13:40:19.329764-05:00"
276+
created: "2023-01-30T18:28:05.584078845Z"
262277
dependencies:
263278
- name: redis
264279
repository: https://charts.bitnami.com/bitnami
@@ -273,7 +288,7 @@ entries:
273288
version: 1.6.2
274289
- apiVersion: v2
275290
appVersion: 1.3.0
276-
created: "2022-07-26T13:40:19.322639-05:00"
291+
created: "2023-01-30T18:28:05.557336803Z"
277292
dependencies:
278293
- name: redis
279294
repository: https://charts.bitnami.com/bitnami
@@ -288,7 +303,7 @@ entries:
288303
version: 1.6.1
289304
- apiVersion: v2
290305
appVersion: 1.3.0
291-
created: "2022-07-26T13:40:19.314257-05:00"
306+
created: "2023-01-30T18:28:05.530967303Z"
292307
dependencies:
293308
- name: redis
294309
repository: https://charts.bitnami.com/bitnami
@@ -301,4 +316,4 @@ entries:
301316
urls:
302317
- https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz
303318
version: 1.6.0
304-
generated: "2022-07-26T13:40:19.197161-05:00"
319+
generated: "2023-01-30T18:28:04.978950803Z"

‎docs/vmpooler-2.0.0.tgz‎

92.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)