Skip to content

fix: correct work of DaemonSetIgnore #3545 #3582

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 1 commit into from
Jul 22, 2024
Merged

fix: correct work of DaemonSetIgnore #3545 #3582

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
9 changes: 7 additions & 2 deletions extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlDrain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,21 @@ private V1Node doDrain() throws KubectlException, ApiException, IOException {

validatePods(allPods.getItems());

boolean isDaemonSetPod;
for (V1Pod pod : allPods.getItems()) {
isDaemonSetPod = false;
// at this point we know, that we have to ignore daemon set pods
if (pod.getMetadata().getOwnerReferences() != null) {
for (V1OwnerReference ref : pod.getMetadata().getOwnerReferences()) {
if (ref.getKind().equals("DaemonSet")) {
continue;
isDaemonSetPod = true;
break;
}
}
}
deletePod(api, pod.getMetadata().getName(), pod.getMetadata().getNamespace());
if (!isDaemonSetPod) {
deletePod(api, pod.getMetadata().getName(), pod.getMetadata().getNamespace());
}
}
return node;
}
Expand Down
Loading