diff --git a/documentation/domains/Domain.json b/documentation/domains/Domain.json index 0e812cb6f73..3a1c7faa563 100644 --- a/documentation/domains/Domain.json +++ b/documentation/domains/Domain.json @@ -104,7 +104,7 @@ "type": "string" }, "mountPath": { - "description": "The mount path. The files in the path are populated from the same named directory in the images supplied by each container in `serverPod.auxiliaryImages`. Each volume must be configured with a different mount path. Required.", + "description": "The mount path. The files in the path are populated from the same named directory in the images supplied by each container in `serverPod.auxiliaryImages`. Each volume must be configured with a different mount path. Defaults to \u0027/auxiliary\u0027.", "type": "string" }, "name": { diff --git a/documentation/domains/Domain.md b/documentation/domains/Domain.md index e88f7a749c2..5ac5be40d6f 100644 --- a/documentation/domains/Domain.md +++ b/documentation/domains/Domain.md @@ -80,7 +80,7 @@ The current status of the operation of the WebLogic domain. Updated automaticall | Name | Type | Description | | --- | --- | --- | | `medium` | string | The emptyDir volume medium. This is an advanced setting that rarely needs to be configured. Defaults to unset, which means the volume's files are stored on the local node's file system for the life of the pod. | -| `mountPath` | string | The mount path. The files in the path are populated from the same named directory in the images supplied by each container in `serverPod.auxiliaryImages`. Each volume must be configured with a different mount path. Required. | +| `mountPath` | string | The mount path. The files in the path are populated from the same named directory in the images supplied by each container in `serverPod.auxiliaryImages`. Each volume must be configured with a different mount path. Defaults to '/auxiliary'. | | `name` | string | The name of the volume. Required. | | `sizeLimit` | string | The emptyDir volume size limit. Defaults to unset. | diff --git a/documentation/domains/index.html b/documentation/domains/index.html index 4b2f8a30053..69795510164 100644 --- a/documentation/domains/index.html +++ b/documentation/domains/index.html @@ -1025,7 +1025,7 @@ "type": "string" }, "mountPath": { - "description": "The mount path. The files in the path are populated from the same named directory in the images supplied by each container in `serverPod.auxiliaryImages`. Each volume must be configured with a different mount path. Required.", + "description": "The mount path. The files in the path are populated from the same named directory in the images supplied by each container in `serverPod.auxiliaryImages`. Each volume must be configured with a different mount path. Defaults to \u0027/auxiliary\u0027.", "type": "string" }, "name": { diff --git a/kubernetes/crd/domain-crd.yaml b/kubernetes/crd/domain-crd.yaml index a488f9fdebe..86b5845b261 100644 --- a/kubernetes/crd/domain-crd.yaml +++ b/kubernetes/crd/domain-crd.yaml @@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - weblogic.sha256: 812f53bce216b79c4c74d4a094af4908fe381a1409dc491f9a986e09939774cf + weblogic.sha256: 62b7ad1ba2e8d59aa1ffe2bc083b55fb25b43bb4939f48f61c4a7973e604d2fa name: domains.weblogic.oracle spec: group: weblogic.oracle @@ -8614,7 +8614,7 @@ spec: description: The mount path. The files in the path are populated from the same named directory in the images supplied by each container in `serverPod.auxiliaryImages`. Each volume must - be configured with a different mount path. Required. + be configured with a different mount path. Defaults to '/auxiliary'. type: string name: description: The name of the volume. Required. diff --git a/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/AuxiliaryImageVolume.java b/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/AuxiliaryImageVolume.java index 44524f0cff7..1ea0316e1c8 100644 --- a/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/AuxiliaryImageVolume.java +++ b/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/AuxiliaryImageVolume.java @@ -21,7 +21,7 @@ public class AuxiliaryImageVolume { @Description("The mount path. The files in the path are populated from the same named directory in the images " + "supplied by each container in `serverPod.auxiliaryImages`. Each volume must be configured with " - + "a different mount path. Required.") + + "a different mount path. Defaults to '/auxiliary'.") @NotNull private String mountPath; diff --git a/operator/src/main/resources/scripts/utils_base.sh b/operator/src/main/resources/scripts/utils_base.sh index f669b74d8c0..f593229f5f9 100644 --- a/operator/src/main/resources/scripts/utils_base.sh +++ b/operator/src/main/resources/scripts/utils_base.sh @@ -238,11 +238,6 @@ function initAuxiliaryImage() { "AUXILIARY_IMAGE_PATH is '$AUXILIARY_IMAGE_PATH' and AUXILIARY_IMAGE_TARGET_PATH is '${AUXILIARY_IMAGE_TARGET_PATH}'." traceDirs before AUXILIARY_IMAGE_PATH - if [ ! -d ${AUXILIARY_IMAGE_PATH} ] || [ -z "$(ls -A ${AUXILIARY_IMAGE_PATH})" ]; then - trace SEVERE "Auxiliary Image: Dir '${AUXILIARY_IMAGE_PATH}' doesn't exist or is empty. Exiting." - return - fi - trace FINE "Auxiliary Image: About to execute AUXILIARY_IMAGE_COMMAND='$AUXILIARY_IMAGE_COMMAND' ." results=$(eval $AUXILIARY_IMAGE_COMMAND 2>&1) if [ $? -ne 0 ]; then