File tree Expand file tree Collapse file tree 4 files changed +12
-3
lines changed
model/src/main/java/oracle/kubernetes/weblogic/domain/v2
main/java/oracle/kubernetes/operator/helpers
test/java/oracle/kubernetes/operator/helpers Expand file tree Collapse file tree 4 files changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -482,6 +482,11 @@ public void setDomainHomeInImage(boolean domainHomeInImage) {
482
482
this .domainHomeInImage = domainHomeInImage ;
483
483
}
484
484
485
+ public DomainSpec withDomainHomeInImage (boolean domainHomeInImage ) {
486
+ setDomainHomeInImage (domainHomeInImage );
487
+ return this ;
488
+ }
489
+
485
490
/**
486
491
* The desired number of running managed servers in each WebLogic cluster that is not explicitly
487
492
* configured in clusters.
Original file line number Diff line number Diff line change @@ -637,7 +637,7 @@ private V1Container createContainer(TuningParameters tuningParameters) {
637
637
.env (getEnvironmentVariables (tuningParameters ))
638
638
.addPortsItem (new V1ContainerPort ().containerPort (getPort ()).protocol ("TCP" ))
639
639
.lifecycle (createLifecycle ())
640
- // .addVolumeMountsItem(volumeMount(STORAGE_VOLUME, STORAGE_MOUNT_PATH))
640
+ // .addVolumeMountsItem(volumeMount(STORAGE_VOLUME, STORAGE_MOUNT_PATH))
641
641
.addVolumeMountsItem (readOnlyVolumeMount (SECRETS_VOLUME , SECRETS_MOUNT_PATH ))
642
642
.addVolumeMountsItem (readOnlyVolumeMount (SCRIPTS_VOLUME , SCRIPTS_MOUNTS_PATH ))
643
643
.addVolumeMountsItem (readOnlyVolumeMount (DEBUG_CM_VOLUME , DEBUG_CM_MOUNTS_PATH ))
@@ -647,7 +647,6 @@ private V1Container createContainer(TuningParameters tuningParameters) {
647
647
v1Container .addVolumeMountsItem (volumeMount (STORAGE_VOLUME , STORAGE_MOUNT_PATH ));
648
648
}
649
649
650
-
651
650
if (!mockWLS ()) {
652
651
v1Container .readinessProbe (createReadinessProbe (tuningParameters .getPodTuning ()));
653
652
}
Original file line number Diff line number Diff line change @@ -169,7 +169,8 @@ private DomainSpec createDomainSpec() {
169
169
.withAdminSecret (new V1SecretReference ().name (ADMIN_SECRET_NAME ))
170
170
.withConfigOverrides (OVERRIDES_CM )
171
171
.withCluster (cluster )
172
- .withImage (LATEST_IMAGE );
172
+ .withImage (LATEST_IMAGE )
173
+ .withDomainHomeInImage (false );
173
174
174
175
List <String > overrideSecrets = new ArrayList ();
175
176
overrideSecrets .add (OVERRIDE_SECRET_1 );
Original file line number Diff line number Diff line change @@ -258,6 +258,10 @@ public void whenPodCreatedWithPullSecret_addToPod() {
258
258
259
259
@ Test
260
260
public void whenPodCreated_containerHasExpectedVolumeMounts () {
261
+ domainPresenceInfo
262
+ .getClaims ()
263
+ .addItemsItem (
264
+ new V1PersistentVolumeClaim ().metadata (new V1ObjectMeta ().name ("claim-name" )));
261
265
assertThat (
262
266
getCreatedPodSpecContainer ().getVolumeMounts (),
263
267
containsInAnyOrder (
You can’t perform that action at this time.
0 commit comments