@@ -473,22 +473,28 @@ protected void addInitContainers(V1PodSpec podSpec) {
473473 getInitializeDomainOnPV ().ifPresent (initializeDomainOnPV -> addInitDomainOnPVInitContainer (initContainers ));
474474 Optional .ofNullable (getAuxiliaryImages ()).ifPresent (auxImages -> addInitContainers (initContainers , auxImages ));
475475 Optional .ofNullable (getDomainCreationImages ()).ifPresent (dcrImages -> addInitContainers (initContainers , dcrImages ));
476- initContainers .addAll (getAdditionalInitContainers ().stream ()
477- .filter (container -> isAllowedInIntrospector (container .getName ()))
478- .map (c -> c .env (createEnv (c )).envFrom (c .getEnvFrom ()).resources (createResources ()))
479- .toList ());
476+ List <V1Container > introspectorInitContainers = getIntrospectorInitContainers ();
477+ if (introspectorInitContainers .isEmpty ()) {
478+ initContainers .addAll (getAdditionalInitContainers ().stream ()
479+ .filter (container -> isAllowedInIntrospector (container .getName ()))
480+ .map (c -> c .env (createEnv (c )).envFrom (c .getEnvFrom ()).resources (createResources ()))
481+ .toList ());
482+ } else {
483+ for (V1Container initContainer : introspectorInitContainers ) {
484+ if (initContainers .stream ().noneMatch (
485+ container -> container .getName ().equals (initContainer .getName ()))) {
486+ initContainer .securityContext (getInitContainerSecurityContext ());
487+ initContainers .add (initContainer );
488+ }
489+ }
490+ }
480491 podSpec .initContainers (initContainers );
481492 }
482493
483494 private void addInitContainers (List <V1Container > initContainers , List <? extends DeploymentImage > auxiliaryImages ) {
484495 IntStream .range (0 , auxiliaryImages .size ()).forEach (idx ->
485- initContainers .add (createInitContainerForAuxiliaryImage (auxiliaryImages .get (idx ), idx ,
486- isInitializeDomainOnPV ())));
487- List <V1Container > introspectorInitContainers = getIntrospectorInitContainers ();
488- for (V1Container initContainer : introspectorInitContainers ) {
489- initContainer .securityContext (getInitContainerSecurityContext ());
490- initContainers .add (initContainer );
491- }
496+ initContainers .add (createInitContainerForAuxiliaryImage (auxiliaryImages .get (idx ), idx ,
497+ isInitializeDomainOnPV ())));
492498 }
493499
494500 private Optional <InitializeDomainOnPV > getInitializeDomainOnPV () {
0 commit comments