From 0d1f6670c251bbb693464df6d99c6044d4d90baa Mon Sep 17 00:00:00 2001 From: Josef Harte Date: Wed, 23 Nov 2022 15:24:09 +0000 Subject: [PATCH] fix: check manifests types --- .../providers/kubernetes/KubernetesJobRunner.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/orca-clouddriver/src/main/java/com/netflix/spinnaker/orca/clouddriver/tasks/providers/kubernetes/KubernetesJobRunner.java b/orca-clouddriver/src/main/java/com/netflix/spinnaker/orca/clouddriver/tasks/providers/kubernetes/KubernetesJobRunner.java index 3d4e77096c..bd11a23eea 100644 --- a/orca-clouddriver/src/main/java/com/netflix/spinnaker/orca/clouddriver/tasks/providers/kubernetes/KubernetesJobRunner.java +++ b/orca-clouddriver/src/main/java/com/netflix/spinnaker/orca/clouddriver/tasks/providers/kubernetes/KubernetesJobRunner.java @@ -67,7 +67,17 @@ private ImmutableMap getManifestFields(StageExecution stage) { List> manifests = result.getManifests(); if (manifests.size() != 1) { - throw new IllegalArgumentException("Run Job only supports manifests with a single Job."); + int numJobs = 0; + for (Map manifest : manifests) { + String manifestKind = (String) manifest.get("kind"); + if (manifestKind.toLowerCase() == "job") { + numJobs += 1; + if (numJobs > 1) { + throw new IllegalArgumentException( + "Run Job only supports manifests with a single Job."); + } + } + } } return ImmutableMap.of(