Checkpoint k8s artifact renaming work

Author: moreaut

README.md

@@ -182,8 +182,8 @@ To remove the operator from a Kubernetes cluster, issue the following commands:
 
 ```
 kubectl delete deploy weblogic-operator –n NAMESPACE
-kubectl delete service external-weblogic-operator-service –n NAMESPACE
-kubectl delete service internal-weblogic-operator-service –n NAMESPACE
+kubectl delete service external-weblogic-operator-svc –n NAMESPACE
+kubectl delete service internal-weblogic-operator-svc –n NAMESPACE
 ```
 
 Replace `NAMESPACE` with the namespace that the operator is running in.

kubernetes/internal/create-weblogic-operator.sh

@@ -306,7 +306,7 @@ dirname "${script}"
   generatedKeyFile="${generatedCertDir}/weblogic-operator.key.pem"
 
   # Always generate a self-signed cert for the internal operator REST port
-  internal_host="internal-weblogic-operator-service"
+  internal_host="internal-weblogic-operator-svc"
   internal_sans="DNS:${internal_host},DNS:${internal_host}.${namespace},DNS:${internal_host}.${namespace}.svc,DNS:${internal_host}.${namespace}.svc.cluster.local"
   echo "Generating a self-signed certificate for the operator's internal https port with the subject alternative names ${internal_sans}"
   ${genOprCertScript} ${internal_sans}

kubernetes/internal/weblogic-operator-template.yaml

@@ -119,7 +119,7 @@ spec:
 %EXTERNAL_OPERATOR_SERVICE_PREFIX%apiVersion: v1
 %EXTERNAL_OPERATOR_SERVICE_PREFIX%kind: Service
 %EXTERNAL_OPERATOR_SERVICE_PREFIX%metadata:
-%EXTERNAL_OPERATOR_SERVICE_PREFIX%  name: external-weblogic-operator-service
+%EXTERNAL_OPERATOR_SERVICE_PREFIX%  name: external-weblogic-operator-svc
 %EXTERNAL_OPERATOR_SERVICE_PREFIX%  namespace: %NAMESPACE%
 %EXTERNAL_OPERATOR_SERVICE_PREFIX%spec:
 %EXTERNAL_OPERATOR_SERVICE_PREFIX%  type: NodePort
@@ -139,7 +139,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: internal-weblogic-operator-service
+  name: internal-weblogic-operator-svc
   namespace: %NAMESPACE%
 spec:
   type: ClusterIP

site/installation.md

@@ -239,7 +239,7 @@ This section defines the external service that provides access to the operator t
 apiVersion: v1
 kind: Service
 metadata:
-  name: external-weblogic-operator-service
+  name: external-weblogic-operator-svc
   namespace: weblogic-operator
 spec:
   type: NodePort
@@ -261,7 +261,7 @@ This section defines a service that provides access to the operator’s REST ser
 apiVersion: v1
 kind: Service
 metadata:
-  name: internal-weblogic-operator-service
+  name: internal-weblogic-operator-svc
   namespace: weblogic-operator
 spec:
   type: ClusterIP

site/name-changes.md

