Skip to content

Conversation

sayboras
Copy link
Member

This commit is to add ownerReferences for CiliumNodes created by
CiliumExternalWorkload, so that we don't unintentionally GC invalid CN.

Thanks to @nathanejohnson for reporting this issue.

Fixes: #19907
Signed-off-by: Tam Mach tam.mach@cilium.io

@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 May 25, 2022
@sayboras sayboras added the release-note/bug This PR fixes an issue in a previous release of Cilium. label May 25, 2022
@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 May 25, 2022
@sayboras sayboras marked this pull request as ready for review May 25, 2022 16:20
@sayboras sayboras requested a review from a team as a code owner May 25, 2022 16:20
@sayboras sayboras requested a review from jrajahalme May 25, 2022 16:20
@sayboras
Copy link
Member Author

/test

@sayboras
Copy link
Member Author

All tests are passed, force pushed with below diff

diff --git a/clustermesh-apiserver/vmmanager.go b/clustermesh-apiserver/vmmanager.go
index 8a42d113b6..648afffaca 100644
--- a/clustermesh-apiserver/vmmanager.go
+++ b/clustermesh-apiserver/vmmanager.go
@@ -279,7 +279,7 @@ func (m *VMManager) UpdateCiliumNodeResource(n *nodeTypes.RegisterNode, cew *cil
 	nr.OwnerReferences = []metav1.OwnerReference{
 		{
 			APIVersion: ciliumv2.SchemeGroupVersion.String(),
-			Kind:       "CiliumExternalWorkload",
+			Kind:       ciliumv2.CEWKindDefinition,
 			Name:       cew.GetName(),
 			UID:        cew.GetUID(),
 		},

@sayboras
Copy link
Member Author

/test

This commit is to add ownerReferences for CiliumNodes created by
CiliumExternalWorkload, so that we don't unintentionally GC invalid CN.

Thanks to @nathanejohnson for reporting this issue.

Fixes: cilium#19907
Signed-off-by: Tam Mach <tam.mach@cilium.io>
@sayboras
Copy link
Member Author

sayboras commented Jun 2, 2022

rebased with master to pick up latest CI changes.

@sayboras
Copy link
Member Author

sayboras commented Jun 2, 2022

/test

@sayboras
Copy link
Member Author

sayboras commented Jun 3, 2022

/test-runtime

@sayboras
Copy link
Member Author

sayboras commented Jun 3, 2022

AWS-CNI failure is currently under investigation or already fixed as part of master #20049.

Reviews are in, marking this ready to merge.

@sayboras sayboras added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 3, 2022
@joamaki joamaki merged commit 3500290 into cilium:master Jun 3, 2022
@joestringer joestringer added backport-done/1.11 The backport for Cilium 1.11.x for this PR is done. and removed backport-pending/1.11 labels Jun 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-done/1.11 The backport for Cilium 1.11.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
None yet
Development

Successfully merging this pull request may close these issues.

external workloads get garbage collected if node gc is enabled
5 participants