Skip to content

Commit 4a583dd

Browse files
Merge pull request #2674 from oracle/backport_pr2659_to_3.3
Backport pr2659 to disable validation for AUXILIARY_IMAGE_PATH (Owls-94624) to 3.3
2 parents 2618b9e + d3408fc commit 4a583dd

File tree

6 files changed

+6
-11
lines changed

6 files changed

+6
-11
lines changed

documentation/domains/Domain.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
"type": "string"
105105
},
106106
"mountPath": {
107-
"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.",
107+
"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.",
108108
"type": "string"
109109
},
110110
"name": {

documentation/domains/Domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ The current status of the operation of the WebLogic domain. Updated automaticall
8080
| Name | Type | Description |
8181
| --- | --- | --- |
8282
| `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. |
83-
| `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. |
83+
| `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'. |
8484
| `name` | string | The name of the volume. Required. |
8585
| `sizeLimit` | string | The emptyDir volume size limit. Defaults to unset. |
8686

documentation/domains/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,7 @@
10251025
"type": "string"
10261026
},
10271027
"mountPath": {
1028-
"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.",
1028+
"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.",
10291029
"type": "string"
10301030
},
10311031
"name": {

kubernetes/crd/domain-crd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
66
metadata:
77
annotations:
8-
weblogic.sha256: a9978851bbc86ce4653d328db25d01661829c8531a6971c001fdaa1a00bfa5a6
8+
weblogic.sha256: 5a5f3a7877677f9aca7593f0bd0159cd3c1e8f89251955589a2accd35224c7b9
99
name: domains.weblogic.oracle
1010
spec:
1111
group: weblogic.oracle
@@ -8609,7 +8609,7 @@ spec:
86098609
description: The mount path. The files in the path are populated
86108610
from the same named directory in the images supplied by each
86118611
container in `serverPod.auxiliaryImages`. Each volume must
8612-
be configured with a different mount path. Required.
8612+
be configured with a different mount path. Defaults to '/auxiliary'.
86138613
type: string
86148614
name:
86158615
description: The name of the volume. Required.

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/AuxiliaryImageVolume.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class AuxiliaryImageVolume {
2121

2222
@Description("The mount path. The files in the path are populated from the same named directory in the images "
2323
+ "supplied by each container in `serverPod.auxiliaryImages`. Each volume must be configured with "
24-
+ "a different mount path. Required.")
24+
+ "a different mount path. Defaults to '/auxiliary'.")
2525
@NotNull
2626
private String mountPath;
2727

operator/src/main/resources/scripts/utils_base.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,6 @@ function initAuxiliaryImage() {
238238
"AUXILIARY_IMAGE_PATH is '$AUXILIARY_IMAGE_PATH' and AUXILIARY_IMAGE_TARGET_PATH is '${AUXILIARY_IMAGE_TARGET_PATH}'."
239239
traceDirs before $AUXILIARY_IMAGE_PATH
240240

241-
if [ ! -d ${AUXILIARY_IMAGE_PATH} ] || [ -z "$(ls -A ${AUXILIARY_IMAGE_PATH})" ]; then
242-
trace SEVERE "Auxiliary Image: Dir '${AUXILIARY_IMAGE_PATH}' doesn't exist or is empty. Exiting."
243-
return
244-
fi
245-
246241
trace FINE "Auxiliary Image: About to execute AUXILIARY_IMAGE_COMMAND='$AUXILIARY_IMAGE_COMMAND' ."
247242
results=$(eval $AUXILIARY_IMAGE_COMMAND 2>&1)
248243
if [ $? -ne 0 ]; then

0 commit comments

Comments
 (0)