Merge remote-tracking branch 'origin/main' into release/4.0

Author: rjeberhard

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

@@ -658,11 +658,12 @@ private Map<String,Object> createEmptyDirVolume(Map<String, Object> auxiliaryIma
 
   private void addVolumeMountIfMissing(Map<String, Object> serverPod, Map<String, Object> auxiliaryImage,
                                        String mountPath) {
-    if (Optional.ofNullable(serverPod.get(VOLUME_MOUNTS)).map(volumeMounts -> ((List)volumeMounts).stream().noneMatch(
-          volumeMount -> hasMatchingVolumeMountName(volumeMount, auxiliaryImage))).orElse(true)) {
-      List<Object> volumeMounts = new ArrayList<>();
-      volumeMounts.add(getVolumeMount(auxiliaryImage, mountPath));
-      serverPod.put(VOLUME_MOUNTS, volumeMounts);
+    List<Object> existingVolumeMounts = Optional.ofNullable((List<Object>) serverPod.get(VOLUME_MOUNTS))
+        .orElse(new ArrayList<>());
+    if (existingVolumeMounts.stream()
+        .noneMatch(volumeMount -> hasMatchingVolumeMountName(volumeMount, auxiliaryImage))) {
+      existingVolumeMounts.add(getVolumeMount(auxiliaryImage, mountPath));
+      serverPod.put(VOLUME_MOUNTS, existingVolumeMounts);
     }
   }