fix(kubernetes): Fixes to ensure CRD events are reported in deploy st…

…age (#4753) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
spinnaker · Jul 22, 2020 · 2c0f026 · 2c0f026
1 parent 2a89348
commit 2c0f026
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/...ava/com/netflix/spinnaker/clouddriver/kubernetes/description/manifest/KubernetesKind.java b/...ava/com/netflix/spinnaker/clouddriver/kubernetes/description/manifest/KubernetesKind.java
@@ -28,6 +28,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nullable;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
 
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @NonnullByDefault
@@ -105,9 +106,9 @@ public class KubernetesKind {
   // kind is not in spinnaker's registry
   public static final KubernetesKind NONE = createWithAlias("none", null, KubernetesApiGroup.NONE);
 
-  private final String name;
+  @Getter private final String name;
   @EqualsAndHashCode.Include private final String lcName;
-  private final KubernetesApiGroup apiGroup;
+  @Getter private final KubernetesApiGroup apiGroup;
   @EqualsAndHashCode.Include @Nullable private final KubernetesApiGroup customApiGroup;
 
   private KubernetesKind(String name, @Nullable KubernetesApiGroup apiGroup) {

diff --git a/...com/netflix/spinnaker/clouddriver/kubernetes/description/manifest/KubernetesManifest.java b/...com/netflix/spinnaker/clouddriver/kubernetes/description/manifest/KubernetesManifest.java
@@ -102,6 +102,11 @@ private Map<String, Object> getMetadata() {
     return getRequiredField(this, "metadata");
   }
 
+  @JsonIgnore
+  public Map<String, String> getInvolvedObject() {
+    return getRequiredField(this, "involvedObject");
+  }
+
   @JsonIgnore
   public String getName() {
     return (String) getMetadata().get("name");

diff --git a/...src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/op/job/KubectlJobExecutor.java b/...src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/op/job/KubectlJobExecutor.java
@@ -30,6 +30,7 @@
 import com.netflix.spinnaker.clouddriver.kubernetes.description.JsonPatch;
 import com.netflix.spinnaker.clouddriver.kubernetes.description.KubernetesPatchOptions;
 import com.netflix.spinnaker.clouddriver.kubernetes.description.KubernetesPodMetric;
+import com.netflix.spinnaker.clouddriver.kubernetes.description.manifest.KubernetesApiGroup;
 import com.netflix.spinnaker.clouddriver.kubernetes.description.manifest.KubernetesKind;
 import com.netflix.spinnaker.clouddriver.kubernetes.description.manifest.KubernetesManifest;
 import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesSelectorList;
@@ -373,7 +374,7 @@ public ImmutableList<KubernetesManifest> eventsFor(
     command.add(
         String.format(
             "involvedObject.name=%s,involvedObject.kind=%s",
-            name, StringUtils.capitalize(kind.toString())));
+            name, StringUtils.capitalize(kind.getName())));
 
     JobResult<ImmutableList<KubernetesManifest>> status =
         jobExecutor.runJob(new JobRequest(command), parseManifestList());
@@ -387,7 +388,13 @@ public ImmutableList<KubernetesManifest> eventsFor(
       return ImmutableList.of();
     }
 
-    return status.getOutput();
+    return status.getOutput().stream()
+        .filter(
+            x ->
+                x.getInvolvedObject()
+                    .getOrDefault("apiVersion", KubernetesApiGroup.NONE.toString())
+                    .startsWith(kind.getApiGroup().toString()))
+        .collect(ImmutableList.toImmutableList());
   }
 
   @Nonnull