Review comments

Author: rjeberhard

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

@@ -191,7 +191,7 @@ public NextAction onSuccess(
           return doNext(createCRD(getNext()), packet);
         } else if (isOutdatedCRD(existingCRD)) {
           return doNext(updateCRD(getNext(), existingCRD), packet);
-        } else if (isExistingCRDMissingVersion(existingCRD)) {
+        } else if (!existingCRDContainsVersion(existingCRD)) {
           return doNext(updateExistingCRD(getNext(), existingCRD), packet);
         } else {
           return doNext(packet);
@@ -231,7 +231,7 @@ private boolean isOutdatedCRD(V1beta1CustomResourceDefinition existingCRD) {
       return COMPARATOR.isOutdatedCRD(existingCRD, this.model);
     }
 
-    private boolean isExistingCRDMissingVersion(V1beta1CustomResourceDefinition existingCRD) {
+    private boolean existingCRDContainsVersion(V1beta1CustomResourceDefinition existingCRD) {
       List<V1beta1CustomResourceDefinitionVersion> versions = existingCRD.getSpec().getVersions();
       boolean found = false;
       if (versions != null) {
@@ -243,7 +243,7 @@ private boolean isExistingCRDMissingVersion(V1beta1CustomResourceDefinition exis
         }
       }
 
-      return !found;
+      return found;
     }
 
     Step updateExistingCRD(Step next, V1beta1CustomResourceDefinition existingCRD) {
@@ -349,27 +349,27 @@ public boolean isOutdatedCRD(
       // VersionHelper.matchesResourceVersion(existingCRD.getMetadata(), DEFAULT_OPERATOR_VERSION)
     }
 
-    // true, if right is later than left
-    private boolean isLaterOrEqual(ResourceVersion left, ResourceVersion right) {
-      if (right.getVersion() != left.getVersion()) {
-        return right.getVersion() >= left.getVersion();
+    // true, if version is later than base
+    private boolean isLaterOrEqual(ResourceVersion base, ResourceVersion version) {
+      if (version.getVersion() != base.getVersion()) {
+        return version.getVersion() >= base.getVersion();
       }
 
-      if (right.getPrerelease() == null) {
-        if (left.getPrerelease() != null) {
+      if (version.getPrerelease() == null) {
+        if (base.getPrerelease() != null) {
           return true;
         }
-      } else if (!right.getPrerelease().equals(left.getPrerelease())) {
-        if (left.getPrerelease() == null) {
+      } else if (!version.getPrerelease().equals(base.getPrerelease())) {
+        if (base.getPrerelease() == null) {
           return false;
         }
-        return "alpha".equals(left.getPrerelease());
+        return "alpha".equals(base.getPrerelease());
       }
 
-      if (right.getPrereleaseVersion() == null && left.getPrereleaseVersion() != null) {
+      if (version.getPrereleaseVersion() == null && base.getPrereleaseVersion() != null) {
         return false;
       }
-      return right.getPrereleaseVersion() >= left.getPrereleaseVersion();
+      return version.getPrereleaseVersion() >= base.getPrereleaseVersion();
     }
 
     private V1beta1JSONSchemaProps getSchemaValidation(V1beta1CustomResourceDefinition crd) {

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

@@ -1,4 +1,4 @@
-// Copyright 2017, 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 

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

@@ -1,3 +1,7 @@
+// Copyright 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at
+// http://oss.oracle.com/licenses/upl.
+
 package oracle.kubernetes.operator.helpers;
 
 import io.kubernetes.client.models.V1ConfigMapVolumeSource;

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

@@ -1,4 +1,4 @@
-// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 

operator/src/test/java/oracle/kubernetes/operator/DomainPresenceInfoMatcher.java

@@ -1,4 +1,4 @@
-// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 

operator/src/test/java/oracle/kubernetes/operator/builders/EventMatcher.java

@@ -1,4 +1,4 @@
-// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 

operator/src/test/java/oracle/kubernetes/operator/builders/StubWatchFactory.java

@@ -1,4 +1,4 @@
-// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.