Fix for the auxiliary image upgrade test to adjust the old volume name prefix to new prefix for hash (#3692)

* Fix for aux image upgrade tests.

Author: ankedia

common/src/main/java/oracle/kubernetes/common/AuxiliaryImageConstants.java

@@ -11,6 +11,7 @@ private AuxiliaryImageConstants() {
 
   public static final String AUXILIARY_IMAGE_TARGET_PATH = "/tmpAuxiliaryImage";
   public static final String AUXILIARY_IMAGE_VOLUME_NAME_PREFIX = "ai-vol-";
+  public static final String AUXILIARY_IMAGE_VOLUME_NAME_OLD_PREFIX = "aux-image-volume-";
   public static final String AUXILIARY_IMAGE_INIT_CONTAINER_WRAPPER_SCRIPT = "/weblogic-operator/scripts/auxImage.sh";
   public static final String AUXILIARY_IMAGE_INIT_CONTAINER_NAME_PREFIX = "operator-aux-container";
   public static final String AUXILIARY_IMAGE_DEFAULT_INIT_CONTAINER_COMMAND

operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java

@@ -82,6 +82,8 @@
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
+import static oracle.kubernetes.common.AuxiliaryImageConstants.AUXILIARY_IMAGE_VOLUME_NAME_OLD_PREFIX;
+import static oracle.kubernetes.common.AuxiliaryImageConstants.AUXILIARY_IMAGE_VOLUME_NAME_PREFIX;
 import static oracle.kubernetes.common.CommonConstants.COMPATIBILITY_MODE;
 import static oracle.kubernetes.common.helpers.AuxiliaryImageEnvVars.AUXILIARY_IMAGE_MOUNT_PATH;
 import static oracle.kubernetes.common.logging.MessageKeys.CYCLING_POD_EVICTED;
@@ -1177,7 +1179,8 @@ private boolean canAdjustLegacyHashToMatch(V1Pod currentPod, String requiredHash
     }
 
     private void adjustVolumeMountName(List<V1VolumeMount> convertedVolumeMounts, V1VolumeMount volumeMount) {
-      convertedVolumeMounts.add(volumeMount.name(volumeMount.getName().replaceAll("^" + COMPATIBILITY_MODE, "")));
+      convertedVolumeMounts.add(volumeMount.name(volumeMount.getName().replaceAll("^" + COMPATIBILITY_MODE
+          + AUXILIARY_IMAGE_VOLUME_NAME_PREFIX, AUXILIARY_IMAGE_VOLUME_NAME_OLD_PREFIX)));
     }
 
     private void adjustContainer(List<V1Container> convertedContainers, V1Container container, V1Pod currentPod) {
@@ -1212,7 +1215,8 @@ private boolean isPodFromOperatorMajorMinorVersion34RevAbove0(V1Pod currentPod)
     }
 
     private void adjustVolumeName(List<V1Volume> convertedVolumes, V1Volume volume) {
-      convertedVolumes.add(volume.name(volume.getName().replaceAll("^" + COMPATIBILITY_MODE, "")));
+      convertedVolumes.add(volume.name(volume.getName().replaceAll("^" + COMPATIBILITY_MODE
+          + AUXILIARY_IMAGE_VOLUME_NAME_PREFIX, AUXILIARY_IMAGE_VOLUME_NAME_OLD_PREFIX)));
     }
 
     private void convertAuxImagesInitContainerVolumeAndMounts(V1Pod recipe, V1Pod currentPod) {

operator/src/test/java/oracle/kubernetes/operator/helpers/ReferenceObjects.java

@@ -1567,7 +1567,7 @@ class ReferenceObjects {
           + "    - mountPath: /weblogic-operator/introspector\n"
           + "      name: weblogic-domain-introspect-cm-volume\n"
           + "    - mountPath: /auxiliary\n"
-          + "      name: compat-aux-image-volume-auxiliaryimagevolume1\n"
+          + "      name: compat-ai-vol-auxiliaryimagevolume1\n"
           + "  hostname: uid1-admin-server\n"
           + "  imagePullSecrets: []\n"
           + "  initContainers:\n"
@@ -1589,7 +1589,7 @@ class ReferenceObjects {
           + "    name: compat-operator-aux-container1\n"
           + "    volumeMounts:\n"
           + "    - mountPath: /tmpAuxiliaryImage\n"
-          + "      name: compat-aux-image-volume-auxiliaryimagevolume1\n"
+          + "      name: compat-ai-vol-auxiliaryimagevolume1\n"
           + "    - mountPath: /weblogic-operator/scripts\n"
           + "      name: weblogic-scripts-cm-volume\n"
           + "  nodeSelector: {}\n"