Skip to content

fix: correct work of DaemonSetIgnore #3537

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

Closed
wants to merge 2 commits into from
Closed

fix: correct work of DaemonSetIgnore #3537

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97a2fe5
fix: correct work of DaemonSetIgnore
Jul 4, 2024
376248f
fix: correct work of DaemonSetIgnore
Jul 8, 2024
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
19 changes: 12 additions & 7 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 @@ -63,22 +63,27 @@ private V1Node doDrain() throws KubectlException, ApiException, IOException {
V1Node node = performCordon();

V1PodList allPods =
api.listPodForAllNamespaces()
.fieldSelector("spec.nodeName=" + node.getMetadata().getName())
.execute();
api.listPodForAllNamespaces()
.fieldSelector("spec.nodeName=" + node.getMetadata().getName())
.execute();

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 All @@ -103,13 +108,13 @@ private void validatePods(List<V1Pod> pods) throws KubectlException {
}

private void deletePod(CoreV1Api api, String name, String namespace)
throws ApiException, IOException, KubectlException {
throws ApiException, IOException, KubectlException {
api.deleteNamespacedPod(name, namespace).gracePeriodSeconds(gracePeriodSeconds).execute();
waitForPodDelete(api, name, namespace);
}

private void waitForPodDelete(CoreV1Api api, String name, String namespace)
throws KubectlException {
throws KubectlException {
long start = System.currentTimeMillis();
do {
try {
Expand Down