Skip to content

Conversation

@cw-Guo
Copy link
Collaborator

@cw-Guo cw-Guo commented Nov 19, 2025

What this PR does / why we need it:

As titled, after this fix, we can run make e2e successfully.

@cw-Guo cw-Guo marked this pull request as draft November 19, 2025 07:38
@cw-Guo cw-Guo marked this pull request as ready for review November 20, 2025 20:25
@@ -1 +1 @@
v3.5.0
latest 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.

Don't think this change belongs to this PR

Suggested change
latest
v3.5.0

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

it will block the test to run successfully if we don't fix it. see here

Copy link
Collaborator

@marcofranssen marcofranssen Nov 24, 2025

Choose a reason for hiding this comment

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

Changing this will break stuff like releases, we rather fix it in the script by doing a sed replacement or something like that.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

No, the release #1741 should be actually be merged into a separate release branch and keep the master's version to latest. There was a mistake that we didn't create a release branch for v3.5.0

Please check the file history and you will know.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ok. Guess that is fine for now, IMHO we should change that release process.

Just make releases straight on main. if there is ever a need to hotfix a release, we can always create the branch from the last minor tag. hope to get some time redesigning the release automation and the manual process to simplify this. It is overly complicated imho.

@marcofranssen marcofranssen force-pushed the fix/fluentd-e2e branch 3 times, most recently from bc9fdb8 to 4c46ec8 Compare November 21, 2025 19:03
Copy link
Collaborator

@marcofranssen marcofranssen left a comment

Choose a reason for hiding this comment

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

Couple suggestions to simplify

@cw-Guo cw-Guo force-pushed the fix/fluentd-e2e branch 3 times, most recently from 0c99b62 to 6f2fc45 Compare November 22, 2025 16:53
@cw-Guo cw-Guo requested a review from marcofranssen November 22, 2025 17:08
@cw-Guo
Copy link
Collaborator Author

cw-Guo commented Nov 24, 2025

Hi @marcofranssen , please fix the DCO issue for the last commit and also the e2e-test itself, right now it still fails due to the changes in last commit.

@marcofranssen
Copy link
Collaborator

Hi @marcofranssen , please fix the DCO issue for the last commit and also the e2e-test itself, right now it still fails due to the changes in last commit.

Sorry will have a look asap. Guess mistake in my review suggestion.

Signed-off-by: Marco Franssen <[email protected]>
@marcofranssen marcofranssen enabled auto-merge (squash) December 2, 2025 21:52
Signed-off-by: Marco Franssen <[email protected]>
Signed-off-by: Marco Franssen <[email protected]>
Signed-off-by: Marco Franssen <[email protected]>
Signed-off-by: Marco Franssen <[email protected]>
Signed-off-by: Marco Franssen <[email protected]>
Signed-off-by: Marco Franssen <[email protected]>
@marcofranssen
Copy link
Collaborator

I have fixed the failures, but the script which I didn't touch is still having failures that are absorbed. https://github.com/fluent/fluent-operator/actions/runs/19875104106/job/56960475894?pr=1791#step:7:192

Signed-off-by: Marco Franssen <[email protected]>
@marcofranssen
Copy link
Collaborator

Did an attempt to fix it but seems the recent refactor has some gaps.

https://github.com/fluent/fluent-operator/actions/runs/19875257124/job/56960979199?pr=1791#step:7:195

@joshuabaird could you pitch in and have a look on fixing that part?

Copy link
Collaborator

@marcofranssen marcofranssen left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

  1. Fixed the failures regarding make tasks.
  2. Filed an issue for the helm chart dependency problem #1812

Still need to do some more cleanup on the scripts and make tasks to make it bit more structured and predictable for contributors. Setup is currently more complicated then it should be, and make tasks are not all correctly depending on each other, causing difficulty to know what to run in what order.

@marcofranssen marcofranssen merged commit a77cbef into fluent:master Dec 2, 2025
12 of 13 checks passed
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