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

Merge pull request #1446 from song-jiang/song-fix-pod-termination#1447

Merged
mgleung merged 1 commit into
projectcalico:release-v3.19from
song-jiang:song-pick-v3.19
Jul 12, 2021
Merged

Merge pull request #1446 from song-jiang/song-fix-pod-termination#1447
mgleung merged 1 commit into
projectcalico:release-v3.19from
song-jiang:song-pick-v3.19

Conversation

@song-jiang

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

Copy link
Copy Markdown
Member

Fix checking terminating pod for non-calico CNI

(cherry picked from commit 719c24d)

And Revert back to old API v3

Description

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.

…rmination

Fix checking terminating pod for non-calico CNI

(cherry picked from commit 719c24d)

And Revert back to old API v3
@mgleung mgleung merged commit 9041b53 into projectcalico:release-v3.19 Jul 12, 2021
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)
song-jiang added a commit that referenced this pull request Jul 13, 2021
Merge pull request #1447 from song-jiang/song-pick-v3.19
song-jiang added a commit that referenced this pull request Jul 13, 2021
Merge pull request #1447 from song-jiang/song-pick-v3.19
song-jiang added a commit that referenced this pull request Jul 13, 2021
Merge pull request #1447 from song-jiang/song-pick-v3.19
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.

3 participants