Merge pull request #98 from oracle/readyness-probe-dns

Allow server Services to expose DNS before Pod is ready

Author: rjeberhard

src/main/java/oracle/kubernetes/operator/Main.java

@@ -42,6 +42,7 @@
 import oracle.kubernetes.operator.helpers.ConfigMapHelper;
 import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
 import oracle.kubernetes.operator.helpers.DomainPresenceInfo.ServerStartupInfo;
+import oracle.kubernetes.operator.helpers.HealthCheckHelper.KubernetesVersion;
 import oracle.kubernetes.operator.helpers.HealthCheckHelper;
 import oracle.kubernetes.operator.helpers.IngressHelper;
 import oracle.kubernetes.operator.helpers.PodHelper;
@@ -86,6 +87,7 @@ public class Main {
   private static Thread livenessThread = null;
   private static Map<String, DomainWatcher> domainWatchers = new HashMap<>();
   private static Map<String, PodWatcher> podWatchers = new HashMap<>();
+  private static KubernetesVersion version = null;
 
   private static final Engine engine = new Engine("operator");
 
@@ -147,6 +149,7 @@ public static void main(String[] args) {
 
         try {
           HealthCheckHelper healthCheck = new HealthCheckHelper(client, namespace, targetNamespaces);
+          version = healthCheck.performK8sVersionCheck();
           healthCheck.performNonSecurityChecks();
           healthCheck.performSecurityChecks(serviceAccountName);
         } catch (ApiException e) {
@@ -442,7 +445,7 @@ private static void doCheckAndCreateDomainPresence(
     Fiber f = engine.createFiber();
     Packet p = new Packet();
 
-    p.getComponents().put(ProcessingConstants.DOMAIN_COMPONENT_NAME, Component.createFor(info));
+    p.getComponents().put(ProcessingConstants.DOMAIN_COMPONENT_NAME, Component.createFor(info, version));
     p.put(ProcessingConstants.PRINCIPAL, principal);
 
     if (explicitRestartAdmin) {

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

@@ -167,7 +167,6 @@ public HealthCheckHelper(ClientHolder client, String operatorNamespace, Collecti
    */
   public void performNonSecurityChecks() throws ApiException {
 
-    verifyK8sVersion();
     HashMap<String, Domain> domainUIDMap = verifyDomainUidUniqueness();
     verifyPersistentVolume(domainUIDMap);
     verifyDomainImage(domainUIDMap);
@@ -221,23 +220,40 @@ public void performSecurityChecks(String svcAccountName) throws ApiException {
     }
   }
 
+  /**
+   * Major and minor version of Kubernetes API Server
+   * 
+   */
+  public static class KubernetesVersion {
+    public final int major;
+    public final int minor;
+    
+    public KubernetesVersion(int major, int minor) {
+      this.major = major;
+      this.minor = minor;
+    }
+  }
 
   /**
    * Verify the k8s version.
    *
+   * @return Major and minor version information
    * @throws ApiException exception for k8s API
    */
-  private void verifyK8sVersion() throws ApiException {
+  public KubernetesVersion performK8sVersionCheck() throws ApiException {
 
     // k8s version must be 1.7.5 or greater
     LOGGER.info(MessageKeys.VERIFY_K8S_MIN_VERSION);
     boolean k8sMinVersion = true;
     VersionInfo info = null;
+    
+    int major = 0;
+    int minor = 0;
     try {
       info = client.getVersionApiClient().getCode();
 
       String gitVersion = info.getGitVersion();
-      Integer major = Integer.parseInt(info.getMajor());
+      major = Integer.parseInt(info.getMajor());
       if (major < 1) {
         k8sMinVersion = false;
       } else if (major == 1) {
@@ -248,10 +264,10 @@ private void verifyK8sVersion() throws ApiException {
 	      while( ! minor_string.chars().allMatch( Character::isDigit )) {
           minor_string = minor_string.substring(0, minor_string.length() -1);
 	      }
-        Integer minor = Integer.parseInt(minor_string);
+        minor = Integer.parseInt(minor_string);
         if (minor < 7) {
           k8sMinVersion = false;
-        } else if (minor >= 7) {
+        } else if (minor == 7) {
           // git version is of the form v1.7.5
           // Check the 3rd part of the version.
           String[] splitVersion = gitVersion.split("\\.");
@@ -272,6 +288,8 @@ private void verifyK8sVersion() throws ApiException {
     } catch (ApiException ae) {
       LOGGER.warning(MessageKeys.K8S_VERSION_CHECK_FAILURE, ae);
     }
+    
+    return new KubernetesVersion(major, minor);
   }
 
   /**

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

@@ -9,6 +9,7 @@
 import oracle.kubernetes.operator.ProcessingConstants;
 import oracle.kubernetes.operator.domain.model.oracle.kubernetes.weblogic.domain.v1.Domain;
 import oracle.kubernetes.operator.domain.model.oracle.kubernetes.weblogic.domain.v1.DomainSpec;
+import oracle.kubernetes.operator.helpers.HealthCheckHelper.KubernetesVersion;
 import oracle.kubernetes.operator.logging.LoggingFacade;
 import oracle.kubernetes.operator.logging.LoggingFactory;
 import oracle.kubernetes.operator.logging.MessageKeys;
@@ -44,10 +45,11 @@ public ForServerStep(Step next) {
     @Override
     public NextAction apply(Packet packet) {
       DomainPresenceInfo info = packet.getSPI(DomainPresenceInfo.class);
+      KubernetesVersion version = packet.getSPI(KubernetesVersion.class);
       String serverName = (String) packet.get(ProcessingConstants.SERVER_NAME);
       Integer port = (Integer) packet.get(ProcessingConstants.PORT);
       Integer nodePort = (Integer) packet.get(ProcessingConstants.NODE_PORT);
-      
+
       Domain dom = info.getDomain();
       V1ObjectMeta meta = dom.getMetadata();
       DomainSpec spec = dom.getSpec();
@@ -70,13 +72,20 @@ public NextAction apply(Packet packet) {
       service.setMetadata(metadata);
 
       AnnotationHelper.annotateWithDomain(metadata, dom);
+      metadata.putAnnotationsItem("service.alpha.kubernetes.io/tolerate-unready-endpoints", "true");
 
       V1ServiceSpec serviceSpec = new V1ServiceSpec();
       serviceSpec.setType(nodePort == null ? "ClusterIP" : "NodePort");
+
       Map<String, String> selector = new HashMap<>();
       selector.put(LabelConstants.DOMAINUID_LABEL, weblogicDomainUID);
       selector.put(LabelConstants.SERVERNAME_LABEL, serverName);
       serviceSpec.setSelector(selector);
+
+      if (version != null && (version.major > 1 || (version.major == 1 && version.minor >= 8))) {
+        serviceSpec.setPublishNotReadyAddresses(Boolean.TRUE);
+      }
+
       List<V1ServicePort> ports = new ArrayList<>();
       V1ServicePort servicePort = new V1ServicePort();
       servicePort.setPort(port);

src/main/java/oracle/kubernetes/operator/logging/LoggingFormatter.java

@@ -110,7 +110,7 @@ public String format(LogRecord record) {
     map.put(SOURCE_METHOD, sourceMethodName);
     map.put(TIME_IN_MILLIS, rawTime);
     // if message or throwable have new lines in them, we need to replace with JSON newline control character \n
-    map.put(MESSAGE, message.replaceAll("\n", "\\\n"));
+    map.put(MESSAGE, message != null ? message.replaceAll("\n", "\\\n") : "");
     map.put(EXCEPTION, throwable.replaceAll("\n", "\\\n"));
     map.put(RESPONSE_CODE, code);
     map.put(RESPONSE_HEADERS, headers);