You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
@@ -68,10 +68,10 @@ For a new major or minor release, work from the `main` branch. For a patch relea
68
68
69
69
Add an entry for the new version to the `CHANGELOG.md` file. Entries in the `CHANGELOG.md` should be in this order:
70
70
71
-
*`[CHANGE]`
72
-
*`[FEATURE]`
73
-
*`[ENHANCEMENT]`
74
-
*`[BUGFIX]`
71
+
-`[CHANGE]`
72
+
-`[FEATURE]`
73
+
-`[ENHANCEMENT]`
74
+
-`[BUGFIX]`
75
75
76
76
Create a PR for the changes to be reviewed.
77
77
@@ -83,6 +83,7 @@ From now on, all work happens on the `release-<major>.<minor>` branch.
83
83
Bump the version in the `VERSION` file in the root of the repository.
84
84
85
85
Regenerate setup.yaml based on latest code and then commit the changed bundle.yaml to the `release-<major>.<minor>` branch:
86
+
86
87
```bash
87
88
make manifests
88
89
git add ./
@@ -108,6 +109,7 @@ tag="$(< VERSION)"
108
109
git tag -a "${tag}" -m "${tag}"
109
110
git push origin "${tag}"
110
111
```
112
+
111
113
Commit all the changes.
112
114
113
115
Finally, create a new release:
@@ -121,7 +123,38 @@ For patch releases, cherry-pick the commits from the release branch into the mas
121
123
122
124
### Publish updated Helm chart
123
125
124
-
This repo includes a "development" chart in the [charts/](./charts/fluent-operator/) directory. For each release, this chart must be published to the [fluent/helm-charts](https://github.com/fluent/helm-charts/tree/main/charts/fluent-operator/) repository which is where Fluent Operators install the chart from. This is currently a manual process. Follow these instructions to update and publish the chart:
126
+
This repo includes a "development" chart in the [charts/](./charts/fluent-operator/) directory. For each release, this chart must be published to the [fluent/helm-charts](https://github.com/fluent/helm-charts/tree/main/charts/fluent-operator/) repository which is where Fluent Operators install the chart from. This is currently a manual process. Follow these instructions to update and publish the chart:
127
+
128
+
- Bump `version` and `appVersion` in the [charts/fluet-operator/Chart.yaml](./charts/fluent-operator/Chart.yaml) file in this repo
129
+
- Manually "sync" (copy, open a PR) the local [chart](./charts/fluent-operator) to [fluent/helm-charts](https://github.com/fluent/helm-charts/tree/main/charts/fluent-operator/)
130
+
131
+
# Automations
132
+
133
+
## Bump fluent-bit version
134
+
135
+
To bump the fluent-bit version, you can run the [pipeline](https://github.com/fluent/fluent-operator/actions/workflows/bump-fluent-bit-version.yaml), by simply providing a x.y.z version number. You can check the [fluent-bit releases](https://github.com/fluent/fluent-bit/releases) to get the version number.
136
+
137
+
Or you can run the following command. Note that we need to remove the leading 'v'.
After the pipeline finishes, we just need to review and merge the pull requests.
157
+
158
+
## Build the fluent-watcher image for fluent-bit
125
159
126
-
* Bump `version` and `appVersion` in the [charts/fluet-operator/Chart.yaml](./charts/fluent-operator/Chart.yaml) file in this repo
127
-
* Manually "sync" (copy, open a PR) the local [chart](./charts/fluent-operator) to [fluent/helm-charts](https://github.com/fluent/helm-charts/tree/main/charts/fluent-operator/)
160
+
This [pipeline](https://github.com/fluent/fluent-operator/actions/workflows/build-fb-image.yaml) is used to build the image. It will read the version number from `cmd/fluent-watcher/fluentbit/VERSION`, which can be update automatically via the [pipeline](#bump-fluent-bit-version).
0 commit comments