Skip to content

Commit 7447a10

Browse files
authored
Fix to list the init containers generated from 3.x/v8 aux image configuration at the top before listing other init containers. (#3944)
1 parent fadce7e commit 7447a10

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

common/src/main/java/oracle/kubernetes/common/utils/SchemaConversionUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -589,14 +589,14 @@ private void removeNamedItems(Map<String, Object> serverPod, String kind, Predic
589589
private void addInitContainersVolumeAndMountsToServerPod(Map<String, Object> serverPod, List<Object> auxiliaryImages,
590590
List<Object> auxiliaryImageVolumes) {
591591
addEmptyDirVolume(serverPod, auxiliaryImageVolumes);
592-
List<Object> initContainers = Optional.ofNullable((List<Object>) serverPod.get(INIT_CONTAINERS))
593-
.orElse(new ArrayList<>());
592+
List<Object> initContainers = new ArrayList<>();
594593
for (Object auxiliaryImage : auxiliaryImages) {
595594
initContainers.add(
596595
createInitContainerForAuxiliaryImage((Map<String, Object>) auxiliaryImage, containerIndex.get(),
597596
auxiliaryImageVolumes));
598597
containerIndex.addAndGet(1);
599598
}
599+
initContainers.addAll(Optional.ofNullable((List<Object>) serverPod.get(INIT_CONTAINERS)).orElse(new ArrayList<>()));
600600
serverPod.put(INIT_CONTAINERS, initContainers);
601601
auxiliaryImages.forEach(ai -> addVolumeMount(serverPod, (Map<String, Object>)ai, auxiliaryImageVolumes));
602602
addAuxiliaryImageEnv(auxiliaryImages, serverPod, auxiliaryImageVolumes);

0 commit comments

Comments
 (0)