Fixed IngressEnricher and RouteEnricher

core/src/main/java/io/fabric8/maven/core/config/ResourceConfig.java

@@ -92,7 +92,10 @@ public class ResourceConfig {
     @Parameter
     private List<ServiceAccountConfig> serviceAccounts;
 
-    private List<IngressRule> ingressRules;
+    /**
+     * Host/domain for Route/Ingress.
+     */
+    private String routeDomain;
 
     public Optional<Map<String, String>> getEnv() {
         return Optional.ofNullable(env);
@@ -167,9 +170,11 @@ public ConfigMap getConfigMap() {
     public List<String> getRemotes() {
         return remotes;
     }
+
     public List<String> getCrdContexts() { return customResourceDefinitions; }
 
-    public List<IngressRule> getIngressRules() { return ingressRules; }
+    public String getRouteDomain() { return routeDomain; }
+
     // =============================================================================================
 
     public static class Builder {
@@ -197,7 +202,7 @@ public Builder(ResourceConfig config) {
                 this.config.metrics = config.getMetrics();
                 this.config.namespace = config.getNamespace();
                 this.config.remotes = config.getRemotes();
-                this.config.ingressRules = config.getIngressRules();
+                this.config.routeDomain= config.getRouteDomain();
             }
         }
 
@@ -256,11 +261,6 @@ public Builder withRemotes(List<String> remotes) {
             return this;
         }
 
-        public Builder withIngressRules(List<IngressRule> ingressRules) {
-            config.ingressRules = ingressRules;
-            return this;
-        }
-
         public Builder withNamespace(String s) {
             config.namespace = s;
             return this;
@@ -271,6 +271,11 @@ public Builder withCustomResourceDefinitions(List<String> customResourceDefiniti
             return this;
         }
 
+        public Builder withRouteDomain(String routeDomain) {
+            config.routeDomain = routeDomain;
+            return this;
+        }
+
         public ResourceConfig build() {
             return config;
         }
@@ -302,4 +307,4 @@ public ResourceConfig build() {
     // fabric8.namespaceEnvVar
 
     // fabric8.provider
-}
+}

core/src/test/resources/fabric8/config/profiles-lookup-dir/profiles.yaml

@@ -41,10 +41,11 @@
     - fmp-image
     - fmp-project-label
     - fmp-debug
-    - fmp-namespace
     - fmp-metadata
     - fmp-controller-from-configuration
     - fmp-openshift-deploymentconfig
     - fmp-openshift-project
     - fmp-openshift-service-expose
     - fmp-openshift-route
+    - fmp-ingress
+    - fmp-namespace

doc/src/main/asciidoc/inc/_profiles.adoc

@@ -229,6 +229,7 @@ A profile can also extend another profile to avoid repetition e.g of generators
       - fmp-openshift-project
       - fmp-openshift-service-expose
       - fmp-openshift-route
+      - fmp-ingress
 
 ----
 one then would not need to repeat all generators as they are inherited from the `default` profile.

enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/DefaultNamespaceEnricher.java

@@ -29,6 +29,7 @@
 import io.fabric8.maven.enricher.api.MavenEnricherContext;
 import io.fabric8.openshift.api.model.Project;
 import io.fabric8.openshift.api.model.ProjectBuilder;
+import io.fabric8.openshift.api.model.ProjectStatus;
 
 import java.util.Arrays;
 
@@ -132,14 +133,18 @@ public void visit(ObjectMetaBuilder metaBuilder) {
         builder.accept(new TypedVisitor<NamespaceBuilder>() {
             @Override
             public void visit(NamespaceBuilder builder) {
-                builder.withNewStatus("active").editMetadata().withNamespace(null).endMetadata().build();
+                if (builder.getStatus().equals("active")) {
+                    builder.editOrNewStatus().endStatus().build();
+                }
             }
         });
 
         builder.accept(new TypedVisitor<ProjectBuilder>() {
             @Override
             public void visit(ProjectBuilder builder) {
-                builder.withNewStatus("active").editMetadata().withNamespace(null).endMetadata().build();
+                if (builder.getStatus().equals(new ProjectStatus("active"))) {
+                    builder.editOrNewStatus().endStatus().build();
+                }
             }
         });
     }

enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/IngressEnricher.java

@@ -23,19 +23,24 @@
 import io.fabric8.kubernetes.api.model.ServiceBuilder;
 import io.fabric8.kubernetes.api.model.ServicePort;
 import io.fabric8.kubernetes.api.model.ServiceSpec;
-import io.fabric8.kubernetes.api.model.extensions.Ingress;
+import io.fabric8.kubernetes.api.model.extensions.HTTPIngressPath;
+import io.fabric8.kubernetes.api.model.extensions.HTTPIngressPathBuilder;
 import io.fabric8.kubernetes.api.model.extensions.IngressBackendBuilder;
 import io.fabric8.kubernetes.api.model.extensions.IngressBuilder;
 import io.fabric8.kubernetes.api.model.extensions.IngressSpecBuilder;
 import io.fabric8.maven.core.config.PlatformMode;
 import io.fabric8.maven.core.config.ResourceConfig;
+import io.fabric8.maven.core.util.FileUtil;
 import io.fabric8.maven.core.util.kubernetes.Fabric8Annotations;
+import io.fabric8.maven.core.util.kubernetes.KubernetesHelper;
 import io.fabric8.maven.enricher.api.BaseEnricher;
 import io.fabric8.maven.enricher.api.MavenEnricherContext;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -48,42 +53,63 @@ public IngressEnricher(MavenEnricherContext buildContext) {
         super(buildContext, "fmp-ingress");
     }
 
+    private String routeDomainPostfix;
+
     @Override
     public void create(PlatformMode platformMode, final KubernetesListBuilder listBuilder) {
+        ResourceConfig resourceConfig = getConfiguration().getResource().orElse(null);
+
+        if (resourceConfig != null && resourceConfig.getRouteDomain() != null) {
+            routeDomainPostfix = resourceConfig.getRouteDomain();
+        }
+
         if (platformMode == PlatformMode.kubernetes) {
-            final List<Ingress> ingresses = new ArrayList<>();
             listBuilder.accept(new TypedVisitor<ServiceBuilder>() {
                 @Override
                 public void visit(ServiceBuilder serviceBuilder) {
                     addIngress(listBuilder, serviceBuilder);
                 }
             });
-
         }
     }
 
     private void addIngress(KubernetesListBuilder listBuilder, ServiceBuilder serviceBuilder) {
-        ObjectMeta metadata = serviceBuilder.getMetadata();
-        if (metadata != null && isExposedService(serviceBuilder)) {
-            String name = metadata.getName();
-            if (!hasIngress(listBuilder, name)) {
+        ObjectMeta serviceMetadata = serviceBuilder.getMetadata();
+        if (serviceMetadata != null && isExposedService(serviceMetadata) && shouldCreateExternalURLForService(serviceBuilder)) {
+            String serviceName = serviceMetadata.getName();
+            if (!hasIngress(listBuilder, serviceName)) {
                 Integer servicePort = getServicePort(serviceBuilder);
                 if (servicePort != null) {
-                    ResourceConfig resourceConfig = getConfiguration().getResource().orElse(null);
 
                     IngressBuilder ingressBuilder = new IngressBuilder().
-                            withMetadata(serviceBuilder.getMetadata()).
+                            withMetadata(serviceMetadata).
                             withNewSpec().
-
                             endSpec();
-                    IngressSpecBuilder specBuilder = new IngressSpecBuilder().withBackend(new IngressBackendBuilder().
-                            withNewServiceName(name).
-                            withNewServicePort(getServicePort(serviceBuilder)).
-                            build());
 
-                    if (resourceConfig != null) {
-                        specBuilder.addAllToRules(resourceConfig.getIngressRules());
+                    // removing `expose : true` label from metadata.
+                    ingressBuilder.withNewMetadataLike(removeExposeLabel(ingressBuilder.getMetadata()));
+
+                    if (StringUtils.isNotBlank(routeDomainPostfix)) {
+                        routeDomainPostfix = serviceName + "." + FileUtil.stripPrefix(routeDomainPostfix, ".");
+                        ingressBuilder = ingressBuilder.withSpec(new IngressSpecBuilder().addNewRule().
+                                withHost(routeDomainPostfix).
+                                withNewHttp().
+                                withPaths(new HTTPIngressPathBuilder()
+                                        .withNewBackend()
+                                        .withServiceName(serviceName)
+                                        .withServicePort(KubernetesHelper.createIntOrString(getServicePort(serviceBuilder)))
+                                        .endBackend()
+                                        .build())
+                                .endHttp().
+                                        endRule().build());
+                    } else {
+                        ingressBuilder.withSpec(new IngressSpecBuilder().withBackend(new IngressBackendBuilder().
+                                withNewServiceName(serviceName)
+                                .withNewServicePort(getServicePort(serviceBuilder))
+                                .build()).build());
                     }
+
+                    listBuilder.addToIngressItems(ingressBuilder.build());
                 }
             }
         }
@@ -126,13 +152,23 @@ public void visit(IngressBuilder builder) {
         return answer.get();
     }
 
-    private boolean isExposedService(ServiceBuilder serviceBuilder) {
-        Service service = serviceBuilder.build();
-        return isExposedService(service);
+    private ObjectMeta removeExposeLabel(ObjectMeta metadata) {
+        Map<String, String> labels = null;
+        if (metadata != null) {
+            labels = metadata.getLabels();
+            if (labels != null) {
+                if ("true".equals(labels.get("expose"))) {
+                    labels.remove("expose");
+                }
+                if("true".equals(labels.get(Fabric8Annotations.SERVICE_EXPOSE_URL.value()))) {
+                    labels.remove(Fabric8Annotations.SERVICE_EXPOSE_URL.value());
+                }
+            }
+        }
+        return metadata;
     }
 
-    private boolean isExposedService(Service service) {
-        ObjectMeta metadata = service.getMetadata();
+    private boolean isExposedService(ObjectMeta metadata) {
         if (metadata != null) {
             Map<String, String> labels = metadata.getLabels();
             if (labels != null) {
@@ -141,8 +177,39 @@ private boolean isExposedService(Service service) {
                 }
             }
         } else {
-            log.info("No Metadata for service! " + service);
+            log.info("No Metadata for service! " + metadata.getName());
         }
         return false;
     }
+
+    /**
+     * Should we try to create an external URL for the given service?
+     * <p/>
+     * By default lets ignore the kubernetes services and any service which does not expose ports 80 and 443
+     *
+     * @return true if we should create an Ingress for this service.
+     */
+    private boolean shouldCreateExternalURLForService(ServiceBuilder service) {
+        String serviceName = service.getMetadata().getName();
+        if ("kubernetes".equals(serviceName) || "kubernetes-ro".equals(serviceName)) {
+            return false;
+        }
+        ServiceSpec spec = service.getSpec();
+        List<ServicePort> ports = spec.getPorts();
+        log.debug("Service " + serviceName + " has ports: " + ports);
+        if (ports.size() == 1) {
+            String type = null;
+            if (spec != null) {
+                type = spec.getType();
+                if (Objects.equals(type, "LoadBalancer")) {
+                    return true;
+                }
+            }
+            log.info("Not generating Ingress for service " + serviceName + " type is not LoadBalancer: " + type);
+            return false;
+        } else {
+            log.info("Not generating Ingress for service " + serviceName + " as only single port services are supported. Has ports: " + ports);
+            return false;
+        }
+    }
 }