Skip to content
This repository was archived by the owner on Oct 20, 2025. It is now read-only.

Fix checking terminating pod for non-calico CNI#1446

Merged
song-jiang merged 1 commit into
projectcalico:masterfrom
song-jiang:song-fix-pod-termination
Jul 12, 2021
Merged

Fix checking terminating pod for non-calico CNI#1446
song-jiang merged 1 commit into
projectcalico:masterfrom
song-jiang:song-fix-pod-termination

Conversation

@song-jiang

@song-jiang song-jiang commented Jul 8, 2021

Copy link
Copy Markdown
Member

Description

This PR fixes projectcalico/calico#4518 by reinstating Fix that IsFinished wasn't checking whether the podIPs annotation was actually present of #1397

Todos

  • Tests
  • Documentation
  • Release note

Release Note

Reinstates logic that falls back to the status of the pod during termination if the pod IP annotation is not set by the Calico CNI plugin.

@fasaxc fasaxc left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@song-jiang song-jiang force-pushed the song-fix-pod-termination branch from 57d184e to c3785c6 Compare July 12, 2021 15:34
@song-jiang song-jiang changed the title [WIP] Fix checking terminating pod for non-calico CNI Fix checking terminating pod for non-calico CNI Jul 12, 2021
@song-jiang song-jiang merged commit 719c24d into projectcalico:master Jul 12, 2021
song-jiang added a commit to song-jiang/libcalico-go that referenced this pull request Jul 12, 2021
…rmination

Fix checking terminating pod for non-calico CNI

(cherry picked from commit 719c24d)
song-jiang added a commit to song-jiang/libcalico-go that referenced this pull request Jul 12, 2021
…rmination

Fix checking terminating pod for non-calico CNI

(cherry picked from commit 719c24d)

And Revert back to old API v3
mgleung added a commit that referenced this pull request Jul 12, 2021
Merge pull request #1446 from song-jiang/song-fix-pod-termination
song-jiang pushed a commit to song-jiang/libcalico-go that referenced this pull request Jul 13, 2021
Merge pull request projectcalico#1446 from song-jiang/song-fix-pod-termination

(cherry picked from commit 9041b53)
song-jiang pushed a commit to song-jiang/libcalico-go that referenced this pull request Jul 13, 2021
Merge pull request projectcalico#1446 from song-jiang/song-fix-pod-termination

(cherry picked from commit 9041b53)
song-jiang pushed a commit to song-jiang/libcalico-go that referenced this pull request Jul 13, 2021
Merge pull request projectcalico#1446 from song-jiang/song-fix-pod-termination

(cherry picked from commit 9041b53)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

With non-Calico CNI, Calico networkpolicy enforcement does not allow Terminating pods to gracefully shut down

4 participants