Merge pull request #247 from oracle/feature-version-fix

Fix a bug where we were checking against the wrong version string whe…

Author: rjeberhard

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

@@ -99,7 +99,7 @@ public NextAction onSuccess(Packet packet, V1ConfigMap result, int statusCode,
               }
             });
             return doNext(create, packet);
-          } else if (VersionHelper.matchesResourceVersion(result.getMetadata(), LabelConstants.RESOURCE_VERSION_LABEL) &&
+          } else if (VersionHelper.matchesResourceVersion(result.getMetadata(), VersionConstants.DOMAIN_V1) &&
                      result.getData().entrySet().containsAll(cm.getData().entrySet())) {
             // existing config map has correct data
             LOGGER.fine(MessageKeys.CM_EXISTS, domainNamespace);

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

@@ -407,7 +407,7 @@ private static boolean validateCurrentPod(V1Pod build, V1Pod current) {
     // returns fields, such as nodeName, even when export=true is specified.
     // Therefore, we'll just compare specific fields
 
-    if (!VersionHelper.matchesResourceVersion(current.getMetadata(), LabelConstants.RESOURCE_VERSION_LABEL)) {
+    if (!VersionHelper.matchesResourceVersion(current.getMetadata(), VersionConstants.DOMAIN_V1)) {
       return false;
     }
 

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

@@ -368,7 +368,7 @@ private static boolean validateCurrentService(V1Service build, V1Service current
     V1ServiceSpec buildSpec = build.getSpec();
     V1ServiceSpec currentSpec = current.getSpec();
 
-    if (!VersionHelper.matchesResourceVersion(current.getMetadata(), LabelConstants.RESOURCE_VERSION_LABEL)) {
+    if (!VersionHelper.matchesResourceVersion(current.getMetadata(), VersionConstants.DOMAIN_V1)) {
       return false;
     }