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

Author: vanajamukkara

docs/charts/index.yaml

@@ -1,11 +1,11 @@
 apiVersion: v1
 entries:
   weblogic-operator:
-  - created: 2019-02-14T14:24:39.055209-05:00
+  - created: 2019-02-19T16:57:25.809580117-05:00
     description: Helm chart for configuring the WebLogic operator.
-    digest: b3d5d765758da69dc6020dd47e84d532ba9464630c010aafbbf97e9c38495aec
+    digest: 155ebf001218919a6b478bbf82068301736cfdaa1be6bb86ac49fb91a859be28
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.1.tgz
     version: "2.1"
-generated: 2019-02-14T14:24:39.053451-05:00
+generated: 2019-02-19T16:57:25.805229234-05:00

docs/charts/weblogic-operator-2.1.tgz

@@ -28,7 +28,7 @@ public DomainConfigurator createFor(Domain domain) {
 
   public DomainV2Configurator() {}
 
-  public DomainV2Configurator(@Nonnull Domain domain) {
+  DomainV2Configurator(@Nonnull Domain domain) {
     super(domain);
     setApiVersion(domain);
   }
@@ -93,26 +93,20 @@ public DomainConfigurator withConfigOverrides(String configMapName) {
   }
 
   @Override
-  /**
-   * Sets the WebLogic configuration overrides secret names for the domain
-   *
-   * @param secretNames a list of secret names
-   * @return this object
-   */
   public DomainConfigurator withConfigOverrideSecrets(String... secretNames) {
     getDomainSpec().setConfigOverrideSecrets(Arrays.asList(secretNames));
     return this;
   }
 
   @Override
   public DomainConfigurator withPodLabel(String name, String value) {
-    ((BaseConfiguration) getDomainSpec()).addPodLabel(name, value);
+    getDomainSpec().addPodLabel(name, value);
     return this;
   }
 
   @Override
   public DomainConfigurator withPodAnnotation(String name, String value) {
-    ((BaseConfiguration) getDomainSpec()).addPodAnnotation(name, value);
+    getDomainSpec().addPodAnnotation(name, value);
     return this;
   }
 

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

@@ -1,13 +1,23 @@
-// 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.
 
 package oracle.kubernetes.operator.helpers;
 
 import io.kubernetes.client.models.V1ObjectMeta;
+import io.kubernetes.client.models.V1Pod;
+import io.kubernetes.client.util.Yaml;
+import java.util.function.Function;
+import org.apache.commons.codec.digest.DigestUtils;
 
 /** Annotates pods, services with details about the Domain instance and checks these annotations. */
 public class AnnotationHelper {
+  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 =
+      pod -> DigestUtils.sha256Hex(Yaml.dump(pod));
+
   /**
    * Marks metadata with annotations that let Prometheus know how to retrieve metrics from the
    * wls-exporter web-app. The specified httpPort should be the listen port of the WebLogic server
@@ -16,10 +26,34 @@ public class AnnotationHelper {
    * @param meta Metadata
    * @param httpPort HTTP listen port
    */
-  public static void annotateForPrometheus(V1ObjectMeta meta, int httpPort) {
+  static void annotateForPrometheus(V1ObjectMeta meta, int httpPort) {
     meta.putAnnotationsItem(
         "prometheus.io/port", "" + httpPort); // should be the ListenPort of the server in the pod
     meta.putAnnotationsItem("prometheus.io/path", "/wls-exporter/metrics");
     meta.putAnnotationsItem("prometheus.io/scrape", "true");
   }
+
+  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));
+    return pod;
+  }
+
+  static String getHash(V1Pod pod) {
+    return pod.getMetadata().getAnnotations().get(SHA256_ANNOTATION);
+  }
+
+  static String getDebugString(V1Pod pod) {
+    return pod.getMetadata().getAnnotations().get(HASHED_STRING);
+  }
 }