Skip to content

Commit cc96e45

Browse files
committed
Update creating-domain.md, add unit test for "Recycle", and fix a typo.
Signed-off-by: Dongbo Xiao <[email protected]>
1 parent 2391754 commit cc96e45

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

kubernetes/create-weblogic-domain-inputs.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ weblogicDomainStorageType: HOST_PATH
4747
#weblogicDomainStoragePath: /scratch/k8s_dir/domain1
4848

4949
# Reclaim policy of the domain's persistent storage
50+
# The valid values are: 'Retain', 'Delete', and 'Recycle'
5051
weblogicDomainStorageReclaimPolicy: Retain
5152

5253
# Total storage allocated to the domain's persistent storage.

site/creating-domain.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ The following parameters must be provided in the input file:
120120
| t3PublicAddress | Public address for the t3 channel. | kubernetes |
121121
| weblogicCredentialsSecretName | Name of the Kubernetes secret for the Administration Server's username and password. | domain1-weblogic-credentials |
122122
| weblogicDomainStoragePath | Physical path of the storage for the domain. | no default |
123+
| weblogicDomainStorageReclaimPolicy | Kubernetes persistent volume reclaim policy for the domain persistent storage | Retain |
123124
| weblogicDomainStorageSize | Total storage allocated for the domain. | 10Gi |
124125
| weblogicDomainStorageType | Type of storage for the domain. Legal values are 'NFS' and 'HOST_PATH". | HOST_PATH |
125126
| weblogicDomainStorageNFSServer| The name of IP address of the NFS server for the domain's storage. | no default |

src/test/java/oracle/kubernetes/operator/create/CreateDomainInputsValidationTest.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,22 @@ public void createDomain_with_invalidWeblogicDomainStorageReclaimPolicy_failsAnd
256256
}
257257

258258
@Test
259-
public void createDomain_with_weblogicDomainStorageReclaimPolicyDeleteAndNonTmoWeblogicDomainStoragePath_failsAndReturnsError() throws Exception {
259+
public void createDomain_with_weblogicDomainStorageReclaimPolicyDeleteAndNonTmpWeblogicDomainStoragePath_failsAndReturnsError() throws Exception {
260260
assertThat(
261261
execCreateDomain(newInputs().weblogicDomainStorageReclaimPolicy(STORAGE_RECLAIM_POLICY_DELETE).weblogicDomainStoragePath("/scratch")),
262262
failsAndPrints(invalidRelatedParamValueError(PARAM_WEBLOGIC_DOMAIN_STORAGE_RECLAIM_POLICY, STORAGE_RECLAIM_POLICY_DELETE,
263263
PARAM_WEBLOGIC_DOMAIN_STORAGE_PATH, "/scratch")));
264264
}
265265

266+
@Test
267+
public void createDomain_with_weblogicDomainStorageReclaimPolicyRecycle_succeeds() throws Exception {
268+
GeneratedDomainYamlFiles
269+
.generateDomainYamlFiles(
270+
newInputs()
271+
.weblogicDomainStorageReclaimPolicy(STORAGE_RECLAIM_POLICY_RECYCLE))
272+
.remove();
273+
}
274+
266275
@Test
267276
public void createDomain_with_weblogicDomainStorageReclaimPolicyDelete_and_tmpWeblogicDomainStoragePath_succeeds() throws Exception {
268277
GeneratedDomainYamlFiles

0 commit comments

Comments
 (0)