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

.github/workflow: removing trailing spaces in calico manifest #468

Closed
wants to merge 1 commit into from

Conversation

tormath1
Copy link
Contributor

@tormath1 tormath1 commented Oct 18, 2023

it happens that manifest have trailing space at the end of the key/value. The diff wants to remove the trailing space so it fails when applying the generated patch.


Noticed the issue here: #467

The github action is failing since a while (see: https://github.com/flatcar/mantle/actions/workflows/sync-calico-version.yml) because of this -> the images are not mirrored. Tested with https://github.com/flatcar/mantle/actions/runs/6560916156/job/17819529865

it happens that manifest have trailing space at the end of the
key/value. The diff wants to remove the trailing space so it fails when
applying the generated patch.

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
@tormath1 tormath1 requested a review from krnowak October 18, 2023 12:33
@tormath1 tormath1 self-assigned this Oct 18, 2023
@tormath1 tormath1 requested a review from a team October 18, 2023 12:33
@krnowak
Copy link
Member

krnowak commented Oct 18, 2023

I think that the issue was that the original calico manifest had the trailing spaces and they removed them. Our modified copy didn't have them, so then our action failed when it tried to apply a patch that drops the trailing spaces from lines that didn't have those anyway.

@tormath1
Copy link
Contributor Author

@krnowak ok so you propose that we do nothing and go ahead with merging #467 as the issue is transient with the switch from 1.25 to 1.26?

@krnowak
Copy link
Member

krnowak commented Oct 18, 2023

Yeah, the issue was transient. We can revisit this PR if this trailing whitespace becomes an issue again. So for now I'd merge my PR and close this one.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants