Checkpoint k8s artifact renaming work

Author: moreaut

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

@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: domain-%DOMAIN_UID%-scripts
+  name: %DOMAIN_UID%-create-weblogic-domain-job-config-map
   namespace: %NAMESPACE%
   labels:
     weblogic.domainUID: %DOMAIN_UID%
@@ -508,13 +508,13 @@ data:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: domain-%DOMAIN_UID%-job
+  name: %DOMAIN_UID%-create-weblogic-domain-job
   namespace: %NAMESPACE%
 spec:
   template:
     metadata:
       labels:
-        app: domain-%DOMAIN_UID%-job
+        app: %DOMAIN_UID%-create-weblogic-domain-job
         weblogic.domainUID: %DOMAIN_UID%
     spec:
       restartPolicy: Never
@@ -539,7 +539,7 @@ spec:
       volumes:
         - name: config-map-scripts
           configMap:
-            name: domain-%DOMAIN_UID%-scripts
+            name: %DOMAIN_UID%-create-weblogic-domain-job-config-map
         - name: pv-storage
           persistentVolumeClaim:
             claimName: %DOMAIN_UID%-weblogic-domain-pvc

kubernetes/internal/traefik-template.yaml

@@ -33,7 +33,7 @@ spec:
       terminationGracePeriodSeconds: 60
       containers:
       - image: traefik:1.4.5
-        name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
+        name: traefik
         resources:
           requests:
             cpu: "100m"
@@ -72,12 +72,12 @@ spec:
       volumes:
       - name: config
         configMap:
-          name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
+          name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik-config-map
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
+  name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik-config-map
   namespace: %NAMESPACE%
   labels:
     app: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik

kubernetes/internal/weblogic-operator-template.yaml

@@ -11,7 +11,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: operator-config-map
+  name: weblogic-operator-config-map
   namespace: %NAMESPACE%
 data:
   serviceaccount: %ACCOUNT_NAME%
@@ -23,7 +23,7 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: operator-secrets
+  name: weblogic-operator-secrets
   namespace: %NAMESPACE%
 type: Opaque
 data:
@@ -104,10 +104,10 @@ spec:
       volumes:
       - name: operator-config-volume
         configMap:
-          name: operator-config-map
+          name: weblogic-operator-config-map
       - name: operator-secrets-volume
         secret:
-          secretName: operator-secrets
+          secretName: weblogic-operator-secrets
       # Uncomment this volume if using ELK integration:
       %ELK_INTEGRATION_PREFIX%- name: log-dir
       %ELK_INTEGRATION_PREFIX%  emptyDir:
@@ -128,7 +128,7 @@ spec:
 %EXTERNAL_OPERATOR_SERVICE_PREFIX%  ports:
 %EXTERNAL_OPERATOR_SERVICE_PREFIX%    %EXTERNAL_REST_NODE_PORT_PREFIX%- port: 8081
 %EXTERNAL_OPERATOR_SERVICE_PREFIX%    %EXTERNAL_REST_NODE_PORT_PREFIX%  nodePort: %EXTERNAL_REST_HTTPS_PORT%
-%EXTERNAL_OPERATOR_SERVICE_PREFIX%    %EXTERNAL_REST_NODE_PORT_PREFIX%  name: rest-https
+%EXTERNAL_OPERATOR_SERVICE_PREFIX%    %EXTERNAL_REST_NODE_PORT_PREFIX%  name: rest
 %EXTERNAL_OPERATOR_SERVICE_PREFIX%    #### uncomment this port if you enable remote debugging, and make sure the value matches
 %EXTERNAL_OPERATOR_SERVICE_PREFIX%    #### the one you defined above
 %EXTERNAL_OPERATOR_SERVICE_PREFIX%    %REMOTE_DEBUG_NODE_PORT_PREFIX%- port: %INTERNAL_DEBUG_HTTP_PORT%
@@ -147,5 +147,5 @@ spec:
     app: weblogic-operator
   ports:
     - port: 8082
-      name: rest-https
+      name: rest
 

site/creating-domain.md

@@ -192,13 +192,13 @@ Here is the first part of that YAML file:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: domain-domain1-job
+  name: domain1-create-weblogic-domain-job
   namespace: domain1
 spec:
   template:
     metadata:
       labels:
-        app: domain-domain1-job
+        app: domain1-create-weblogic-domain-job
         weblogic.domainUID: domain1
     spec:
       restartPolicy: Never
@@ -223,7 +223,7 @@ spec:
       volumes:
         - name: config-map-scripts
           configMap:
-            name: domain-domain1-scripts
+            name: domain1-create-weblogic-domain-job-config-map
         - name: pv-storage
           persistentVolumeClaim:
             claimName: domain1-pv001-claim

site/installation.md

@@ -216,10 +216,10 @@ The spec section provides details for the container that the operator will execu
       volumes:
       - name: operator-config-volume
         configMap:
-          name: operator-config-map
+          name: weblogic-operator-config-map
       - name: operator-secrets-volume
         secret:
