Skip to content

Re-factor fluent-bit image build CI workflows #1526

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 54 commits into from
Closed

Re-factor fluent-bit image build CI workflows #1526

wants to merge 54 commits into from

Conversation

@joshuabaird
Copy link
Collaborator

Re-factors the CI workflows for building & pushing the fluent-bit images to match what was previously done for the fluentd image here.

The main motivators behind this:

@joshuabaird
Update fluentd to v1.17.1.
4c3846d 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird joshuabaird marked this pull request as ready for review March 20, 2025 17:11
@joshuabaird
Copy link
Collaborator Author

@marcofranssen Re-factor of the fluent-bit CI workflows with your changes incorporated from #1515

marcofranssen
marcofranssen reviewed Mar 20, 2025
View reviewed changes
.github/workflows/build-fluentbit-image.yaml Outdated
sources: |
${{ env.GHCR_REPO }}@${{ needs.build-debug.outputs.digest_amd64 }}
${{ env.GHCR_REPO }}@${{ needs.build-debug.outputs.digest_arm64 }}

No newline at end of file
Copy link
Collaborator

Choose a reason for hiding this comment

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

This thing would change with .editorconfig. Maybe good idea to install the plugin for your IDEA.

marcofranssen
marcofranssen reviewed Mar 20, 2025
View reviewed changes
.github/workflows/build-fluentbit-image.yaml Outdated
manifest:
name: Publish image manifests
runs-on: ubuntu-latest
needs: [build, build-debug,build-tags]
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
needs: [build, build-debug,build-tags]
needs: [build, build-debug, build-tags]

Nit

marcofranssen
marcofranssen reviewed Mar 20, 2025
View reviewed changes
.github/workflows/build-fluentbit-image.yaml Outdated

permissions:
contents: read
packages: write
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
packages: write

The specific jobs that have to write are already below with specific permissions to allow writes.

You might even consider moving the read also to the specific jobs.

marcofranssen
marcofranssen reviewed Mar 20, 2025
View reviewed changes
marcofranssen
marcofranssen reviewed Mar 20, 2025
View reviewed changes
.github/workflows/build-fluentbit-image.yaml Outdated
build-debug:
name: Build/push debug image (${{ matrix.platform }})
runs-on: ${{ matrix.runs-on }}
needs: [build-info,build-tags]
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
needs: [build-info,build-tags]
needs: [build-info, build-tags]

Nit

marcofranssen
marcofranssen reviewed Mar 20, 2025
View reviewed changes
.github/workflows/build-fluentbit-image.yaml Outdated
id: output-digests
run: |
platform="${{ matrix.platform }}"
# Convert "linux/amd64" to just amd64 for the output variable name
Copy link
Collaborator

@marcofranssen marcofranssen Mar 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
# Convert "linux/amd64" to just amd64 for the output variable name
# Convert "linux/amd64" or "linux/arm64" to just amd64 or arm64 for the output variable name

marcofranssen
marcofranssen reviewed Mar 20, 2025
View reviewed changes
.github/workflows/build-fluentbit-image.yaml Outdated
build:
name: Build/push image (${{ matrix.platform }})
runs-on: ${{ matrix.runs-on }}
needs: [build-info,build-tags]
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
needs: [build-info,build-tags]
needs: [build-info, build-tags]

Nit

@marcofranssen
Copy link
Collaborator

@joshuabaird I have rebased #1515 once more on the master branch, so diff reduced and handled conflicts with all the other improvements done in other PRs. You might want to double check copying some stuff.

I can also change my PR to just have the docs update and push workflow trigger adjustement afterwards, so the PR doesn't doe the other changes. Then basically both PRs still add value.

@joshuabaird joshuabaird requested a review from cw-Guo March 21, 2025 13:33
@joshuabaird
Copy link
Collaborator Author

@marcofranssen I think I addressed all of your feedback. Thanks!

cw-Guo
cw-Guo previously approved these changes Mar 21, 2025
View reviewed changes
@wenchajun
Copy link
Member

please resolve conflicts

@benjaminhuo
Copy link
Member

cc @wanjunlei

@benjaminhuo
Copy link
Member

That's fantastic! Thanks @joshuabaird

@joshuabaird joshuabaird force-pushed the chore/fluentbit-ci-refactor branch from df252f4 to f894065 Compare March 24, 2025 13:08
cw-Guo and others added 11 commits March 24, 2025 09:09
@cw-Guo @joshuabaird
add changelog
ad1b682 
Signed-off-by: juicer <cwguoz@gmail.com>
Signed-off-by: Josh Baird <jbaird@galileo.io>
@cw-Guo @joshuabaird
bump version to 3.3.0
209c721 
Signed-off-by: juicer <cwguoz@gmail.com>
Signed-off-by: Josh Baird <jbaird@galileo.io>
@cw-Guo @joshuabaird
add signoff to release pr
2c75f2c 
Signed-off-by: chengweiguo <chengweiguo@bytedance.com>
Signed-off-by: Josh Baird <jbaird@galileo.io>
@cw-Guo @joshuabaird
fix bugs and improve the validation
b8c52a6 
Signed-off-by: juicer <cwguoz@gmail.com>
Signed-off-by: Josh Baird <jbaird@galileo.io>
@duj4 @joshuabaird
Update fluent-operator-clusterRole.yaml
834e57b 
Remove the redundant "configmaps" from resources.

Signed-off-by: duj4 <boyu.du@yahoo.com>
Signed-off-by: Josh Baird <jbaird@galileo.io>
@github-actions @joshuabaird
Bump fluent-bit to 3.2.9 (fluent#1511)
42bb068 
- Updated VERSION file - Updated manifest files - Updated values.yaml in Helm chart

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: joshuabaird <6271918+joshuabaird@users.noreply.github.com>
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
New fluentbit CI.
7a45422 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
New fluentbit CI.
68aa9d6 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
New fluentbit CI.
5875a70 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
New fluentbit CI.
5b56ef4 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
New fluentbit CI.
eeef29d 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Debug.
d7eeb13 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Debug.
44b6b8c 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Debug.
8ef3a14 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Debug.
d893a21 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Debug.
238def1 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Debug.
9633df2 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Debug.
4526ae3 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Debug.
007b4c3 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Debug.
5901369 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Debug.
8a72b75 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Debug.gp
c09cab9 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Debug.
f603008 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Move image metadata.
894bb98 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Lowercase.
272f380 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Lowercase.
d170d69 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Lowercase.
e1b68aa 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Add debug image.
83518db 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Consolidate manifest creation job.
2192dc2 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Reset creds.
865de98 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Remove old workflow.
eb33ae5 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Reset cred.
3705f7c 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Reset cred.
d33ca3f 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
PR feedback.
c29dadb 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Editorconfig?
7d6aa2e 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Editorconfig?
5faff61 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Empty commit
47ec156 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird
Merge conflict.
97de29d 
Signed-off-by: Josh Baird <jbaird@galileo.io>
@joshuabaird joshuabaird force-pushed the chore/fluentbit-ci-refactor branch from f894065 to 97de29d Compare March 24, 2025 13:09
@joshuabaird
Copy link
Collaborator Author

Closing this in favor of #1531

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@marcofranssen marcofranssen marcofranssen left review comments

@cw-Guo cw-Guo cw-Guo left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@joshuabaird @marcofranssen @wenchajun @benjaminhuo @cw-Guo @duj4