@@ -175,6 +175,8 @@ The following input properties, which used to have default values, now must be u
 | config map | weblogic-domain-config-map | weblogic-domain-cm |
 | secret | operator-secrets | weblogic-operator-secrets |
 | 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 |

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")].nodePort}'`
+REST_PORT=`kubectl get services -n weblogic-operator -o jsonpath='{.items[?(@.metadata.name == "external-weblogic-operator-svc")].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/run.sh

@@ -1311,14 +1311,14 @@ function call_operator_rest {
 
     trace "Checking REST service is running"
     set +x
-    local REST_SERVICE="`kubectl get services -n $OPERATOR_NS -o jsonpath='{.items[?(@.metadata.name == "external-weblogic-operator-service")]}'`"
+    local REST_SERVICE="`kubectl get services -n $OPERATOR_NS -o jsonpath='{.items[?(@.metadata.name == "external-weblogic-operator-svc")]}'`"
     set -x
     if [ -z "$REST_SERVICE" ]; then
         fail 'operator rest service was not created'
     fi
 
     set +x
-    local REST_PORT="`kubectl get services -n $OPERATOR_NS -o jsonpath='{.items[?(@.metadata.name == "external-weblogic-operator-service")].spec.ports[?(@.name == "rest-https")].nodePort}'`"
+    local REST_PORT="`kubectl get services -n $OPERATOR_NS -o jsonpath='{.items[?(@.metadata.name == "external-weblogic-operator-svc")].spec.ports[?(@.name == "rest-https")].nodePort}'`"
     set -x
     local REST_ADDR="https://${NODEPORT_HOST}:${REST_PORT}"
     local SECRET="`kubectl get serviceaccount weblogic-operator -n $OPERATOR_NS -o jsonpath='{.secrets[0].name}'`"
@@ -2178,7 +2178,7 @@ function shutdown_operator {
     kubectl delete -f $TMP_DIR/weblogic-operator.yaml
     trace "Checking REST service is deleted"
     set +x
-    local servicenum=`kubectl get services -n $OPERATOR_NS | egrep weblogic-operator-service | wc -l`
+    local servicenum=`kubectl get services -n $OPERATOR_NS | egrep weblogic-operator-svc | wc -l`
     set -x
     trace "servicenum=$servicenum"
     if [ "$servicenum" != "0" ]; then
@@ -2233,7 +2233,7 @@ function startup_operator {
 
     trace "Checking REST service is running"
     set +x
-    local REST_SERVICE=`kubectl get services -n ${namespace} -o jsonpath='{.items[?(@.metadata.name == "external-weblogic-operator-service")]}'`
+    local REST_SERVICE=`kubectl get services -n ${namespace} -o jsonpath='{.items[?(@.metadata.name == "external-weblogic-operator-svc")]}'`
     set -x
     if [ -z "$REST_SERVICE" ]; then
         fail 'operator rest service was not created'

src/main/java/oracle/kubernetes/operator/helpers/PodHelper.java

@@ -286,7 +286,7 @@ protected V1Pod computeAdminPodConfig(Packet packet) {
         }
       }
 
-      // Add internal-weblogic-operator-service certificate to Admin Server pod
+      // Add internal-weblogic-operator-svc certificate to Admin Server pod
       String internalOperatorCert = getInternalOperatorCertFile(packet);
       addEnvVar(container, INTERNAL_OPERATOR_CERT_ENV, internalOperatorCert);
 

src/main/scripts/scaling/scalingAction.sh

@@ -9,7 +9,7 @@ scaling_action=""
 wls_domain_uid=""
 wls_cluster_name=""
 wls_domain_namespace="default"
-operator_service_name="internal-weblogic-operator-service"
+operator_service_name="internal-weblogic-operator-svc"
 operator_namespace="weblogic-operator"
 operator_service_account="weblogic-operator"
 scaling_size=1
@@ -77,7 +77,7 @@ then
     echo "    kubernetes_master - Kubernetes master URL, default=https://kubernetes"
     echo "    access_token - Service Account Bearer token for authentication and authorization for access to REST Resources"
     echo "    wls_domain_namespace - Kubernetes name space WebLogic Domain is defined in, default=default"
-    echo "    operator_service_name - WebLogic Operator Service name, default=internal-weblogic-operator-service"
+    echo "    operator_service_name - WebLogic Operator Service name, default=internal-weblogic-operator-svc"
     echo "    operator_service_account - Kubernetes Service Account for WebLogic Operator, default=weblogic-operator"
     echo "    operator_namespace - WebLogic Operator Namespace, default=weblogic-operator"
     echo "    scaling_size - number of WebLogic server instances by which to scale up or down, default=1"

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

@@ -226,7 +226,7 @@ protected V1Service getExpectedExternalWeblogicOperatorService(boolean debugging
     }
     return newService()
       .metadata(newObjectMeta()
-        .name("external-weblogic-operator-service")
+        .name("external-weblogic-operator-svc")
         .namespace(getInputs().getNamespace()))
       .spec(spec);
   }
@@ -246,7 +246,7 @@ protected V1Service getExpectedInternalWeblogicOperatorService() {
     return
       newService()
         .metadata(newObjectMeta()
-          .name("internal-weblogic-operator-service")
+          .name("internal-weblogic-operator-svc")
           .namespace(getInputs().getNamespace()))
         .spec(newServiceSpec()
           .type("ClusterIP")
@@ -543,7 +543,7 @@ protected V1Service getExpectedExternalOperatorService(boolean debuggingEnabled,
     }
     return newService()
       .metadata(newObjectMeta()
-        .name("external-weblogic-operator-service")
+        .name("external-weblogic-operator-svc")
         .namespace(inputs.getNamespace()))
       .spec(spec);
   }