-          weblogicCredentialsSecretName: operator-secrets
+          weblogicCredentialsSecretName: weblogic-operator-secrets
       # Uncomment this volume if using ELK integration:
       # - name: log-dir
       #   emptyDir:
@@ -248,7 +248,7 @@ spec:
   ports:
     - port: 8081
       nodePort: 31001
-      name: rest-https
+      name: rest
     # - port: 30999
     #   nodePort: 30999
     #   name: debug
@@ -269,7 +269,7 @@ spec:
     app: weblogic-operator
   ports:
     - port: 8082
-      name: rest-https
+      name: rest
 ```
 
 This section creates a ConfigMap that passes configuration information to the operator including the list of namespaces in which the operator will manage domains, the service account that the operator will use to authenticate to the Kubernetes API server, and the certificates that the operator’s REST server will use.
@@ -279,7 +279,7 @@ This section creates a ConfigMap that passes configuration information to the op
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: operator-config-map
+  name: weblogic-operator-config-map
   namespace: weblogic-operator
 data:
   serviceaccount: weblogic-operator
@@ -295,7 +295,7 @@ This section defines a secret that contains the keys needed by the operator for
 apiVersion: v1
 kind: Secret
 metadata:
-  name: operator-secrets
+  name: weblogic-operator-secrets
   namespace: weblogic-operator
 type: Opaque
 data:

site/name-changes.md

@@ -160,11 +160,44 @@ The following input properties, which used to have default values, now must be u
 | persistenceType | weblogicDomainStorageType | nfs | NFS |
 
 ## Kubernetes Artifact Names
-The input properties for controlling the domain's persistent volume, persistent volume claim and storage class names have been removed.  These names are now derived from the domain uid.
 
 | Artifact Type | Previous Name | New Name |
 | --- | --- | --- |
 | persistent volume | ${domainUid}-${persistenceVolume} or ${persistenceVolume} | ${domainUID}-weblogic-domain-pv |
 | persistent volume claim | ${domainUid}-${persistenceVolumeClaim} or ${persistenceVolumeClaim} | ${domainUID}-weblogic-domain-pvc |
 | storage class name | ${domainUid} or ${persistenceStorageClass} | ${domainUID-weblogic-domain-storage-class |
+| job | domain-${domainUid}-job | ${domainUID}-create-weblogic-domain-job |
+| container | ${d.domainUID}-${d.clusterName, lower case}-traefik | traefik |
+| config map | operator-config-map | weblogic-operator-config-map |
+| config map | ${domainUid}-${clusterName, lower case}-traefik | ${domainUID}-${clusterName, lower case}-traefik-config-map |
+| config map |  domain-${domainUid}-scripts | ${domainUID}-create-weblogic-domain-job-config-map |
+| secret | operator-secrets | weblogic-operator-secrets |
+| port | rest-https | rest |
+| n volume | operator-config-volume | weblogic-operator-config-map-volume |
+| n volume | operator-secrets-volume | weblogic-operator-secrets-volume |
+| n volume | config-map-scripts | create-weblogic-domain-job-config-map-volume |
+| n volume | pv-storage | weblogic-domain-storage-volume |
+| n volume | secrets | weblogic-credentials-volume |
+| n volume | scripts | weblogic-domain-config-map-volume |
+
+Temp note: weblogic-domain-config-map is created on the fly by ConfigMapHelper.java.  It's referenced by weblogic-domain-config-map-volume.
+
+TBD - we're appending type to:
+  - config maps
+  - secrets
+  - pvs (global)
+  - pvcs
+  - storage classes
+  - jobs
+but not to:
+  - namespaces (global)
+  - deployments
+  - pods
+  - services
+  - service accounts
+  - ports
+  - maybe volumes
+  - maybe volume mounts
+
+Note: The input properties for controlling the domain's persistent volume, persistent volume claim and storage class names have been removed.  These names are now derived from the domain uid.
 

site/rest.md

@@ -18,7 +18,7 @@ Here is a small BASH script that may help to prepare the necessary token, certif
 KUBERNETES_SERVER=$1
 URL_TAIL=$2
 
-REST_PORT=`kubectl get services -n weblogic-operator -o jsonpath='{.items[?(@.metadata.name == "external-weblogic-operator-service")].spec.ports[?(@.name == "rest-https")].nodePort}'`
+REST_PORT=`kubectl get services -n weblogic-operator -o jsonpath='{.items[?(@.metadata.name == "external-weblogic-operator-service")].spec.ports[?(@.name == "rest")].nodePort}'`
 REST_ADDR="https://${KUBERNETES_SERVER}:${REST_PORT}"
 SECRET=`kubectl get serviceaccount weblogic-operator -n weblogic-operator -o jsonpath='{.secrets[0].name}'`
 ENCODED_TOKEN=`kubectl get secret ${SECRET} -n weblogic-operator -o jsonpath='{.data.token}'`

src/integration-tests/bash/cleanup.sh

@@ -194,7 +194,7 @@ function orderlyDelete {
     sleep 3
 
     echo @@ Deleting create domain ${curdomain} job in namespace $curns
-    kubectl -n $curns delete job domain-${curdomain}-job --ignore-not-found
+    kubectl -n $curns delete job ${curdomain}-create-weblogic-domain-job --ignore-not-found
 
     echo @@ Deleting domain pv and pvc for domain ${curdomain} in namespace $curns
     kubectl delete pv ${curdomain}-weblogic-domain-pv --ignore-not-found
@@ -207,8 +207,8 @@ function orderlyDelete {
     kubectlDeleteF "${USER_PROJECTS_DIR}/weblogic-domains/${curdomain}/traefik.yaml" 
     kubectlDeleteF "${USER_PROJECTS_DIR}/weblogic-domains/${curdomain}/traefik-security.yaml"
 
-    echo @@ Deleting configmap domain-${curdomain}-scripts in namespace $curns
-    kubectl -n $curns delete cm domain-${curdomain}-scripts  --ignore-not-found
+    echo @@ Deleting configmap ${curdomain}-create-weblogic-domain-job-config-map in namespace $curns
+    kubectl -n $curns delete cm ${curdomain}-create-weblogic-domain-job-config-map  --ignore-not-found
 
     kubectl -n $curns delete deploy ${curdomain}-cluster-1-traefik --ignore-not-found=true
     kubectl -n $curns delete service ${curdomain}-cluster-1-traefik --ignore-not-found=true

src/main/scripts/scaling/scalingAction.sh

@@ -111,7 +111,7 @@ fi
 cat > cmds.py << INPUT
 import sys, json
 for i in json.load(sys.stdin)["spec"]["ports"]:
-  if i["name"] == "rest-https":
+  if i["name"] == "rest":
     print(i["port"])
 INPUT
 port=`echo ${STATUS} | python cmds.py`

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

@@ -149,12 +149,12 @@ protected V1Job getExpectedCreateWeblogicDomainJob() {
     return
       newJob()
         .metadata(newObjectMeta()
-          .name("domain-" + getInputs().getDomainUID() + "-job")
+          .name(getInputs().getDomainUID() + "-create-weblogic-domain-job")
           .namespace(getInputs().getNamespace()))
         .spec(newJobSpec()
           .template(newPodTemplateSpec()
             .metadata(newObjectMeta()
-              .putLabelsItem("app", "domain-" + getInputs().getDomainUID() + "-job")
+              .putLabelsItem("app", getInputs().getDomainUID() + "-create-weblogic-domain-job")
               .putLabelsItem("weblogic.domainUID", getInputs().getDomainUID()))
             .spec(newPodSpec()
               .restartPolicy("Never")
@@ -181,7 +181,7 @@ protected V1Job getExpectedCreateWeblogicDomainJob() {
               .addVolumesItem(newVolume()
                 .name("config-map-scripts")
                   .configMap(newConfigMapVolumeSource()
-                    .name("domain-" + getInputs().getDomainUID() + "-scripts")))
+                    .name(getInputs().getDomainUID() + "-create-weblogic-domain-job-config-map")))
               .addVolumesItem(newVolume()
                 .name("pv-storage")
                 .persistentVolumeClaim(newPersistentVolumeClaimVolumeSource()
@@ -231,7 +231,7 @@ protected V1ConfigMap getExpectedCreateWeblogicDomainJobConfigMap() {
     return
       newConfigMap()
         .metadata(newObjectMeta()
-          .name("domain-" + getInputs().getDomainUID() + "-scripts")
+          .name(getInputs().getDomainUID() + "-create-weblogic-domain-job-config-map")
           .namespace(getInputs().getNamespace())
           .putLabelsItem("weblogic.domainUID", getInputs().getDomainUID()))
         .putDataItem(PROPERTY_UTILITY_SH, "")
@@ -447,7 +447,7 @@ protected ExtensionsV1beta1Deployment getExpectedTraefikDeployment() {
               .serviceAccountName(getTraefikScope())
               .terminationGracePeriodSeconds(60L)
               .addContainersItem(newContainer()
-                .name(getTraefikScope())
+                .name("traefik")
                 .image("traefik:1.4.5")
                 .resources(newResourceRequirements()
                   .putRequestsItem("cpu", Quantity.fromString("100m"))
@@ -485,7 +485,7 @@ protected ExtensionsV1beta1Deployment getExpectedTraefikDeployment() {
               .addVolumesItem(newVolume()
                 .name("config")
                   .configMap(newConfigMapVolumeSource()
-                    .name(getTraefikScope()))))));
+                    .name(getTraefikScope() + "-config-map"))))));
   }
 
   @Test
@@ -513,7 +513,7 @@ protected V1ConfigMap getExpectedTraefikConfigMap() {
     return
       newConfigMap()
         .metadata(newObjectMeta()
-          .name(getTraefikScope())
+          .name(getTraefikScope() + "-config-map")
           .namespace(getInputs().getNamespace())
           .putLabelsItem("weblogic.domainUID", getInputs().getDomainUID())
           .putLabelsItem("weblogic.clusterName", getClusterNameLC())