Skip to content
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

Fixes fluentd/fluent-bit image build CI workflows #1259

Merged
merged 24 commits into from
Jul 25, 2024

Conversation

joshuabaird
Copy link
Collaborator

@joshuabaird joshuabaird commented Jul 24, 2024

What this PR does / why we need it:

#1246 implemented changes that allow us to release "patch" releases of our fluent-bit and fluentd images, but it had a few bugs which are addressed in this PR.

Primarily, the logic that promotes and copies images to Dockerhub was broken for various reasons. This PR centralizes the management of patch tags (eg, 3.1.0-0) and removes some unnecessary checks/complexity. This ensures that there is consistent versioning across all tags/patch releases.

Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
@@ -18,76 +18,73 @@ permissions:
packages: write

jobs:
build-amd64-prod-image-metadata:
determine-tags:
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Instead of "determining" the tabs in each "metadata" step -- we just do it once at the top of the workflow and then reference the outputs (tags) in other steps. This ensures that the tags are propagated correctly when copying the images from GHCR to Dockerhub.

Signed-off-by: Josh Baird <[email protected]>
@@ -43,25 +43,6 @@
required: true

jobs:
check-image-exists:
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

As implemented, this check doesn't really provide any value because it's just checking to see if latest exists, and not that the tag that needs to be copied actually exists. I decided to remove it entirely, since the next step which actually tries to copy the image will fail if the image does not exist.

@joshuabaird joshuabaird changed the title Chore/fix fluentd build Fixes fluentd/fluent-bit image build CI workflows Jul 24, 2024
Signed-off-by: Josh Baird <[email protected]>
Signed-off-by: Josh Baird <[email protected]>
@joshuabaird joshuabaird marked this pull request as ready for review July 24, 2024 14:14
@benjaminhuo benjaminhuo merged commit 8458d4d into fluent:master Jul 25, 2024
2 checks passed
@benjaminhuo
Copy link
Member

@joshuabaird Great! Thanks!

@benjaminhuo
Copy link
Member

@joshuabaird
Copy link
Collaborator Author

Hmm. I'll take a look this morning.

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.

2 participants