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

Author: rjeberhard

buildDockerImage.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 usage() {
@@ -11,7 +11,7 @@ Builds a container image for the Oracle WebLogic Kubernetes Operator.
 Parameters:
    -t: image name and tag in 'name:tag' format
 
-Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+Copyright (c) 2020, 2022, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 EOF
@@ -65,7 +65,7 @@ echo "Building image '$IMAGE_NAME' ..."
 
 # BUILD THE IMAGE (replace all environment variables)
 BUILD_START=$(date '+%s')
-docker build $PROXY_SETTINGS -t $IMAGE_NAME -f $SCRIPTPATH/Dockerfile $SCRIPTPATH || {
+${WLSIMG_BUILDER:-docker} build $PROXY_SETTINGS -t $IMAGE_NAME -f $SCRIPTPATH/Dockerfile $SCRIPTPATH || {
   echo "There was an error building the image."
   exit 1
 }
@@ -76,13 +76,13 @@ echo ""
 
 if [ $? -eq 0 ]; then
 cat << EOF
-  WebLogic Kubernetes Operator Docker Image is ready:
+  WebLogic Kubernetes Operator Image is ready:
 
     --> $IMAGE_NAME
 
   Build completed in $BUILD_ELAPSED seconds.
 
 EOF
 else
-  echo "WebLogic Kubernetes Operator container image was NOT successfully created. Check the output and correct any reported problems with the docker build operation."
-fi
+  echo "WebLogic Kubernetes Operator container image was NOT successfully created. Check the output and correct any reported problems with the ${WLSIMG_BUILDER:-docker} build operation."
+fi

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

@@ -10,7 +10,8 @@ private AuxiliaryImageConstants() {
   }
 
   public static final String AUXILIARY_IMAGE_TARGET_PATH = "/tmpAuxiliaryImage";
-  public static final String AUXILIARY_IMAGE_VOLUME_NAME_PREFIX = "aux-image-volume-";
+  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

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

@@ -9,7 +9,7 @@ private CommonConstants() {
     //not called
   }
 
-  public static final String COMPATIBILITY_MODE = "compatibility-mode-";
+  public static final String COMPATIBILITY_MODE = "compat-";
   public static final String API_VERSION_V9 = "weblogic.oracle/v9";
   public static final String API_VERSION_V8 = "weblogic.oracle/v8";
 

common/src/main/java/oracle/kubernetes/common/logging/MessageKeys.java

@@ -167,6 +167,7 @@ public class MessageKeys {
   public static final String WATCH_CLUSTER_DELETED = "WLSKO-0229";
   public static final String CLUSTER_STATUS = "WLSKO-0230";
   public static final String DOMAIN_INTROSPECTION_INCOMPLETE = "WLSKO-0231";
+  public static final String WATCH_CLUSTER_WITHOUT_DOMAIN = "WLSKO-0232";
 
   // domain status messages
   public static final String MAKE_RIGHT_WILL_RETRY = "WLSDO-0000";

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

@@ -3,10 +3,20 @@
 
 package oracle.kubernetes.common.utils;
 
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Optional;
+
 import oracle.kubernetes.common.CommonConstants;
 
 public class CommonUtils {
 
+  private static CheckedFunction<String, String> getMD5Hash = CommonUtils::getMD5Hash;
+
+  public static final int MAX_ALLOWED_VOLUME_NAME_LENGTH = 63;
+  public static final String VOLUME_NAME_SUFFIX = "-volume";
+
   private CommonUtils() {
     //not called
   }
@@ -33,4 +43,45 @@ public static String toDns1123LegalName(String value) {
     return value.toLowerCase().replace('_', '-');
   }
 
+  /**
+   * Returns a truncated volume name if the name exceeds the max allowed limit of characters for volume name.
+   * @param volumeName volume name
+   * @return truncated volume name if the name exceeds the limit, else return volumeName
+   * @throws NoSuchAlgorithmException Thrown when particular cryptographic algorithm
+   *                                  is not available in the environment.
+   */
+  public static String getLegalVolumeName(String volumeName) throws NoSuchAlgorithmException {
+    return volumeName.length() > (MAX_ALLOWED_VOLUME_NAME_LENGTH)
+        ? getShortName(volumeName)
+        : volumeName;
+  }
+
+
+  private static String getShortName(String resourceName) throws NoSuchAlgorithmException {
+    String volumeSuffix = Optional.ofNullable(getMD5Hash.apply(resourceName)).orElse("");
+    return resourceName.substring(0, MAX_ALLOWED_VOLUME_NAME_LENGTH - volumeSuffix.length()) + volumeSuffix;
+  }
+
+  /**
+   * Gets the MD5 hash of a string.
+   *
+   * @param data input string
+   * @return MD5 hash value of the data, null in case of an exception.
+   */
+  public static String getMD5Hash(String data) throws NoSuchAlgorithmException {
+    return bytesToHex(MessageDigest.getInstance("MD5").digest(data.getBytes(StandardCharsets.UTF_8)));
+  }
+
+  private static String bytesToHex(byte[] hash) {
+    StringBuilder result = new StringBuilder();
+    for (byte b : hash) {
+      result.append(String.format("%02x", b));
+    }
+    return result.toString();
+  }
+
+  @FunctionalInterface
+  public interface CheckedFunction<T, R> {
+    R apply(T t) throws NoSuchAlgorithmException;
+  }
 }

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

@@ -59,6 +59,7 @@ public class SchemaConversionUtils {
   private static final String DOLLAR_SPEC_AS_SERVERPOD = "$.spec.adminServer.serverPod";
 
   public static final String INTERNAL = "Internal";
+
   /**
    * The list of failure reason strings. Hard-coded here to match the values in DomainFailureReason.
    * Validated in tests in the operator.
@@ -683,7 +684,15 @@ private boolean hasMatchingVolumeMountName(Object volumeMount, Map<String, Objec
     return getDNS1123auxiliaryImageVolumeName(auxiliaryImage.get(VOLUME)).equals(((Map)volumeMount).get("name"));
   }
 
-  public static String getDNS1123auxiliaryImageVolumeName(Object name) {
+  private static String getDNS1123auxiliaryImageVolumeName(Object name) {
+    try {
+      return CommonUtils.getLegalVolumeName(getVolumeName(name));
+    } catch (Exception ex) {
+      return getVolumeName(name);
+    }
+  }
+
+  private static String getVolumeName(Object name) {
     return CommonUtils.toDns1123LegalName(CommonConstants.COMPATIBILITY_MODE
         + AuxiliaryImageConstants.AUXILIARY_IMAGE_VOLUME_NAME_PREFIX + name);
   }

common/src/main/resources/Operator.properties

@@ -175,6 +175,8 @@ WLSKO-0229=Watch event triggered for deletion of WebLogic Cluster {0} in WebLogi
 WLSKO-0230=Status for Cluster Resource with name {0} is now: {1}
 WLSKO-0231=Domain introspection is incomplete. \
   Check the introspector job logs for possible errors. Job logs are -> {0}.
+WLSKO-0232=Watch event triggered for WebLogic Cluster {0}, which is not referenced by any domain. 
+
 # Domain status messages
 
 WLSDO-0000={0}. Will retry next at {1} and approximately every {2} seconds afterward until {3} if the failure is not resolved.

common/src/test/java/oracle/kubernetes/common/utils/SchemaConversionUtilsTest.java

@@ -5,6 +5,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -15,6 +16,8 @@
 import java.util.Optional;
 
 import com.meterware.simplestub.Memento;
+import com.meterware.simplestub.StaticStubSupport;
+import oracle.kubernetes.common.CommonConstants;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -24,6 +27,7 @@
 
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasNoJsonPath;
+import static oracle.kubernetes.common.AuxiliaryImageConstants.AUXILIARY_IMAGE_VOLUME_NAME_PREFIX;
 import static oracle.kubernetes.common.CommonConstants.API_VERSION_V8;
 import static oracle.kubernetes.common.CommonConstants.API_VERSION_V9;
 import static org.hamcrest.Matchers.contains;
@@ -47,11 +51,16 @@ class SchemaConversionUtilsTest {
   private final ConversionAdapter converterv8 = new ConversionAdapter(API_VERSION_V8);
   private Map<String, Object> v8Domain;
 
+  private static CommonUtils.CheckedFunction<String, String> getMD5Hash = SchemaConversionUtilsTest::getMD5Hash;
+
+  private static String getMD5Hash(String s) throws NoSuchAlgorithmException {
+    throw new NoSuchAlgorithmException();
+  }
+
   @BeforeEach
   public void setUp() throws Exception {
     mementos.add(CommonTestUtils.silenceLogger());
     mementos.add(BaseTestUtils.silenceJsonPathLogger());
-    
     v8Domain = readAsYaml(DOMAIN_V8_AUX_IMAGE30_YAML);
   }
 
@@ -606,4 +615,35 @@ void testV8DomainWebLogicCredentialsSecretWithNamespace_remove() {
 
     assertThat(converter.getDomain(), hasNoJsonPath("$.spec.webLogicCredentialsSecret.namespace"));
   }
+
+  @Test
+  void testV8DomainWithLongAuxiliaryImageVolumeName_convertedVolumeNameIsTruncated() throws NoSuchAlgorithmException {
+    Map<String, Object> auxImageVolume = ((Map<String, Object>)
+        ((List<Object>) getDomainSpec(v8Domain).get("auxiliaryImageVolumes")).get(0));
+    auxImageVolume.put("name", "test-domain-aux-image-volume-test-domain-aux-image-volume");
+    getDomainSpec(v8Domain).put("auxiliaryImageVolumes",  Collections.singletonList(auxImageVolume));
+
+    converter.convert(v8Domain);
+
+    assertThat(converter.getDomain(), hasJsonPath("$.spec.serverPod.volumes[0].name",
+        equalTo(CommonUtils.getLegalVolumeName(CommonUtils.toDns1123LegalName(CommonConstants.COMPATIBILITY_MODE
+            + AUXILIARY_IMAGE_VOLUME_NAME_PREFIX + (String)auxImageVolume.get("name"))))));
+  }
+
+  @Test
+  void testV8DomainWithLongAuxiliaryImageVolumeNameAndMessageDigestThrowsException_volumeNameIsNotChanged()
+      throws NoSuchFieldException {
+    mementos.add(StaticStubSupport.install(CommonUtils.class, "getMD5Hash", getMD5Hash));
+
+    Map<String, Object> auxImageVolume = ((Map<String, Object>)
+        ((List<Object>) getDomainSpec(v8Domain).get("auxiliaryImageVolumes")).get(0));
+    auxImageVolume.put("name", "test-domain-aux-image-volume-test-domain-aux-image-volume");
+    getDomainSpec(v8Domain).put("auxiliaryImageVolumes",  Collections.singletonList(auxImageVolume));
+
+    converter.convert(v8Domain);
+
+    assertThat(converter.getDomain(), hasJsonPath("$.spec.serverPod.volumes[0].name",
+        equalTo(CommonUtils.toDns1123LegalName(CommonConstants.COMPATIBILITY_MODE
+            + AUXILIARY_IMAGE_VOLUME_NAME_PREFIX + "test-domain-aux-image-volume-test-domain-aux-image-volume"))));
+  }
 }

common/src/test/resources/oracle/kubernetes/common/utils/converted-domain-sample-2.yaml

@@ -34,11 +34,11 @@ spec:
   adminServer:
     serverPod:
       volumes:
-      - name: compatibility-mode-aux-image-volume-auxiliaryimagevolume1
+      - name: compat-ai-vol-auxiliaryimagevolume1
         emptyDir: {
           }
       initContainers:
-      - name: compatibility-mode-operator-aux-container1
+      - name: compat-operator-aux-container1
         image: model-in-image:WLS-AI-v1
         command:
         - /weblogic-operator/scripts/auxImage.sh
@@ -53,14 +53,14 @@ spec:
         - name: AUXILIARY_IMAGE_CONTAINER_IMAGE
           value: model-in-image:WLS-AI-v1
         - name: AUXILIARY_IMAGE_CONTAINER_NAME
-          value: compatibility-mode-operator-aux-container1
+          value: compat-operator-aux-container1
         volumeMounts:
-        - name: compatibility-mode-aux-image-volume-auxiliaryimagevolume1
+        - name: compat-ai-vol-auxiliaryimagevolume1
           mountPath: /tmpAuxiliaryImage
         - name: weblogic-scripts-cm-volume
           mountPath: /weblogic-operator/scripts
       volumeMounts:
-      - name: compatibility-mode-aux-image-volume-auxiliaryimagevolume1
+      - name: compat-ai-vol-auxiliaryimagevolume1
         mountPath: /auxiliary
       env:
       - name: AUXILIARY_IMAGE_PATHS

common/src/test/resources/oracle/kubernetes/common/utils/converted-domain-sample.yaml

@@ -34,11 +34,11 @@ spec:
         cpu: 250m
         memory: 768Mi
     volumes:
-    - name: compatibility-mode-aux-image-volume-auxiliaryimagevolume1
+    - name: compat-ai-vol-auxiliaryimagevolume1
       emptyDir: {
         }
     initContainers:
-    - name: compatibility-mode-operator-aux-container1
+    - name: compat-operator-aux-container1
       image: model-in-image:WLS-AI-v1
       command:
       - /weblogic-operator/scripts/auxImage.sh
@@ -53,14 +53,14 @@ spec:
       - name: AUXILIARY_IMAGE_CONTAINER_IMAGE
         value: model-in-image:WLS-AI-v1
       - name: AUXILIARY_IMAGE_CONTAINER_NAME
-        value: compatibility-mode-operator-aux-container1
+        value: compat-operator-aux-container1
       volumeMounts:
-      - name: compatibility-mode-aux-image-volume-auxiliaryimagevolume1
+      - name: compat-ai-vol-auxiliaryimagevolume1
         mountPath: /tmpAuxiliaryImage
       - name: weblogic-scripts-cm-volume
         mountPath: /weblogic-operator/scripts
     volumeMounts:
-    - name: compatibility-mode-aux-image-volume-auxiliaryimagevolume1
+    - name: compat-ai-vol-auxiliaryimagevolume1
       mountPath: /auxiliary
   adminServer:
     adminChannelPortForwardingEnabled: false