Skip to content

fix: [NPM-WIN] ability to reassign Pod associated with Endpoint #1806

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

Merged
merged 17 commits into from
Mar 8, 2023
Merged

fix: [NPM-WIN] ability to reassign Pod associated with Endpoint #1806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5b2169d
reset acls for pods marked for delete
huntergregory Feb 15, 2023
d3080dd
simplify: remove stalePodKey
huntergregory Feb 16, 2023
7baa098
add log for associating pod with endpoint
huntergregory Feb 16, 2023
4cdc620
reorganize win dp uts
huntergregory Feb 16, 2023
e3456a7
UTs for issue 1729 (fail because podMarkedForDelete is not used)
huntergregory Feb 16, 2023
1181fe8
update controller mock to use deleted pod metadata
huntergregory Feb 16, 2023
01487d3
rename podMarkedForDelete to deletedPod
huntergregory Feb 17, 2023
12f5fe1
all UTs (noticing edge in ipsetmanager now)
huntergregory Feb 18, 2023
468f1d0
updatePod() works for all sequences
huntergregory Feb 18, 2023
aade8fb
work with updatePodCache and existing controlplane
huntergregory Mar 2, 2023
cbf0517
merge and handle issue 1729 on calico network
huntergregory Mar 2, 2023
2384847
remove pod delete logic
huntergregory Mar 3, 2023
a8421ba
remove change incorrect comment
huntergregory Mar 3, 2023
d20fb6c
fix lint
huntergregory Mar 3, 2023
3927fbf
fix gofumpt
huntergregory Mar 3, 2023
589c8d1
remove changes to dp.go logs/comments
huntergregory Mar 3, 2023
01f57aa
Merge branch 'master' into hgregory/npm-pod-assignment
huntergregory Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions npm/pkg/controlplane/controllers/v2/podController.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,7 @@ func (c *PodController) syncAddAndUpdatePod(newPodObj *corev1.Pod) (metrics.Oper
addToIPSets, deleteFromIPSets := util.GetIPSetListCompareLabels(cachedNpmPod.Labels, newPodObj.Labels)

newPodMetadata := dataplane.NewPodMetadata(podKey, newPodObj.Status.PodIP, newPodObj.Spec.NodeName)
// todo: verify pulling nodename from newpod,
// if a pod is getting deleted, we do not have to cleanup policies, so it is okay to pass in wrong nodename
// should have newPodMetadata == cachedPodMetadata since from branch above, we have cachedNpmPod.PodIP == newPodObj.Status.PodIP
cachedPodMetadata := dataplane.NewPodMetadata(podKey, cachedNpmPod.PodIP, newPodMetadata.NodeName)
// Delete the pod from its label's ipset.
for _, removeIPSetName := range deleteFromIPSets {
Expand Down
Loading