Skip to content

build-fb-image: Update release documentation #1515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

marcofranssen
Copy link
Collaborator

@marcofranssen marcofranssen commented Mar 19, 2025

Note

Build on top of #1513 and #1514, ensure to merge those PRs first as described in the PR.

#1513 merge using a merge commit.
#1514 merge using a rebase commit.

Then this PR should be rebased, and then it can be merged using a merge commit, that way all commits are nicely maintained to keep traceability of the changes in the repo.

(Sorry kind of a Git perfectionist 😉 trying to document every step I take in dev process.)

This PR will only trigger the workflow if the cmd/fluent-watcher/fluentbit/VERSION file changes on the main branch. This would happen if another PR is merged to main that modifies this file.

I updated RELEASE.md as well.

Another PR by @truongnht will follow to automate the updating of that file using renovate. Once those renovate PRs will be merged the release will happen automatically.

resolves #1510

@marcofranssen marcofranssen force-pushed the automate-release-fluent-bit branch 2 times, most recently from b457a5b to a909cae Compare March 19, 2025 21:59
@marcofranssen
Copy link
Collaborator Author

Rebased for reviewing convenience on top of master.

Comment on lines 53 to 54
echo "image-base-tag=$IMAGE_BASE_TAG" >> $GITHUB_OUTPUT
echo "image-major-minor=$MAJOR_MINOR" >> $GITHUB_OUTPUT
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Follow the github actions convention for naming outputs. E.g. see any action outputs. Like the setup-go go-version output or any other popular actions.

This helps also distinguishing the environment variables from the outputs.

* Execute the [bump-fluent-bit-version](https://github.com/fluent/fluent-operator/actions/workflows/bump-fluent-bit-version.yaml) workflow dispatch to generate a PR to update fluent-bit version references in this repo
* Merge the PR generated by the [bump-fluent-bit-version](https://github.com/fluent/fluent-operator/actions/workflows/bump-fluent-bit-version.yaml) workflow
* Execute the [build-fb-image](https://github.com/fluent/fluent-operator/actions/workflows/build-fb-image.yaml) workflow dispatch to build and publish the new image
* Execute the [bump-fluent-bit-version](https://github.com/fluent/fluent-operator/actions/workflows/bump-fluent-bit-version.yaml) workflow dispatch to generate a PR to update fluent-bit version references in this repo
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would change once the renovate PR is created. Basically the step would be removed.

@joshuabaird
Copy link
Collaborator

@marcofranssen I'm working on a PR to re-factor this workflow entirely. Let's hold on merging this and I'll try to combine your changes into my re-factored workflow.

@marcofranssen marcofranssen force-pushed the automate-release-fluent-bit branch 3 times, most recently from e9f3622 to 4b13e0a Compare March 21, 2025 11:53
@marcofranssen
Copy link
Collaborator Author

Rebased on master and fixed conflicts due to other PR improvements. Diff should be slightly reduced due to that.

@marcofranssen marcofranssen force-pushed the automate-release-fluent-bit branch 2 times, most recently from 8698144 to 3aef08a Compare March 24, 2025 07:48
@marcofranssen marcofranssen force-pushed the automate-release-fluent-bit branch from 3aef08a to c418859 Compare March 25, 2025 13:05
@marcofranssen marcofranssen changed the title Automate fluent-bit image releases build-fb-image: Update release documentation Mar 25, 2025
@marcofranssen marcofranssen force-pushed the automate-release-fluent-bit branch from c418859 to e59885a Compare March 25, 2025 14:49
@joshuabaird joshuabaird merged commit 3223e5e into fluent:master Mar 27, 2025
2 checks passed
joshuabaird pushed a commit to joshuabaird/fluent-operator that referenced this pull request Mar 27, 2025
@marcofranssen marcofranssen deleted the automate-release-fluent-bit branch March 29, 2025 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

help request: FluentBit operator images runs behind on patch releases and doesn't have signatures
2 participants