Checkpoint k8s artifact renaming work

Author: moreaut

kubernetes/internal/create-weblogic-domain-job-template.yaml

@@ -526,7 +526,7 @@ spec:
             - containerPort: 7001
           volumeMounts:
           - mountPath: /u01/weblogic
-            name: config-map-scripts
+            name: create-weblogic-domain-job-cm-volume
           - mountPath: /shared
             name: pv-storage
           - mountPath: /weblogic-operator/secrets
@@ -537,7 +537,7 @@ spec:
             - name: SHARED_PATH
               value: "/shared"
       volumes:
-        - name: config-map-scripts
+        - name: create-weblogic-domain-job-cm-volume
           configMap:
             name: %DOMAIN_UID%-create-weblogic-domain-job-cm
         - name: pv-storage

kubernetes/internal/weblogic-operator-template.yaml

@@ -73,9 +73,9 @@ spec:
         %REMOTE_DEBUG_NODE_PORT_PREFIX%- name: REMOTE_DEBUG_PORT
         %REMOTE_DEBUG_NODE_PORT_PREFIX%  value: "%INTERNAL_DEBUG_HTTP_PORT%"
         volumeMounts:
-        - name: operator-config-volume
+        - name: weblogic-operator-cm-volume
           mountPath: /operator/config
-        - name: operator-secrets-volume
+        - name: weblogic-operator-secrets-volume
           mountPath: /operator/secrets
           readOnly: true
         # uncomment this mount if using the ELK integration:
@@ -102,10 +102,10 @@ spec:
       %ELK_INTEGRATION_PREFIX%  - name: ELASTICSEARCH_PORT
       %ELK_INTEGRATION_PREFIX%    value: "9200"
       volumes:
-      - name: operator-config-volume
+      - name: weblogic-operator-cm-volume
         configMap:
           name: weblogic-operator-cm
-      - name: operator-secrets-volume
+      - name: weblogic-operator-secrets-volume
         secret:
           secretName: weblogic-operator-secrets
       # Uncomment this volume if using ELK integration:

site/creating-domain.md

@@ -210,7 +210,7 @@ spec:
             - containerPort: 7001
           volumeMounts:
           - mountPath: /u01/weblogic
-            name: config-map-scripts
+            name: create-weblogic-domain-job-cm-volume
           - mountPath: /shared
             name: pv-storage
           - mountPath: /var/run/secrets-domain1
@@ -221,7 +221,7 @@ spec:
             - name: SHARED_PATH
               value: "/shared"
       volumes:
-        - name: config-map-scripts
+        - name: create-weblogic-domain-job-cm-volume
           configMap:
             name: domain1-create-weblogic-domain-job-cm
         - name: pv-storage

site/installation.md

@@ -198,9 +198,9 @@ The spec section provides details for the container that the operator will execu
         - name: JAVA_LOGGING_LEVEL
           value: "INFO"
         volumeMounts:
-        - name: operator-config-volume
+        - name: weblogic-operator-cm-volume
           mountPath: /operator/config
-        - name: operator-secrets-volume
+        - name: weblogic-operator-secrets-volume
           mountPath: /operator/secrets
           readOnly: true
         # uncomment this mount if using the ELK integration:
@@ -214,10 +214,10 @@ The spec section provides details for the container that the operator will execu
           initialDelaySeconds: 120
           periodSeconds: 5
       volumes:
-      - name: operator-config-volume
+      - name: weblogic-operator-cm-volume
         configMap:
           name: weblogic-operator-cm
-      - name: operator-secrets-volume
+      - name: weblogic-operator-secrets-volume
         secret:
           weblogicCredentialsSecretName: weblogic-operator-secrets
       # Uncomment this volume if using ELK integration:

site/name-changes.md

@@ -177,9 +177,9 @@ The following input properties, which used to have default values, now must be u
 | port | rest-https | rest |
 | service | external-weblogic-operator-service | external-weblogic-operator-srv |
 | service | internal-weblogic-operator-service | internal-weblogic-operator-srv |
-| n volume & mount | operator-config-volume | weblogic-operator-cm-volume |
-| n volume & mount | operator-secrets-volume | weblogic-operator-secrets-volume |
-| n volume & mount | config-map-scripts | create-weblogic-domain-job-cm-volume |
+| volume & mount | operator-config-volume | weblogic-operator-cm-volume |
+| volume & mount | operator-secrets-volume | weblogic-operator-secrets-volume |
+| volume & mount | config-map-scripts | create-weblogic-domain-job-cm-volume |
 | n volume & mount | pv-storage | weblogic-domain-storage-volume |
 | n volume & mount | secrets | weblogic-credentials-volume |
 | n volume & mount | scripts | weblogic-domain-cm-volume |

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

@@ -170,7 +170,7 @@ protected V1Job getExpectedCreateWeblogicDomainJob() {
                 .addPortsItem(newContainerPort()
                   .containerPort(7001))
                 .addVolumeMountsItem(newVolumeMount()
-                  .name("config-map-scripts")
+                  .name("create-weblogic-domain-job-cm-volume")
                   .mountPath("/u01/weblogic"))
                 .addVolumeMountsItem(newVolumeMount()
                   .name("pv-storage")
@@ -179,7 +179,7 @@ protected V1Job getExpectedCreateWeblogicDomainJob() {
                   .name("secrets")
                   .mountPath("/weblogic-operator/secrets")))
               .addVolumesItem(newVolume()
-                .name("config-map-scripts")
+                .name("create-weblogic-domain-job-cm-volume")
                   .configMap(newConfigMapVolumeSource()
                     .name(getInputs().getDomainUID() + "-create-weblogic-domain-job-cm")))
               .addVolumesItem(newVolume()

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

@@ -165,10 +165,10 @@ protected ExtensionsV1beta1Deployment getExpectedWeblogicOperatorDeployment() {
                   .name("JAVA_LOGGING_LEVEL")
                   .value(getInputs().getJavaLoggingLevel()))
                 .addVolumeMountsItem(newVolumeMount()
-                  .name("operator-config-volume")
+                  .name("weblogic-operator-cm-volume")
                   .mountPath("/operator/config"))
                 .addVolumeMountsItem(newVolumeMount()
-                  .name("operator-secrets-volume")
+                  .name("weblogic-operator-secrets-volume")
                   .mountPath("/operator/secrets")
                   .readOnly(true))
                 .livenessProbe(newProbe()
@@ -178,11 +178,11 @@ protected ExtensionsV1beta1Deployment getExpectedWeblogicOperatorDeployment() {
                     .addCommandItem("bash")
                     .addCommandItem("/operator/livenessProbe.sh"))))
               .addVolumesItem(newVolume()
-                .name("operator-config-volume")
+                .name("weblogic-operator-cm-volume")
                   .configMap(newConfigMapVolumeSource()
                     .name("weblogic-operator-cm")))
               .addVolumesItem(newVolume()
-                .name("operator-secrets-volume")
+                .name("weblogic-operator-secrets-volume")
                   .secret(newSecretVolumeSource()
                     .secretName("weblogic-operator-secrets"))))));
   }