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

preflight: fix overriding node name env variable #29809

Merged
merged 1 commit into from
Dec 13, 2023
Merged

preflight: fix overriding node name env variable #29809

merged 1 commit into from
Dec 13, 2023

Conversation

marseel
Copy link
Contributor

@marseel marseel commented Dec 12, 2023

Cilium-agent is overriding K8S_NODE_NAME env variable based on node
name. Cilium-preflight was not overriding it so in case the hostname
did not match the node name, the preflight was stuck waiting for node
information.

cilium-preflight: use the k8s node name instead of relying on hostname

@marseel marseel requested review from a team as code owners December 12, 2023 10:50
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Dec 12, 2023
@marseel marseel added the release-note/minor This PR changes functionality that users may find relevant to operating Cilium. label Dec 12, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Dec 12, 2023
@marseel marseel added dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. needs-backport/1.12 needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Dec 12, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Dec 12, 2023
@gandro
Copy link
Member

gandro commented Dec 12, 2023

Shouldn't this be "release-note/bug"?

@marseel marseel added release-note/bug This PR fixes an issue in a previous release of Cilium. and removed release-note/minor This PR changes functionality that users may find relevant to operating Cilium. labels Dec 12, 2023
@marseel
Copy link
Contributor Author

marseel commented Dec 12, 2023

ah yes, changed. Thanks!

@marseel
Copy link
Contributor Author

marseel commented Dec 12, 2023

/test

@marseel
preflight: fix overriding node name env variable
be9e45d 
Cilium-agent is overriding K8S_NODE_NAME env variable based on node
name. Cilium-preflight was not overriding it so in case that hostname
did not match node name, preflight was stuck waiting for node
information.

Signed-off-by: Marcel Zieba <marcel.zieba@isovalent.com>
@marseel
Copy link
Contributor Author

marseel commented Dec 12, 2023

/test

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Dec 13, 2023
@ldelossa ldelossa added this pull request to the merge queue Dec 13, 2023
Merged via the queue into cilium:main with commit 23ef3c0 Dec 13, 2023
62 checks passed
@joestringer joestringer mentioned this pull request Dec 14, 2023
Merged
@YutaroHayakawa YutaroHayakawa mentioned this pull request Dec 20, 2023
Closed
8 tasks
@YutaroHayakawa YutaroHayakawa 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 Dec 20, 2023
@YutaroHayakawa YutaroHayakawa added needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Dec 20, 2023
@YutaroHayakawa YutaroHayakawa mentioned this pull request Dec 20, 2023
Merged
6 tasks
@YutaroHayakawa YutaroHayakawa 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 Dec 20, 2023
@YutaroHayakawa YutaroHayakawa mentioned this pull request Dec 20, 2023
Merged
5 tasks
@YutaroHayakawa YutaroHayakawa added backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. and removed needs-backport/1.13 labels Dec 20, 2023
@YutaroHayakawa YutaroHayakawa mentioned this pull request Dec 20, 2023
Merged
4 tasks
@github-actions github-actions bot added backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. backport-done/1.14 The backport for Cilium 1.14.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. backport-pending/1.12 backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Jan 11, 2024
This was referenced Jan 17, 2024
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gandro gandro gandro approved these changes

@joamaki joamaki joamaki 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/bug This PR fixes an issue in a previous release of Cilium.
Projects
No open projects
cilium v1.12.18
Status: Released
cilium v1.13.11
Status: Released
cilium v1.14.6
Status: Released
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@marseel @gandro @joamaki @ldelossa @YutaroHayakawa