Checkpoint k8s artifact renaming work

moreaut · moreaut · commit 10db40556e73 · 2018-03-29T08:37:55.000-04:00
diff --git a/kubernetes/internal/create-weblogic-domain.sh b/kubernetes/internal/create-weblogic-domain.sh
@@ -96,8 +96,8 @@ function initAndValidateOutputDir {
     ${domainOutputDir} \
     ${valuesInputFile} \
     create-weblogic-domain-inputs.yaml \
-    weblogic-domain-persistent-volume.yaml \
-    weblogic-domain-persistent-volume-claim.yaml \
+    weblogic-domain-pv.yaml \
+    weblogic-domain-pvc.yaml \
     weblogic-domain-traefik-${clusterNameLC}.yaml \
     weblogic-domain-traefik-security-${clusterNameLC}.yaml \
     create-weblogic-domain-job.yaml \
@@ -291,12 +291,12 @@ function initialize {
     fi
   fi
 
-  domainPVInput="${scriptDir}/weblogic-domain-persistent-volume-template.yaml"
+  domainPVInput="${scriptDir}/weblogic-domain-pv-template.yaml"
   if [ ! -f ${domainPVInput} ]; then
     validationError "The template file ${domainPVInput} for generating a persistent volume was not found"
   fi
 
-  domainPVCInput="${scriptDir}/weblogic-domain-persistent-volume-claim-template.yaml"
+  domainPVCInput="${scriptDir}/weblogic-domain-pvc-template.yaml"
   if [ ! -f ${domainPVCInput} ]; then
     validationError "The template file ${domainPVCInput} for generating a persistent volume claim was not found"
   fi
@@ -382,8 +382,8 @@ function createYamlFiles {
   # (if needed) and copy the inputs file there.
   copyInputsFileToOutputDirectory ${valuesInputFile} "${domainOutputDir}/create-weblogic-domain-inputs.yaml"
 
-  domainPVOutput="${domainOutputDir}/weblogic-domain-persistent-volume.yaml"
-  domainPVCOutput="${domainOutputDir}/weblogic-domain-persistent-volume-claim.yaml"
+  domainPVOutput="${domainOutputDir}/weblogic-domain-pv.yaml"
+  domainPVCOutput="${domainOutputDir}/weblogic-domain-pvc.yaml"
   jobOutput="${domainOutputDir}/create-weblogic-domain-job.yaml"
   dcrOutput="${domainOutputDir}/domain-custom-resource.yaml"
   traefikSecurityOutput="${domainOutputDir}/weblogic-domain-traefik-security-${clusterNameLC}.yaml"
diff --git a/kubernetes/internal/weblogic-domain-pv-template.yaml b/kubernetes/internal/weblogic-domain-pv-template.yaml
diff --git a/kubernetes/internal/weblogic-domain-pvc-template.yaml b/kubernetes/internal/weblogic-domain-pvc-template.yaml
diff --git a/site/manually-creating-domain.md b/site/manually-creating-domain.md
@@ -27,8 +27,8 @@ Then, execute the script, pointing it at your inputs file and output directory:
 
 The following YAML files will be generated in the /path/to/weblogic-operator-output-directory/weblogic-domains/<domainUID> directory:
 
-*	`weblogic-domain-persistent-volume.yaml` can be customized and used to create the persistent volume for this domain.
-*	`weblogic-domain-persistent-volume-claim.yaml` can be customized and used to create the persistent volume claim for this domain.
+*	`weblogic-domain-pv.yaml` can be customized and used to create the persistent volume for this domain.
+*	`weblogic-domain-pvc.yaml` can be customized and used to create the persistent volume claim for this domain.
 *	`create-weblogic-domain-job.yaml` can be ignored when creating the domain manually.
 *	`domain-custom-resource.yaml` can be customized and used to create the domain custom resource.
 
@@ -43,7 +43,7 @@ The persistent volume will be mounted as `/shared` within every container that i
 *	`/shared/logs` contains log directories
 *	`/shared/stores` contains persistent stores
 
-The file `weblogic-domain-persistent-volume.yaml` contains a template to create a persistent volume. The customizable items are listed below:
+The file `weblogic-domain-pv.yaml` contains a template to create a persistent volume. The customizable items are listed below:
 
 *	Persistent volume name
 *	Storage class name
@@ -57,7 +57,7 @@ The file `weblogic-domain-persistent-volume.yaml` contains a template to create
 To create the persistent volume issue the following command:
 
 ```
-kubectl create –f weblogic-domain-persistent-volume.yaml
+kubectl create –f weblogic-domain-pv.yaml
 ```
 
 To verify the persistent volume was created, use this command:
@@ -70,7 +70,7 @@ Replace `PV_NAME` with the name of the persistent volume.
 
 ## Preparing to create the persistent volume claim
 
-The file `weblogic-domain-persistent-volume-claim.yaml` contains a template to claim a portion of the persistent volume storage. The customizable items are listed below:
+The file `weblogic-domain-pvc.yaml` contains a template to claim a portion of the persistent volume storage. The customizable items are listed below:
 
 *	Persistent volume claim name
 *	Namespace name
@@ -83,7 +83,7 @@ The file `weblogic-domain-persistent-volume-claim.yaml` contains a template to c
 To create the persistent volume claim issue the following command:
 
 ```
-kubectl create –f weblogic-domain-persistent-volume-claim.yaml
+kubectl create –f weblogic-domain-pvc.yaml
 ```
 
 To verify the persistent volume was created, use this command:
diff --git a/site/name-changes.md b/site/name-changes.md
@@ -88,8 +88,8 @@ The names of several of the generated YAML files have changed.
 | --- | --- |
 | domain-custom-resource.yaml | same |
 | domain-job.yaml | create-weblogic-domain-job.yaml |
-| persistent-volume.yaml | weblogic-domain-persistent-volume.yaml |
-| persistent-volume-claim.yaml | weblogic-domain-persistent-volume-claim.yaml |
+| persistent-volume.yaml | weblogic-domain-pv.yaml |
+| persistent-volume-claim.yaml | weblogic-domain-pvc.yaml |
 | rbac.yaml | weblogic-operator-security.yaml |
 | traefik-deployment.yaml | weblogic-domain-traefik-${clusterName, lower case}.yaml |
 | traefik-rbac.yaml | weblogic-domain-traefik-security-${clusterName, lower case}.yaml |
diff --git a/src/test/java/oracle/kubernetes/operator/create/DomainFiles.java b/src/test/java/oracle/kubernetes/operator/create/DomainFiles.java
@@ -16,8 +16,8 @@ public class DomainFiles {
   private static final String CREATE_WEBLOGIC_DOMAIN_INPUTS_YAML = "create-weblogic-domain-inputs.yaml";
   private static final String DOMAIN_CUSTOM_RESOURCE_YAML = "domain-custom-resource.yaml";
   private static final String CREATE_WEBLOGIC_DOMAIN_JOB_YAML = "create-weblogic-domain-job.yaml";
-  private static final String WEBLOGIC_DOMAIN_PERSISTENT_VOLUME_YAML = "weblogic-domain-persistent-volume.yaml";
-  private static final String WEBLOGIC_DOMAIN_PERSISTENT_VOLUME_CLAIM_YAML = "weblogic-domain-persistent-volume-claim.yaml";
+  private static final String WEBLOGIC_DOMAIN_PERSISTENT_VOLUME_YAML = "weblogic-domain-pv.yaml";
+  private static final String WEBLOGIC_DOMAIN_PERSISTENT_VOLUME_CLAIM_YAML = "weblogic-domain-pvc.yaml";
 
   private Path userProjectsPath;
   private CreateDomainInputs inputs;
diff --git a/src/test/java/oracle/kubernetes/operator/create/ParsedWeblogicDomainPersistentVolumeClaimYaml.java b/src/test/java/oracle/kubernetes/operator/create/ParsedWeblogicDomainPersistentVolumeClaimYaml.java
@@ -8,7 +8,7 @@
 import io.kubernetes.client.models.V1PersistentVolumeClaim;
 
 /**
- * Parses a generated weblogic-domain-persistent-volume-claim.yaml file into a set of typed k8s java objects
+ * Parses a generated weblogic-domain-pvc.yaml file into a set of typed k8s java objects
  */
 public class ParsedWeblogicDomainPersistentVolumeClaimYaml extends ParsedKubernetesYaml {
 
diff --git a/src/test/java/oracle/kubernetes/operator/create/ParsedWeblogicDomainPersistentVolumeYaml.java b/src/test/java/oracle/kubernetes/operator/create/ParsedWeblogicDomainPersistentVolumeYaml.java
@@ -8,7 +8,7 @@
 import io.kubernetes.client.models.V1PersistentVolume;
 
 /**
- * Parses a generated weblogic-domain-persistent-volume.yaml file into a set of typed k8s java objects
+ * Parses a generated weblogic-domain-pv.yaml file into a set of typed k8s java objects
  */
 public class ParsedWeblogicDomainPersistentVolumeYaml extends ParsedKubernetesYaml {
 
diff --git a/src/test/java/oracle/kubernetes/operator/create/PodHelperConfigTest.java b/src/test/java/oracle/kubernetes/operator/create/PodHelperConfigTest.java
@@ -43,7 +43,7 @@ public class PodHelperConfigTest {
   private static final String WEBLOGIC_CREDENTIALS_SECRET_NAME = "test-weblogic-credentials-secret-name";
   private static final int ADMIN_SERVER_PORT = 7654;
   private static final int MANAGED_SERVER_PORT = 4567;
-  private static final String WEBLOGIC_DOMAIN_PERSISTENT_VOLUME_CLAIM_NAME = "test-weblogic-domain-persistent-volume-claim-name";
+  private static final String WEBLOGIC_DOMAIN_PERSISTENT_VOLUME_CLAIM_NAME = "test-weblogic-domain-pvc-name";
   private static final String INTERNAL_OPERATOR_CERT_FILE = "test-internal-operator-cert-file";
   private static final String CUSTOM_LATEST_IMAGE = "custom-image:latest";
   private static final String ADMIN_OPTION1_NAME = "AdminOption1Name";
