@@ -208,37 +208,6 @@ private static class IntrospectionStartStep extends Step {
208
208
209
209
}
210
210
211
- private static String printJob (V1Job job ) {
212
- StringBuilder sb = new StringBuilder ();
213
- if (job != null ) {
214
- V1ObjectMeta metadata = job .getMetadata ();
215
- if (metadata != null ) {
216
- sb .append ("name: " );
217
- sb .append (metadata .getName ());
218
- sb .append (", creation: " );
219
- sb .append (metadata .getCreationTimestamp ());
220
- sb .append (", generation: " );
221
- sb .append (metadata .getGeneration ());
222
- sb .append (", resourceVersion: " );
223
- sb .append (metadata .getResourceVersion ());
224
- } else {
225
- sb .append ("no metadata" );
226
- }
227
- V1JobSpec spec = job .getSpec ();
228
- if (spec != null ) {
229
- spec .getTemplate ().getSpec ().getContainers ().forEach (c -> {
230
- sb .append (", image: " );
231
- sb .append (c .getImage ());
232
- });
233
- } else {
234
- sb .append ("no spec" );
235
- }
236
- } else {
237
- sb .append ("null" );
238
- }
239
- return sb .toString ();
240
- }
241
-
242
211
private static class IntrospectorJobStepContext extends JobStepContext {
243
212
244
213
IntrospectorJobStepContext (Packet packet ) {
@@ -310,7 +279,7 @@ private boolean hasAuxiliaryImageChanged(@Nonnull V1Job job) {
310
279
311
280
private boolean hasIntrospectVersionChanged (@ Nonnull V1Job job ) {
312
281
return !Objects .equals (getIntrospectVersionLabelFromJob (job ),
313
- getIntrospectVersionLabelFromJob (getJobModel ()));
282
+ getIntrospectVersionLabelFromJob (getJobModel ()));
314
283
}
315
284
316
285
String getImageFromJob (V1Job job ) {
@@ -327,21 +296,21 @@ Stream<String> getAuxiliaryImagesFromJob(V1Job job) {
327
296
328
297
Optional <V1PodSpec > getPodSpecFromJob (V1Job job ) {
329
298
return Optional .ofNullable (job )
330
- .map (V1Job ::getSpec )
331
- .map (V1JobSpec ::getTemplate )
332
- .map (V1PodTemplateSpec ::getSpec );
299
+ .map (V1Job ::getSpec )
300
+ .map (V1JobSpec ::getTemplate )
301
+ .map (V1PodTemplateSpec ::getSpec );
333
302
}
334
303
335
304
@ Nullable
336
305
String getImageFromPodSpec (@ Nonnull V1PodSpec pod ) {
337
306
return getContainer (pod )
338
- .map (V1Container ::getImage )
339
- .orElse (null );
307
+ .map (V1Container ::getImage )
308
+ .orElse (null );
340
309
}
341
310
342
311
Stream <String > getAuxiliaryImagesFromPodSpec (@ Nonnull V1PodSpec pod ) {
343
312
return getAuxiliaryContainers (pod )
344
- .map (V1Container ::getImage );
313
+ .map (V1Container ::getImage );
345
314
}
346
315
347
316
@ Nullable
@@ -355,17 +324,17 @@ List<String> getSortedJobModelPodSpecAuxiliaryImages() {
355
324
356
325
Stream <String > getJobModelPodSpecAuxiliaryImages () {
357
326
return Optional .ofNullable (getJobModelPodSpec ())
358
- .map (this ::getAuxiliaryImagesFromPodSpec )
359
- .orElse (Stream .empty ());
327
+ .map (this ::getAuxiliaryImagesFromPodSpec )
328
+ .orElse (Stream .empty ());
360
329
}
361
330
362
331
@ Nullable
363
332
String getIntrospectVersionLabelFromJob (V1Job job ) {
364
333
return Optional .ofNullable (job )
365
- .map (V1Job ::getMetadata )
366
- .map (V1ObjectMeta ::getLabels )
367
- .map (m -> m .get (INTROSPECTION_STATE_LABEL ))
368
- .orElse (null );
334
+ .map (V1Job ::getMetadata )
335
+ .map (V1ObjectMeta ::getLabels )
336
+ .map (m -> m .get (INTROSPECTION_STATE_LABEL ))
337
+ .orElse (null );
369
338
}
370
339
371
340
private boolean isIntrospectionNeeded (Packet packet ) {
0 commit comments