Merge branch 'master' into spring-boot/issue-880

Author: rhuss

core/pom.xml

@@ -22,12 +22,12 @@
   <parent>
     <groupId>io.fabric8</groupId>
     <artifactId>fabric8-maven-parent</artifactId>
-    <version>3.4-SNAPSHOT</version>
+    <version>3.5-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>fabric8-maven-core</artifactId>
-  <version>3.4-SNAPSHOT</version>
+  <version>3.5-SNAPSHOT</version>
 
   <name>Fabric8 Maven :: Core</name>
 

core/src/main/java/io/fabric8/maven/core/access/ClusterAccess.java

@@ -23,6 +23,7 @@
 import io.fabric8.maven.core.config.PlatformMode;
 import io.fabric8.maven.docker.util.Logger;
 import io.fabric8.openshift.client.DefaultOpenShiftClient;
+import io.fabric8.openshift.client.OpenShiftAPIGroups;
 import io.fabric8.openshift.client.OpenShiftClient;
 import io.fabric8.utils.Strings;
 
@@ -72,6 +73,18 @@ public String getNamespace() {
         return namespace;
     }
 
+    /**
+     * Returns true if this cluster is a traditional OpenShift cluster with the <code>/oapi</code> REST API
+     * or supports the new <code>/apis/image.openshift.io</code> API Group
+     */
+    public boolean isOpenShiftImageStream(Logger log) {
+        if (isOpenShift(log)) {
+            OpenShiftClient openShiftClient = createOpenShiftClient();
+            return openShiftClient.supportsOpenShiftAPIGroup(OpenShiftAPIGroups.IMAGE);
+        }
+        return false;
+    }
+
     public boolean isOpenShift(Logger log) {
         try {
             return KubernetesHelper.isOpenShift(createKubernetesClient());
@@ -91,7 +104,7 @@ public PlatformMode resolvePlatformMode(PlatformMode mode, Logger log) {
             mode = PlatformMode.DEFAULT;
         }
         if (mode.isAuto()) {
-            resolvedMode = isOpenShift(log) ? PlatformMode.openshift : PlatformMode.kubernetes;
+            resolvedMode = isOpenShiftImageStream(log) ? PlatformMode.openshift : PlatformMode.kubernetes;
         } else {
             resolvedMode = mode;
         }

core/src/main/java/io/fabric8/maven/core/service/ClientToolsService.java

@@ -51,7 +51,7 @@ public File getKubeCtlExecutable() {
         }
         if (file == null) {
             throw new IllegalStateException("Could not find " + missingCommandMessage +
-                    ". Please try running `mvn fabric8:install` to install the necessary binaries and ensure they get added to your $PATH");
+                    ". Please install the necessary binaries and ensure they get added to your $PATH");
         }
         return file;
     }

core/src/main/java/io/fabric8/maven/core/util/KubernetesResourceUtil.java

@@ -24,6 +24,8 @@
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.nio.charset.Charset;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -95,9 +97,9 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.utils.StringUtils;
+import org.slf4j.LoggerFactory;
 
 import static io.fabric8.kubernetes.api.KubernetesHelper.getName;
-import static io.fabric8.kubernetes.api.KubernetesHelper.parseDate;
 import static io.fabric8.maven.core.util.Constants.RESOURCE_APP_CATALOG_ANNOTATION;
 import static io.fabric8.maven.core.util.Constants.RESOURCE_SOURCE_URL_ANNOTATION;
 import static io.fabric8.utils.Strings.isNullOrBlank;
