Skip to content

Commit 2419504

Browse files
rjeberhardrjeberhard
committed
Merge branch 'allowreadonly-42' into 'release/4.2'
Back port from main allowreadonly See merge request weblogic-cloud/weblogic-kubernetes-operator!4944
2 parents 444b54e + 09ab3b0 commit 2419504

File tree

10 files changed

+168
-38
lines changed

10 files changed

+168
-38
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ private CommonConstants() {
1818

1919
public static final String SCRIPTS_VOLUME = "weblogic-scripts-cm-volume";
2020
public static final String SCRIPTS_MOUNTS_PATH = "/weblogic-operator/scripts";
21-
21+
public static final String TMPDIR_VOLUME = "weblogic-tmpdir-volume";
22+
public static final String TMPDIR_MOUNTS_PATH = "/tmp";
2223
public static final String SECRETS_WEBHOOK_CERT = "/secrets/webhookCert";
2324
public static final String SECRETS_WEBHOOK_KEY = "/secrets/webhookKey";
2425

‎operator/src/main/java/oracle/kubernetes/operator/helpers/BasePodStepContext.java‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package oracle.kubernetes.operator.helpers;
55

66
import java.util.ArrayList;
7-
import java.util.Arrays;
87
import java.util.Collection;
98
import java.util.Collections;
109
import java.util.HashMap;
@@ -44,6 +43,8 @@
4443
import static oracle.kubernetes.common.CommonConstants.COMPATIBILITY_MODE;
4544
import static oracle.kubernetes.common.CommonConstants.SCRIPTS_MOUNTS_PATH;
4645
import static oracle.kubernetes.common.CommonConstants.SCRIPTS_VOLUME;
46+
import static oracle.kubernetes.common.CommonConstants.TMPDIR_MOUNTS_PATH;
47+
import static oracle.kubernetes.common.CommonConstants.TMPDIR_VOLUME;
4748
import static oracle.kubernetes.common.CommonConstants.WLS_SHARED;
4849
import static oracle.kubernetes.common.helpers.AuxiliaryImageEnvVars.AUXILIARY_IMAGE_PATHS;
4950
import static oracle.kubernetes.weblogic.domain.model.AuxiliaryImage.AUXILIARY_IMAGE_INTERNAL_VOLUME_NAME;
@@ -74,6 +75,13 @@ String getSizeLimit() {
7475
return info.getDomain().getAuxiliaryImageVolumeSizeLimit();
7576
}
7677

78+
boolean isReadOnlyRootFileSystem() {
79+
return Optional.ofNullable(getServerSpec())
80+
.map(EffectiveServerSpec::getContainerSecurityContext)
81+
.map(V1SecurityContext::getReadOnlyRootFilesystem)
82+
.orElse(false);
83+
}
84+
7785
String getMedium() {
7886
return info.getDomain().getAuxiliaryImageVolumeMedium();
7987
}
@@ -106,7 +114,7 @@ private boolean hasMatchingVolumeName(V1VolumeMount volumeMount) {
106114
abstract List<V1Volume> getFluentbitVolumes();
107115

108116
protected V1Container createPrimaryContainer() {
109-
return new V1Container()
117+
V1Container container = new V1Container()
110118
.name(getContainerName())
111119
.image(getServerSpec().getImage())
112120
.imagePullPolicy(getServerSpec().getImagePullPolicy())
@@ -115,6 +123,17 @@ protected V1Container createPrimaryContainer() {
115123
.envFrom(getEnvFrom())
116124
.resources(getResources())
117125
.securityContext(getServerSpec().getContainerSecurityContext());
126+
127+
if (isReadOnlyRootFileSystem()) {
128+
List<V1VolumeMount> mounts = container.getVolumeMounts();
129+
if (mounts == null) {
130+
mounts = new ArrayList<>();
131+
}
132+
mounts.add(new V1VolumeMount().name(TMPDIR_VOLUME).mountPath(TMPDIR_MOUNTS_PATH));
133+
container.volumeMounts(mounts);
134+
}
135+
136+
return container;
118137
}
119138

120139
protected abstract List<V1EnvFromSource> getEnvFrom();
@@ -160,11 +179,19 @@ protected V1Container createInitContainerForAuxiliaryImage(DeploymentImage auxil
160179
.imagePullPolicy(auxiliaryImage.getImagePullPolicy())
161180
.command(Collections.singletonList(AUXILIARY_IMAGE_INIT_CONTAINER_WRAPPER_SCRIPT))
162181
.env(createEnv(auxiliaryImage, getName(index)))
163-
.resources(createResources())
164-
.volumeMounts(Arrays.asList(
165-
new V1VolumeMount().name(AUXILIARY_IMAGE_INTERNAL_VOLUME_NAME)
166-
.mountPath(AUXILIARY_IMAGE_TARGET_PATH),
167-
new V1VolumeMount().name(SCRIPTS_VOLUME).mountPath(SCRIPTS_MOUNTS_PATH)));
182+
.resources(createResources());
183+
184+
List<V1VolumeMount> mounts = new ArrayList<>();
185+
186+
if (isReadOnlyRootFileSystem()) {
187+
mounts.add(new V1VolumeMount().name(TMPDIR_VOLUME).mountPath(TMPDIR_MOUNTS_PATH));
188+
}
189+
190+
mounts.add(new V1VolumeMount().name(AUXILIARY_IMAGE_INTERNAL_VOLUME_NAME)
191+
.mountPath(AUXILIARY_IMAGE_TARGET_PATH));
192+
mounts.add(new V1VolumeMount().name(SCRIPTS_VOLUME).mountPath(SCRIPTS_MOUNTS_PATH));
193+
194+
container.volumeMounts(mounts);
168195

169196
if (isInitializeDomainOnPV) {
170197
container.securityContext(PodSecurityHelper.getDefaultContainerSecurityContext());

‎operator/src/main/java/oracle/kubernetes/operator/helpers/FluentbitHelper.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024, Oracle and/or its affiliates.
1+
// Copyright (c) 2025, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.kubernetes.operator.helpers;
@@ -21,6 +21,8 @@
2121
import oracle.kubernetes.weblogic.domain.model.DomainResource;
2222
import oracle.kubernetes.weblogic.domain.model.FluentbitSpecification;
2323

24+
import static oracle.kubernetes.common.CommonConstants.TMPDIR_MOUNTS_PATH;
25+
import static oracle.kubernetes.common.CommonConstants.TMPDIR_VOLUME;
2426
import static oracle.kubernetes.operator.helpers.StepContextConstants.FLUENTBIT_CONFIGMAP_NAME_SUFFIX;
2527
import static oracle.kubernetes.operator.helpers.StepContextConstants.FLUENTBIT_CONFIGMAP_VOLUME;
2628
import static oracle.kubernetes.operator.helpers.StepContextConstants.FLUENTBIT_CONFIG_DATA_NAME;
@@ -39,7 +41,7 @@ private FluentbitHelper() {
3941
* @param domain Domain.
4042
*/
4143
public static void addFluentbitContainer(FluentbitSpecification fluentbitSpecification, List<V1Container> containers,
42-
DomainResource domain, boolean isJobPod) {
44+
DomainResource domain, boolean isJobPod, boolean isReadOnlyRootFileSystem) {
4345
V1Container fluentbitContainer = new V1Container();
4446

4547
fluentbitContainer.name(FLUENTBIT_CONTAINER_NAME);
@@ -66,6 +68,11 @@ public static void addFluentbitContainer(FluentbitSpecification fluentbitSpecifi
6668
fluentbitSpecification.getVolumeMounts().forEach(fluentbitContainer::addVolumeMountsItem);
6769

6870
fluentbitContainer.addVolumeMountsItem(createFluentbitConfigmapVolumeMount());
71+
72+
if (isReadOnlyRootFileSystem) {
73+
fluentbitContainer.addVolumeMountsItem(new V1VolumeMount().name(TMPDIR_VOLUME).mountPath(TMPDIR_MOUNTS_PATH));
74+
}
75+
6976
containers.add(fluentbitContainer);
7077
}
7178

‎operator/src/main/java/oracle/kubernetes/operator/helpers/FluentdHelper.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import oracle.kubernetes.weblogic.domain.model.DomainResource;
2222
import oracle.kubernetes.weblogic.domain.model.FluentdSpecification;
2323

24+
import static oracle.kubernetes.common.CommonConstants.TMPDIR_MOUNTS_PATH;
25+
import static oracle.kubernetes.common.CommonConstants.TMPDIR_VOLUME;
2426
import static oracle.kubernetes.operator.helpers.StepContextConstants.FLUENTD_CONFIGMAP_NAME_SUFFIX;
2527
import static oracle.kubernetes.operator.helpers.StepContextConstants.FLUENTD_CONFIGMAP_VOLUME;
2628
import static oracle.kubernetes.operator.helpers.StepContextConstants.FLUENTD_CONFIG_DATA_NAME;
@@ -39,7 +41,7 @@ private FluentdHelper() {
3941
* @param domain Domain.
4042
*/
4143
public static void addFluentdContainer(FluentdSpecification fluentdSpecification, List<V1Container> containers,
42-
DomainResource domain, boolean isJobPod) {
44+
DomainResource domain, boolean isJobPod, boolean isReadOnlyRootFileSystem) {
4345

4446
V1Container fluentdContainer = new V1Container();
4547

@@ -69,6 +71,11 @@ public static void addFluentdContainer(FluentdSpecification fluentdSpecification
6971
.forEach(fluentdContainer::addVolumeMountsItem);
7072

7173
fluentdContainer.addVolumeMountsItem(createFluentdConfigmapVolumeMount());
74+
75+
if (isReadOnlyRootFileSystem) {
76+
fluentdContainer.addVolumeMountsItem(new V1VolumeMount().name(TMPDIR_VOLUME).mountPath(TMPDIR_MOUNTS_PATH));
77+
}
78+
7279
containers.add(fluentdContainer);
7380
}
7481

‎operator/src/main/java/oracle/kubernetes/operator/helpers/JobStepContext.java‎

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import io.kubernetes.client.openapi.models.V1ConfigMapVolumeSource;
1818
import io.kubernetes.client.openapi.models.V1Container;
19+
import io.kubernetes.client.openapi.models.V1EmptyDirVolumeSource;
1920
import io.kubernetes.client.openapi.models.V1EnvFromSource;
2021
import io.kubernetes.client.openapi.models.V1EnvVar;
2122
import io.kubernetes.client.openapi.models.V1Job;
@@ -69,6 +70,8 @@
6970
import static oracle.kubernetes.common.CommonConstants.COMPATIBILITY_MODE;
7071
import static oracle.kubernetes.common.CommonConstants.SCRIPTS_MOUNTS_PATH;
7172
import static oracle.kubernetes.common.CommonConstants.SCRIPTS_VOLUME;
73+
import static oracle.kubernetes.common.CommonConstants.TMPDIR_MOUNTS_PATH;
74+
import static oracle.kubernetes.common.CommonConstants.TMPDIR_VOLUME;
7275
import static oracle.kubernetes.common.CommonConstants.WLS_SHARED;
7376
import static oracle.kubernetes.common.utils.CommonUtils.MAX_ALLOWED_VOLUME_NAME_LENGTH;
7477
import static oracle.kubernetes.common.utils.CommonUtils.VOLUME_NAME_SUFFIX;
@@ -300,6 +303,9 @@ String getJobCreatedMessageKey() {
300303
}
301304

302305
String getNodeManagerHome() {
306+
if (isReadOnlyRootFileSystem()) {
307+
return NODEMGR_HOME_READONLY_ROOT;
308+
}
303309
return NODEMGR_HOME;
304310
}
305311

@@ -492,23 +498,29 @@ private Optional<InitializeDomainOnPV> getInitializeDomainOnPV() {
492498
}
493499

494500
private void addInitDomainOnPVInitContainer(List<V1Container> initContainers) {
495-
initContainers.add(new V1Container()
496-
.name(INIT_DOMAIN_ON_PV_CONTAINER)
497-
.image(getDomain().getSpec().getImage())
498-
.volumeMounts(getDomain().getAdminServerSpec().getAdditionalVolumeMounts())
499-
.addVolumeMountsItem(new V1VolumeMount().name(SCRIPTS_VOLUME).mountPath(SCRIPTS_MOUNTS_PATH))
500-
.addVolumeMountsItem(new V1VolumeMount().name(AUXILIARY_IMAGE_INTERNAL_VOLUME_NAME)
501-
.mountPath(AUXILIARY_IMAGE_TARGET_PATH))
502-
.env(getDomain().getAdminServerSpec().getEnvironmentVariables())
503-
.addEnvItem(new V1EnvVar().name(DOMAIN_HOME).value(getDomainHome()))
504-
.addEnvItem(new V1EnvVar().name(ServerEnvVars.LOG_HOME).value(getEffectiveLogHome()))
505-
.addEnvItem(new V1EnvVar().name(ServerEnvVars.DOMAIN_HOME_ON_PV_DEFAULT_UGID)
506-
.value(getDomainHomeOnPVHomeOwnership()))
507-
.addEnvItem(new V1EnvVar().name(AuxiliaryImageEnvVars.AUXILIARY_IMAGE_TARGET_PATH)
508-
.value(AuxiliaryImageConstants.AUXILIARY_IMAGE_TARGET_PATH))
509-
.securityContext(getInitContainerSecurityContext())
510-
.command(List.of(INIT_DOMAIN_ON_PV_SCRIPT))
511-
);
501+
V1Container container = new V1Container()
502+
.name(INIT_DOMAIN_ON_PV_CONTAINER)
503+
.image(getDomain().getSpec().getImage())
504+
.volumeMounts(getDomain().getAdminServerSpec().getAdditionalVolumeMounts())
505+
.addVolumeMountsItem(new V1VolumeMount().name(SCRIPTS_VOLUME).mountPath(SCRIPTS_MOUNTS_PATH))
506+
.addVolumeMountsItem(new V1VolumeMount().name(AUXILIARY_IMAGE_INTERNAL_VOLUME_NAME)
507+
.mountPath(AUXILIARY_IMAGE_TARGET_PATH))
508+
.env(getDomain().getAdminServerSpec().getEnvironmentVariables())
509+
.addEnvItem(new V1EnvVar().name(DOMAIN_HOME).value(getDomainHome()))
510+
.addEnvItem(new V1EnvVar().name(ServerEnvVars.LOG_HOME).value(getEffectiveLogHome()))
511+
.addEnvItem(new V1EnvVar().name(ServerEnvVars.DOMAIN_HOME_ON_PV_DEFAULT_UGID)
512+
.value(getDomainHomeOnPVHomeOwnership()))
513+
.addEnvItem(new V1EnvVar().name(AuxiliaryImageEnvVars.AUXILIARY_IMAGE_TARGET_PATH)
514+
.value(AuxiliaryImageConstants.AUXILIARY_IMAGE_TARGET_PATH))
515+
.securityContext(getInitContainerSecurityContext())
516+
.command(List.of(INIT_DOMAIN_ON_PV_SCRIPT));
517+
518+
if (isReadOnlyRootFileSystem()) {
519+
container.addVolumeMountsItem(volumeMount(TMPDIR_VOLUME, TMPDIR_MOUNTS_PATH));
520+
}
521+
522+
initContainers.add(container);
523+
512524
}
513525

514526
@Override
@@ -633,6 +645,14 @@ protected V1PodSpec createPodSpec() {
633645
}
634646
}
635647

648+
if (isReadOnlyRootFileSystem()) {
649+
List<V1Volume> volumes = podSpec.getVolumes();
650+
if (volumes == null) {
651+
volumes = new ArrayList<>();
652+
}
653+
volumes.add(new V1Volume().name(TMPDIR_VOLUME).emptyDir(new V1EmptyDirVolumeSource().medium("Memory")));
654+
}
655+
636656
getConfigOverrideSecrets().forEach(secretName -> addConfigOverrideSecretVolume(podSpec, secretName));
637657
Optional.ofNullable(getConfigOverrides()).ifPresent(overrides -> addConfigOverrideVolume(podSpec, overrides));
638658

@@ -822,15 +842,15 @@ protected List<V1Container> getContainers() {
822842
.ifPresent(fluentd -> {
823843
if (Boolean.TRUE.equals(fluentd.getWatchIntrospectorLogs())) {
824844
FluentdHelper.addFluentdContainer(fluentd,
825-
containers, getDomain(), true);
845+
containers, getDomain(), true, isReadOnlyRootFileSystem());
826846
}
827847
});
828848

829849
Optional.ofNullable(getDomain().getFluentbitSpecification())
830850
.ifPresent(fluentbit -> {
831851
if (Boolean.TRUE.equals(fluentbit.getWatchIntrospectorLogs())) {
832852
FluentbitHelper.addFluentbitContainer(fluentbit,
833-
containers, getDomain(), true);
853+
containers, getDomain(), true, isReadOnlyRootFileSystem());
834854
}
835855
});
836856

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

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017, 2024, Oracle and/or its affiliates.
1+
// Copyright (c) 2017, 2025, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.kubernetes.operator.helpers;
@@ -28,6 +28,7 @@
2828
import io.kubernetes.client.openapi.models.V1ContainerBuilder;
2929
import io.kubernetes.client.openapi.models.V1ContainerPort;
3030
import io.kubernetes.client.openapi.models.V1DeleteOptions;
31+
import io.kubernetes.client.openapi.models.V1EmptyDirVolumeSource;
3132
import io.kubernetes.client.openapi.models.V1EnvFromSource;
3233
import io.kubernetes.client.openapi.models.V1EnvVar;
3334
import io.kubernetes.client.openapi.models.V1ExecAction;
@@ -89,6 +90,8 @@
8990
import static oracle.kubernetes.common.AuxiliaryImageConstants.AUXILIARY_IMAGE_VOLUME_NAME_OLD_PREFIX;
9091
import static oracle.kubernetes.common.AuxiliaryImageConstants.AUXILIARY_IMAGE_VOLUME_NAME_PREFIX;
9192
import static oracle.kubernetes.common.CommonConstants.COMPATIBILITY_MODE;
93+
import static oracle.kubernetes.common.CommonConstants.TMPDIR_MOUNTS_PATH;
94+
import static oracle.kubernetes.common.CommonConstants.TMPDIR_VOLUME;
9295
import static oracle.kubernetes.common.helpers.AuxiliaryImageEnvVars.AUXILIARY_IMAGE_MOUNT_PATH;
9396
import static oracle.kubernetes.common.logging.MessageKeys.CYCLING_POD_EVICTED;
9497
import static oracle.kubernetes.common.logging.MessageKeys.CYCLING_POD_SPEC_CHANGED;
@@ -737,6 +740,9 @@ private List<V1Volume> getVolumes(String domainUid) {
737740
}
738741
volumes.addAll(getServerSpec().getAdditionalVolumes());
739742

743+
if (isReadOnlyRootFileSystem()) {
744+
volumes.add(new V1Volume().name(TMPDIR_VOLUME).emptyDir(new V1EmptyDirVolumeSource().medium("Memory")));
745+
}
740746
return volumes;
741747
}
742748

@@ -776,10 +782,13 @@ protected List<String> getContainerCommand() {
776782
protected List<V1Container> getContainers() {
777783
List<V1Container> containers = new ArrayList<>(getServerSpec().getContainers());
778784
exporterContext.addContainer(containers);
785+
boolean isReadOnlyRootFileSystem = isReadOnlyRootFileSystem();
779786
Optional.ofNullable(getDomain().getFluentdSpecification())
780-
.ifPresent(fluentd -> addFluentdContainer(fluentd, containers, getDomain(), false));
787+
.ifPresent(fluentd -> addFluentdContainer(fluentd, containers, getDomain(), false,
788+
isReadOnlyRootFileSystem));
781789
Optional.ofNullable(getDomain().getFluentbitSpecification())
782-
.ifPresent(fluentbit -> addFluentbitContainer(fluentbit, containers, getDomain(), false));
790+
.ifPresent(fluentbit -> addFluentbitContainer(fluentbit, containers, getDomain(),
791+
false, isReadOnlyRootFileSystem));
783792
return containers;
784793
}
785794

@@ -838,7 +847,7 @@ void addStartupEnvVars(List<V1EnvVar> vars) {
838847
addEnvVarIfTrue(isAdminServerProtocolChannelSecure(), vars, ServerEnvVars.ADMIN_SERVER_PORT_SECURE);
839848
addEnvVar(vars, ServerEnvVars.SERVER_NAME, getServerName());
840849
addEnvVar(vars, ServerEnvVars.DOMAIN_UID, getDomainUid());
841-
addEnvVar(vars, ServerEnvVars.NODEMGR_HOME, NODEMGR_HOME);
850+
addEnvVar(vars, ServerEnvVars.NODEMGR_HOME, getNodeManagerHome());
842851
addEnvVar(vars, ServerEnvVars.LOG_HOME, getEffectiveLogHome());
843852
if (getLogHomeLayout() == LogHomeLayoutType.FLAT) {
844853
addEnvVar(vars, ServerEnvVars.LOG_HOME_LAYOUT, getLogHomeLayout().toString());
@@ -869,6 +878,12 @@ protected void addAuxiliaryImageEnv(List<AuxiliaryImage> auxiliaryImageList, Lis
869878
});
870879
}
871880

881+
String getNodeManagerHome() {
882+
if (isReadOnlyRootFileSystem()) {
883+
return NODEMGR_HOME_READONLY_ROOT;
884+
}
885+
return NODEMGR_HOME;
886+
}
872887

873888
private String getDomainHome() {
874889
return getDomain().getDomainHome();
@@ -1648,7 +1663,7 @@ void addContainer(List<V1Container> containers) {
16481663
}
16491664

16501665
private V1Container createMonitoringExporterContainer() {
1651-
return new V1Container()
1666+
V1Container container = new V1Container()
16521667
.name(EXPORTER_CONTAINER_NAME)
16531668
.image(getDomain().getMonitoringExporterImage())
16541669
.imagePullPolicy(getDomain().getMonitoringExporterImagePullPolicy())
@@ -1657,6 +1672,12 @@ private V1Container createMonitoringExporterContainer() {
16571672
.addEnvItem(new V1EnvVar().name("JAVA_OPTS").value(createJavaOptions()))
16581673
.addPortsItem(new V1ContainerPort()
16591674
.name("metrics").protocol("TCP").containerPort(getPort()));
1675+
1676+
if (isReadOnlyRootFileSystem()) {
1677+
container.addVolumeMountsItem(new V1VolumeMount().name(TMPDIR_VOLUME).mountPath(TMPDIR_MOUNTS_PATH));
1678+
}
1679+
1680+
return container;
16601681
}
16611682

16621683
private String createJavaOptions() {

‎operator/src/main/java/oracle/kubernetes/operator/helpers/StepContextConstants.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public interface StepContextConstants {
3232
String OPSS_WALLETFILE_MOUNT_PATH = "/weblogic-operator/opss-walletfile-secret";
3333
String DEBUG_CM_MOUNTS_PATH = "/weblogic-operator/debug";
3434
String NODEMGR_HOME = "/u01/nodemanager";
35+
String NODEMGR_HOME_READONLY_ROOT = "/tmp/nodemanager";
3536

3637
String INIT_DOMAIN_ON_PV_CONTAINER = "create-dh-dir";
3738
String INIT_DOMAIN_ON_PV_SCRIPT = "/weblogic-operator/scripts/initializeDomainHomeOnPV.sh";

‎operator/src/main/resources/scripts/modelInImage.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ buildWDTParams_MD5() {
172172

173173
model_list=""
174174
archive_list=""
175-
variable_list="/u01/_k8s_generated_props.properties"
175+
variable_list="/tmp/_k8s_generated_props.properties"
176176

177177
#
178178
# First build the command line parameters for WDT
@@ -396,7 +396,7 @@ createWLDomain() {
396396
# create domain again
397397

398398
DISABLE_SM_FOR_12214_NONSM_UPG=0
399-
if [ -f ${PRIMORDIAL_DOMAIN_ZIPPED} ] && [ -z "${MII_USE_ONLINE_UPDATE}" ] || [ "${MII_USE_ONLINE_UPDATE}" != "true" ] ]; then
399+
if [ -f ${PRIMORDIAL_DOMAIN_ZIPPED} ] && { [ -z "${MII_USE_ONLINE_UPDATE}" ] || [ "${MII_USE_ONLINE_UPDATE}" != "true" ]; }; then
400400
checkSecureModeForUpgrade
401401
fi
402402
if [ ${WDT_ARTIFACTS_CHANGED} -ne 0 ] || [ ${jdk_changed} -eq 1 ] \

0 commit comments

Comments
 (0)