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.

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

install/kubernetes: add the cilium/values.yaml target to .PHONY #28225

Merged
merged 1 commit into from Sep 25, 2023
Merged

install/kubernetes: add the cilium/values.yaml target to .PHONY #28225

merged 1 commit into from Sep 25, 2023

Conversation

nbusseneau
Copy link
Member

This target should completely ignore the existing contents of cilium/values.yaml since we always generate from the template files.

@nbusseneau nbusseneau added release-note/misc This PR makes changes that have no direct user impact. sig/contributing Impacts contribution workflow, guidelines, and tools. labels Sep 19, 2023
@nbusseneau nbusseneau requested review from a team as code owners September 19, 2023 15:11
@nbusseneau
Copy link
Member Author

This change does not need to run any CI. Marking ready-to-merge.

@nbusseneau nbusseneau added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Sep 19, 2023
@ldelossa ldelossa removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Sep 19, 2023
@ldelossa
Copy link
Contributor

Something odd is going on with tests here. Maybe this needs a rebase before we mark it ready to merge?

@sayboras @nbusseneau

@nbusseneau
Copy link
Member Author

@ldelossa Rebased but still the same issue. I've done a bit of digging and the issue was introduced in main by 660f2f2, I think it unfortunately conflicted with the previous merge of 6f1e496.

doniacld
doniacld approved these changes Sep 20, 2023
View reviewed changes
Copy link
Contributor

@doniacld doniacld left a comment

Choose a reason for hiding this comment

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

Thanks 🎉

@nbusseneau @doniacld
install/kubernetes: add the cilium/values.yaml target to .PHONY
ee4f6b4 
This target should completely ignore the existing contents of
`cilium/values.yaml` since we always generate from the template files.

Co-authored-by: Donia Chaiehloudj <donia.cld@isovalent.com>
Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
@nbusseneau
Copy link
Member Author

This change does not need to run any CI. Marking ready-to-merge.

@nbusseneau nbusseneau added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. needs-backport/1.12 needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Sep 20, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.13.8 Sep 21, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.14.3 Sep 21, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.12.15 Sep 21, 2023
@lmb lmb merged commit c6fbeb1 into cilium:main Sep 25, 2023
43 of 44 checks passed
@giorio94 giorio94 mentioned this pull request Sep 26, 2023
Merged
22 tasks
@giorio94 giorio94 added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Sep 26, 2023
@giorio94 giorio94 mentioned this pull request Sep 26, 2023
Merged
12 tasks
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.14 in 1.14.3 Sep 26, 2023
@aanm aanm added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Sep 29, 2023
@sayboras sayboras mentioned this pull request Oct 2, 2023
Merged
3 tasks
@sayboras sayboras added backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. and removed needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch labels Oct 2, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.14 to Backport done to v1.14 in 1.14.3 Oct 2, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.14 to Backport done to v1.14 in 1.14.3 Oct 2, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.13 in 1.13.8 Oct 2, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.12 in 1.12.15 Oct 2, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.12 in 1.12.15 Oct 2, 2023
@aanm aanm added backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. and removed backport-pending/1.12 labels Oct 2, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.12 to Backport done to v1.12 in 1.12.15 Oct 2, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.12 to Backport done to v1.12 in 1.12.15 Oct 2, 2023
@aanm aanm added backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. and removed backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. labels Oct 3, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.13 to Backport done to v1.13 in 1.13.8 Oct 3, 2023
This was referenced Oct 17, 2023
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sayboras sayboras sayboras approved these changes

@doniacld doniacld doniacld approved these changes

Assignees
No one assigned
Labels
backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact. sig/contributing Impacts contribution workflow, guidelines, and tools.
Projects
No open projects
1.12.15
Backport done to v1.12
1.13.8
Backport done to v1.13
1.14.3
Backport done to v1.14
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@nbusseneau @ldelossa @sayboras @doniacld @lmb @aanm @giorio94