@@ -110,6 +112,8 @@
  */
 public class KubernetesResourceUtil {
 
+    private static final transient org.slf4j.Logger LOG = LoggerFactory.getLogger(KubernetesResourceUtil.class);
+
     public static final String API_VERSION = "v1";
     public static final String API_EXTENSIONS_VERSION = "extensions/v1beta1";
     public static final String API_APPS_VERSION = "apps/v1beta1";
@@ -120,6 +124,8 @@ public class KubernetesResourceUtil {
 
     public static final HashSet<Class<?>> SIMPLE_FIELD_TYPES = new HashSet<>();
 
+    protected static final String DATE_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ssX";
+
 
     /**
      * Read all Kubernetes resource fragments from a directory and create a {@link KubernetesListBuilder} which
@@ -222,6 +228,7 @@ public boolean accept(File dir, String name) {
             "cr", "ClusterRole",
             "crole", "ClusterRole",
             "clusterrole", "ClusterRole",
+            "crd", "CustomResourceDefinition",
             "crb", "ClusterRoleBinding",
             "clusterrb", "ClusterRoleBinding",
             "cj", "CronJob",
@@ -581,12 +588,21 @@ public static Date getCreationTimestamp(HasMetadata hasMetadata) {
     }
 
     private static Date parseTimestamp(String text) {
-        if (text == null) {
+        if (Strings.isNullOrBlank(text)) {
             return null;
         }
         return parseDate(text);
     }
 
+    public static Date parseDate(String text) {
+        try {
+            return new SimpleDateFormat(DATE_TIME_FORMAT).parse(text);
+        } catch (ParseException e) {
+            LOG.warn("Unable to parse date: " + text, e);
+            return null;
+        }
+    }
+
     public static boolean podHasContainerImage(Pod pod, String imageName) {
         if (pod != null) {
             PodSpec spec = pod.getSpec();

doc/pom.xml

@@ -21,12 +21,12 @@
   <parent>
     <groupId>io.fabric8</groupId>
     <artifactId>fabric8-maven-parent</artifactId>
-    <version>3.4-SNAPSHOT</version>
+    <version>3.5-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>fabric8-maven-doc</artifactId>
-  <version>3.4-SNAPSHOT</version>
+  <version>3.5-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Fabric8 Maven :: Documentation</name>

doc/src/main/asciidoc/inc/goals/develop/_fabric8-watch.adoc

@@ -5,11 +5,35 @@
 This goal is used to monitor the project workspace for changes and automatically trigger a redeploy of the application
 running on Kubernetes.
 
-Before entering the watch mode, this goal generates the docker image and the Kubernetes resources
+Before entering the watch mode, this goal must generate the docker image and the Kubernetes resources
 (optionally including some development libraries/configuration),
-and deploys the app on Kubernetes.
+and deploy the app on Kubernetes. Lifecycle bindings should be configured as follows to allow
+the generation of such resources.
 
-[source, sh]
+.Lifecycle bindings for fabric8:watch
+[source, xml, indent=0]
+----
+<plugin>
+  <groupId>io.fabric8</groupId>
+  <artifactId>fabric8-maven-plugin</artifactId>
+
+  <!-- ... -->
+
+  <executions>
+    <execution>
+      <goals>
+        <goal>resource</goal>
+        <goal>build</goal>
+      </goals>
+    </execution>
+  </executions>
+</plugin>
+----
+
+For any application having `resource` and `build` goals bound to the lifecycle, the following
+command can be used to run the watch task.
+
+[source, bash]
 ----
 mvn fabric8:watch
 ----

enricher/api/pom.xml

@@ -20,12 +20,12 @@
   <parent>
     <groupId>io.fabric8</groupId>
     <artifactId>fabric8-maven-parent</artifactId>
-    <version>3.4-SNAPSHOT</version>
+    <version>3.5-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>fabric8-maven-enricher-api</artifactId>
-  <version>3.4-SNAPSHOT</version>
+  <version>3.5-SNAPSHOT</version>
 
   <name>Fabric8 Maven :: Enricher :: API</name>
 

enricher/api/src/main/java/io/fabric8/maven/enricher/api/EnricherContext.java

@@ -85,6 +85,17 @@ public OpenShiftDependencyResources getOpenshiftDependencyResources() {
         return openshiftDependencyResources;
     }
 
+    /**
+     * Returns true if we are in watch mode
+     */
+    public boolean isWatchMode() {
+        try {
+            return runningWithGoal("fabric8:watch-spring-boot", "fabric8:watch");
+        } catch (MojoExecutionException e) {
+            throw new IllegalStateException("Cannot determine maven goals", e);
+        }
+    }
+
     /**
      * Returns true if maven is running with any of the given goals
      */

enricher/fabric8/pom.xml

@@ -20,12 +20,12 @@
   <parent>
     <groupId>io.fabric8</groupId>
     <artifactId>fabric8-maven-parent</artifactId>
-    <version>3.4-SNAPSHOT</version>
+    <version>3.5-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>fabric8-maven-enricher-fabric8</artifactId>
-  <version>3.4-SNAPSHOT</version>
+  <version>3.5-SNAPSHOT</version>
 
   <name>Fabric8 Maven :: Enricher :: Fabric8</name>
 

enricher/fabric8/src/main/java/io/fabric8/maven/enricher/fabric8/WatchEnricher.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright 2016 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.  See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package io.fabric8.maven.enricher.fabric8;
+
+import io.fabric8.kubernetes.api.builder.TypedVisitor;
+import io.fabric8.kubernetes.api.model.KubernetesListBuilder;
+import io.fabric8.kubernetes.api.model.ReplicationControllerBuilder;
+import io.fabric8.kubernetes.api.model.extensions.DeploymentBuilder;
+import io.fabric8.kubernetes.api.model.extensions.ReplicaSetBuilder;
+import io.fabric8.kubernetes.api.model.extensions.StatefulSetBuilder;
+import io.fabric8.maven.enricher.api.BaseEnricher;
+import io.fabric8.maven.enricher.api.EnricherContext;
+import io.fabric8.openshift.api.model.DeploymentConfigBuilder;
+
+/**
+ * Enricher for customizing the deployment in fabric8:watch mode.
+ *
+ * @author nicola
+ * @since 16/05/17
+ */
+public class WatchEnricher extends BaseEnricher {
+
+    public WatchEnricher(EnricherContext buildContext) {
+        super(buildContext, "f8-watch");
+    }
+
+    @Override
+    public void adapt(KubernetesListBuilder builder) {
+        if (getContext().isWatchMode()) {
+            scaleDownToOnePod(builder);
+        }
+    }
+
+    private void scaleDownToOnePod(KubernetesListBuilder builder) {
+
+        builder.accept(new TypedVisitor<ReplicaSetBuilder>() {
+            @Override
+            public void visit(ReplicaSetBuilder b) {
+                b.editOrNewSpec().withReplicas(1).endSpec();
+            }
+        });
+        builder.accept(new TypedVisitor<ReplicationControllerBuilder>() {
+            @Override
+            public void visit(ReplicationControllerBuilder b) {
+                b.editOrNewSpec().withReplicas(1).endSpec();
+            }
+        });
+        builder.accept(new TypedVisitor<DeploymentBuilder>() {
+            @Override
+            public void visit(DeploymentBuilder b) {
+                b.editOrNewSpec().withReplicas(1).endSpec();
+            }
+        });
+        builder.accept(new TypedVisitor<DeploymentConfigBuilder>() {
+            @Override
+            public void visit(DeploymentConfigBuilder b) {
+                b.editOrNewSpec().withReplicas(1).endSpec();
+            }
+        });
+        builder.accept(new TypedVisitor<StatefulSetBuilder>() {
+            @Override
+            public void visit(StatefulSetBuilder b) {
+                b.editOrNewSpec().withReplicas(1).endSpec();
+            }
+        });
+
+    }
+}