Titus v3: fix find job by name and set instance count to desired

spinnaker · Mar 26, 2018 · be3fa83 · be3fa83
1 parent 857fce1
commit be3fa83
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/model/Job.java b/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/model/Job.java
@@ -242,6 +242,7 @@ public Job(com.netflix.titus.grpc.protogen.Job grpcJob, List<com.netflix.titus.g
         instancesMin = batchJobSpec.getSize();
         instancesMax = batchJobSpec.getSize();
         instancesDesired = batchJobSpec.getSize();
+        instances = batchJobSpec.getSize();
         runtimeLimitSecs = (int)batchJobSpec.getRuntimeLimitSec();
         retries = batchJobSpec.getRetryPolicy().getImmediate().getRetries();
       }
@@ -250,6 +251,7 @@ public Job(com.netflix.titus.grpc.protogen.Job grpcJob, List<com.netflix.titus.g
         type = "service";
         ServiceJobSpec serviceSpec = grpcJob.getJobDescriptor().getService();
         inService = serviceSpec.getEnabled();
+        instances = serviceSpec.getCapacity().getDesired();
         instancesMin = serviceSpec.getCapacity().getMin();
         instancesMax = serviceSpec.getCapacity().getMax();
         instancesDesired = serviceSpec.getCapacity().getDesired();

diff --git a/...in/groovy/com/netflix/spinnaker/clouddriver/titus/v3client/RegionScopedV3TitusClient.java b/...in/groovy/com/netflix/spinnaker/clouddriver/titus/v3client/RegionScopedV3TitusClient.java
@@ -99,8 +99,8 @@ public Job getJob(String jobId) {
   public Job findJobByName(String jobName) {
     JobQuery.Builder jobQuery = JobQuery.newBuilder()
       .putFilteringCriteria("jobType", "SERVICE")
-      .putFilteringCriteria("labels", "source:spinnaker,name:" + jobName)
-      .putFilteringCriteria("labels.op", "and");
+      .putFilteringCriteria("attributes", "source:spinnaker,name:" + jobName)
+      .putFilteringCriteria("attributes.op", "and");
     return getJobs(jobQuery).get(0);
   }