OWLS-70886

Author: rjeberhard

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/Cluster.java

@@ -127,6 +127,14 @@ void setMaxUnavailable(Integer maxUnavailable) {
     this.maxUnavailable = maxUnavailable;
   }
 
+  void fillInFrom(Cluster other) {
+    if (other == null) {
+      return;
+    }
+    super.fillInFrom(other);
+    clusterService.fillInFrom(other.clusterService);
+  }
+
   @Override
   public String toString() {
     return new ToStringBuilder(this)

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainV2Configurator.java

@@ -451,13 +451,13 @@ public ClusterConfigurator withPodAnnotation(String name, String value) {
 
     @Override
     public ClusterConfigurator withServiceLabel(String name, String value) {
-      cluster.addServiceLabel(name, value);
+      cluster.addClusterLabel(name, value);
       return this;
     }
 
     @Override
     public ClusterConfigurator withServiceAnnotation(String name, String value) {
-      cluster.addServiceAnnotation(name, value);
+      cluster.addClusterAnnotation(name, value);
       return this;
     }
 

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

@@ -218,12 +218,12 @@ ServerSpec getServerSpec() {
 
     @Override
     protected Map<String, String> getServiceLabels() {
-      return getServerSpec().getPodLabels();
+      return getServerSpec().getServiceLabels();
     }
 
     @Override
     protected Map<String, String> getServiceAnnotations() {
-      return getServerSpec().getPodAnnotations();
+      return getServerSpec().getServiceAnnotations();
     }
 
     String getServerName() {
@@ -734,23 +734,34 @@ Map<String, String> getServiceAnnotations() {
   }
 
   private static boolean validateCurrentService(V1Service build, V1Service current) {
-    V1ServiceSpec buildSpec = build.getSpec();
-    V1ServiceSpec currentSpec = current.getSpec();
+    return isCurrentServiceMetadataValid(build.getMetadata(), current.getMetadata())
+        && isCurrentServiceSpecValid(build.getSpec(), current.getSpec());
+  }
 
-    if (!VersionHelper.matchesResourceVersion(
-        current.getMetadata(), VersionConstants.DEFAULT_DOMAIN_VERSION)) {
-      return false;
-    }
+  private static boolean isCurrentServiceMetadataValid(
+      V1ObjectMeta buildMeta, V1ObjectMeta currentMeta) {
+    return VersionHelper.matchesResourceVersion(
+            currentMeta, VersionConstants.DEFAULT_DOMAIN_VERSION)
+        && KubernetesUtils.areLabelsValid(buildMeta, currentMeta)
+        && KubernetesUtils.areAnnotationsValid(buildMeta, currentMeta);
+  }
 
+  private static boolean isCurrentServiceSpecValid(
+      V1ServiceSpec buildSpec, V1ServiceSpec currentSpec) {
     String buildType = buildSpec.getType();
     String currentType = currentSpec.getType();
+
     if (currentType == null) {
       currentType = "ClusterIP";
     }
     if (!currentType.equals(buildType)) {
       return false;
     }
 
+    if (!KubernetesUtils.mapEquals(buildSpec.getSelector(), currentSpec.getSelector())) {
+      return false;
+    }
+
     List<V1ServicePort> buildPorts = buildSpec.getPorts();
     List<V1ServicePort> currentPorts = currentSpec.getPorts();