Merge pull request kubernetes-client#1856 from NeverRaR/fix/kubectl-rollout-metadata-check

k8s-ci-robot · web-flow · commit 07e714ce5cdd · 2021-08-26T00:35:23.000-07:00
fix : check if metadata.annotations is null
diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlRollout.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlRollout.java
@@ -148,8 +148,7 @@ private void deploymentViewHistory(V1Deployment deployment, AppsV1Api api) throw
       List<Long> revisions = new ArrayList<>(historyInfo.keySet());
       revisions.sort(Long::compareTo);
       for (Long revision : revisions) {
-        String changeCause =
-            historyInfo.get(revision).getMetadata().getAnnotations().get(CHANGE_CAUSE_ANNOTATION);
+        String changeCause = getChangeCause(historyInfo.get(revision).getMetadata());
         if (changeCause == null || changeCause.isEmpty()) {
           changeCause = "<none>";
         }
@@ -214,8 +213,7 @@ private void parseHistory(List<V1ControllerRevision> historyList, PodTemplatePar
       List<Long> revisions = new ArrayList<>(historyInfo.keySet());
       revisions.sort(Long::compareTo);
       for (Long revision : revisions) {
-        String changeCause =
-            historyInfo.get(revision).getMetadata().getAnnotations().get(CHANGE_CAUSE_ANNOTATION);
+        String changeCause = getChangeCause(historyInfo.get(revision).getMetadata());
         if (changeCause == null || changeCause.isEmpty()) {
           changeCause = "<none>";
         }
@@ -250,6 +248,9 @@ private boolean isControlledBy(KubernetesObject obj, KubernetesObject owner) {
 
     // getChangeCause returns the change-cause annotation of the input object
     private String getChangeCause(V1ObjectMeta meta) {
+      if (meta.getAnnotations() == null) {
+        return null;
+      }
       return meta.getAnnotations().get(CHANGE_CAUSE_ANNOTATION);
     }
 
diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/util/deployment/DeploymentHelper.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/util/deployment/DeploymentHelper.java
@@ -64,6 +64,7 @@ public static V1ReplicaSet getAllReplicaSets(
    * @return the revision number
    */
   public static Long revision(V1ObjectMeta meta) {
+    if (meta.getAnnotations() == null) return 0L;
     String v = meta.getAnnotations().get(REVISION_ANNOTATION);
     return v == null ? 0L : Long.parseLong(v);
   }

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ public static V1ReplicaSet getAllReplicaSets(`
`64`	`64`	`* @return the revision number`
`65`	`65`	`*/`
`66`	`66`	`public static Long revision(V1ObjectMeta meta) {`
	`67`	`+ if (meta.getAnnotations() == null) return 0L;`
`67`	`68`	`String v = meta.getAnnotations().get(REVISION_ANNOTATION);`
`68`	`69`	`return v == null ? 0L : Long.parseLong(v);`
`69`	`70`	`}`