Merge pull request kubernetes-client#4087 from c4lm/fix-4057-KubectlTop-NPE-on-error-pod

k8s-ci-robot · web-flow · commit d1b6e053d815 · 2025-06-09T09:26:28.000-07:00
Fix NPE in KubectlTop - skip pods which are down
diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlTop.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlTop.java
@@ -138,6 +138,9 @@ private static PodMetrics findPodMetric(V1Pod pod, PodMetricsList list) {
 
   public static double podMetricSum(PodMetrics podMetrics, String metricName) {
     double sum = 0;
+    if (podMetrics == null) {
+      return 0;
+    }
     for (ContainerMetrics containerMetrics : podMetrics.getContainers()) {
       Quantity value = containerMetrics.getUsage().get(metricName);
       if (value != null) {
@@ -170,7 +173,11 @@ public int compare(V1Pod arg0, V1Pod arg1) {
 
     List<Pair<ApiType, MetricsType>> result = new ArrayList<>();
     for (V1Pod pod : items) {
-      result.add(new ImmutablePair<>((ApiType) pod, (MetricsType) findPodMetric(pod, metrics)));
+      PodMetrics podMetrics = findPodMetric(pod, metrics);
+      if (podMetrics == null) {
+        continue;
+      }
+      result.add(new ImmutablePair<>((ApiType) pod, (MetricsType) podMetrics));
     }
     return result;
   }
