Merge branch 'develop' of https://github.com/oracle/weblogic-kubernetes-operator into develop

Author: rjeberhard

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

@@ -203,7 +203,12 @@ protected V1ServiceSpec createServiceSpec() {
 
     @Override
     protected V1ObjectMeta createMetadata() {
-      return super.createMetadata().putLabelsItem(LabelConstants.SERVERNAME_LABEL, getServerName());
+      V1ObjectMeta metadata =
+          super.createMetadata().putLabelsItem(LabelConstants.SERVERNAME_LABEL, getServerName());
+      if (getClusterName() != null) {
+        metadata.putLabelsItem(LabelConstants.CLUSTERNAME_LABEL, getClusterName());
+      }
+      return metadata;
     }
 
     @Override

operator/src/test/java/oracle/kubernetes/operator/helpers/ServiceHelperTest.java

@@ -543,6 +543,7 @@ private V1Service createServerService(V1ServiceSpec serviceSpec) {
                 .putLabelsItem(RESOURCE_VERSION_LABEL, VersionConstants.DOMAIN_V2)
                 .putLabelsItem(DOMAINUID_LABEL, UID)
                 .putLabelsItem(DOMAINNAME_LABEL, DOMAIN_NAME)
+                .putLabelsItem(CLUSTERNAME_LABEL, TEST_CLUSTER)
                 .putLabelsItem(SERVERNAME_LABEL, TEST_SERVER_NAME)
                 .putLabelsItem(CREATEDBYOPERATOR_LABEL, "true"));
   }