Skip to content

Commit 64875d3

Browse files
potiukjscheffl
andauthored
Fix helm release process (#64040)
* Fix helm release process * Fix CI helm checks, remove version number param * Remove rc preparation test as not existing anymore --------- Co-authored-by: Jens Scheffler <jscheffl@apache.org>
1 parent 5e64571 commit 64875d3

File tree

7 files changed

+98
-155
lines changed

7 files changed

+98
-155
lines changed

.github/workflows/helm-tests.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,17 +127,13 @@ jobs:
127127
- name: "Helm release tarball"
128128
run: >
129129
breeze release-management prepare-helm-chart-tarball --ignore-version-check --override-tag
130-
--skip-tag-signing --version 0.0.0 --version-suffix dev0
130+
--skip-tag-signing --version-suffix dev0
131131
- name: Generate GPG key for signing
132132
# Sometimes the key will be already added to the keyring, so we ignore the error
133133
run: gpg --batch --passphrase '' --quick-gen-key dev@airflow.apache.org default default || true
134134
- name: "Helm release package"
135135
run: >
136136
breeze release-management prepare-helm-chart-package --sign-email dev@airflow.apache.org
137-
- name: "Helm release package (RC version)"
138-
run: >
139-
breeze release-management prepare-helm-chart-package --sign-email dev@airflow.apache.org
140-
--version-suffix rc1
141137
- name: "Sign artifacts for ASF distribution"
142138
run: ./dev/sign.sh dist/airflow-*.tgz dist/airflow-*-source.tar.gz
143139
env:

chart/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
---
2020
apiVersion: v2
2121
name: airflow
22-
version: 1.20.0-dev
22+
version: 1.20.0
2323
appVersion: 3.1.8
2424
description: The official Helm chart to deploy Apache Airflow, a platform to
2525
programmatically author, schedule, and monitor workflows

dev/README_RELEASE_HELM_CHART.md

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
- [Licence check](#licence-check)
3838
- [Signature check](#signature-check)
3939
- [SHA512 sum check](#sha512-sum-check)
40-
- [Verify release candidates by Contributors](#verify-release-candidates-by-contributors)
40+
- [Verify the release candidates by Contributors](#verify-the-release-candidates-by-contributors)
4141
- [Publish the final release](#publish-the-final-release)
4242
- [Summarize the voting for the release](#summarize-the-voting-for-the-release)
4343
- [Publish release to SVN](#publish-release-to-svn)
@@ -223,7 +223,7 @@ rm -rf dist/*
223223
- Generate the source tarball:
224224

225225
```shell
226-
breeze release-management prepare-helm-chart-tarball --version ${VERSION} --version-suffix ${VERSION_SUFFIX}
226+
breeze release-management prepare-helm-chart-tarball --version ${VERSION}
227227
```
228228

229229
Note: The version suffix is only used for the RC tag and tag message. The version in the tarball is without the suffix, so the tarball can be released as-is when the vote passes.
@@ -313,31 +313,17 @@ you need to run several workflows to publish the documentation. More details abo
313313
[Docs README](../docs/README.md) showing the architecture and workflows including manual workflows for
314314
emergency cases.
315315

316-
There are two steps to publish the documentation:
317316

318-
1. Publish the documentation to the `staging` S3 bucket.
319-
320-
The release manager publishes the documentation using GitHub Actions workflow
321-
[Publish Docs to S3](https://github.com/apache/airflow/actions/workflows/publish-docs-to-s3.yml).
322-
323-
You can specify the RC tag to use to build the docs and 'helm-chart' passed as packages to be built.
324-
325-
The release manager publishes the documentation using GitHub Actions workflow
326-
[Publish Docs to S3](https://github.com/apache/airflow/actions/workflows/publish-docs-to-s3.yml). By
327-
default `auto` selection should publish to the `staging` bucket - based on
328-
the tag you use - pre-release tags go to staging. But you can also override it and specify the destination
329-
manually to be `live` or `staging`.
330-
331-
After that step, the provider documentation should be available under the https://airflow.staged.apache.org
332-
(same as in the helm chart documentation).
333-
334-
2. Invalidate Fastly cache for the documentation.
317+
You should use the `breeze` command to publish the documentation.
318+
The command does the following:
335319

336-
In order to do it, you need to run the [Build docs](https://github.com/apache/airflow-site/actions/workflows/build.yml)
337-
workflow in `airflow-site` repository. Make sure to use `staging` branch.
320+
1. Triggers [Publish Docs to S3](https://github.com/apache/airflow/actions/workflows/publish-docs-to-s3.yml).
321+
2. Triggers workflow in apache/airflow-site to refresh
322+
3. Triggers S3 to GitHub Sync
338323

339-
After that workflow completes, the new version should be available in the drop-down list and stable links
340-
should be updated and Fastly cache should be invalidated.
324+
```shell script
325+
breeze workflow-run publish-docs --ref helm-chart/${VERSION}${VERSION_SUFFIX} --site-env staging helm-chart
326+
```
341327

342328
## Prepare issue for testing status of rc
343329

@@ -406,6 +392,8 @@ gpg: using RSA key E1A1E984F55B8F280BD9CBA20BB7163892A2E48E
406392
gpg: Good signature from "Jed Cunningham <jedcunningham@apache.org>" [ultimate]
407393
plugin: Chart SHA verified. sha256:b33eac716e0416a18af89fb4fa1043fcfcf24f9f903cda3912729815213525df
408394
395+
The documentation is available at https://airflow.staged.apache.org/helm-chart/${VERSION}/.
396+
409397
The vote will be open for at least 72 hours ($VOTE_END_TIME UTC) or until the necessary number of votes is reached.
410398
411399
https://www.timeanddate.com/countdown/$TIME_DATE_URL
@@ -419,6 +407,12 @@ Please vote accordingly:
419407
Only votes from PMC members are binding, but members of the community are
420408
encouraged to test the release and vote with "(non-binding)".
421409
410+
The test procedure for PMC members is described in:
411+
https://github.com/apache/airflow/blob/main/dev/README_RELEASE_HELM_CHART.md#verify-the-release-candidate-by-pmc-members
412+
413+
The test procedure for contributors and members of the community who would like to test this RC is described in:
414+
https://github.com/apache/airflow/blob/main/dev/README_RELEASE_HELM_CHART.md#verify-the-release-candidates-by-contributors
415+
422416
Consider this my (binding) +1.
423417
424418
For license checks, the .rat-excludes files is included, so you can run the following to verify licenses (just update your path to rat):
@@ -432,6 +426,7 @@ simply ${VERSION}. This will allow us to rename the artifact without modifying
432426
the artifact checksums when we actually release it.
433427
434428
The status of testing the Helm Chart by the community is kept here:
429+
435430
<TODO COPY LINK TO THE ISSUE CREATED>
436431
437432
Thanks,
@@ -697,7 +692,7 @@ Checking airflow-1.0.0.tgz.sha512
697692
Checking airflow-chart-1.0.0-source.tar.gz.sha512
698693
```
699694

700-
# Verify release candidates by Contributors
695+
# Verify the release candidates by Contributors
701696

702697
Contributors can run below commands to test the Helm Chart
703698

@@ -986,7 +981,7 @@ EOF
986981
## Bump chart version in Chart.yaml
987982

988983
Bump the chart version to the next version in `chart/Chart.yaml` in main.
989-
984+
Do not add `-dev` suffix to the version.
990985

991986
## Remove old releases
992987

0 commit comments

Comments
 (0)