clean up

Author: russgold

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

@@ -12,7 +12,7 @@
 
 /** Annotates pods, services with details about the Domain instance and checks these annotations. */
 public class AnnotationHelper {
-  private static final boolean DEBUG = true;
+  private static final boolean DEBUG = false;
   static final String SHA256_ANNOTATION = "weblogic.sha256";
   private static final String HASHED_STRING = "hashedString";
   private static Function<V1Pod, String> HASH_FUNCTION =
@@ -34,9 +34,18 @@ static void annotateForPrometheus(V1ObjectMeta meta, int httpPort) {
   }
 
   static V1Pod withSha256Hash(V1Pod pod) {
+    return DEBUG ? addHashAndDebug(pod) : addHash(pod);
+  }
+
+  private static V1Pod addHashAndDebug(V1Pod pod) {
     String dump = Yaml.dump(pod);
+    addHash(pod);
+    pod.getMetadata().putAnnotationsItem(HASHED_STRING, dump);
+    return pod;
+  }
+
+  private static V1Pod addHash(V1Pod pod) {
     pod.getMetadata().putAnnotationsItem(SHA256_ANNOTATION, HASH_FUNCTION.apply(pod));
-    if (DEBUG) pod.getMetadata().putAnnotationsItem(HASHED_STRING, dump);
     return pod;
   }
 

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

@@ -458,4 +458,6 @@ List<String> createStartCommand() {
   protected ServerConfigurator configureServer(DomainConfigurator configurator, String serverName) {
     return configurator.configureAdminServer();
   }
+
+  // todo test that changing the cert in tuning parameters does not change the hash
 }

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

@@ -922,6 +922,8 @@ public void whenDomainPresenceInfoLacksImageName_createdPodUsesDefaultImage() {
     assertThat(getCreatedPodSpecContainer().getImage(), equalTo(DEFAULT_IMAGE));
   }
 
+  // todo test that changing a label or annotation does not change the hash
+
   interface PodMutator {
     void mutate(V1Pod pod);
   }