Skip to content

fix: fixed migration for direct-pod #565

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
aylei merged 1 commit into from
Nov 18, 2024
Merged

fix: fixed migration for direct-pod #565

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 1 deletion pkg/controllers/cnclaim/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,8 @@ func (r *Actor) ensureOwnership(ctx *recon.Context[*v1alpha1.CNClaim], pod *core
}

func (r *Actor) syncBindPod(ctx *recon.Context[*v1alpha1.CNClaim], pod *corev1.Pod) error {
if pod.Labels[pub.LifecycleStateKey] != string(pub.LifecycleStateNormal) {
_, directPod := pod.Labels[v1alpha1.DirectPodLabel]
if !directPod && pod.Labels[pub.LifecycleStateKey] != string(pub.LifecycleStateNormal) {
// pod is not in normal state, skip binding and wait underlying operation to complete
return recon.ErrReSync("pod is not in normal state, wait", retryPatchInterval)
}
Expand Down
Loading