Fix fabric8io#1019: Custom Liveness/Readiness probes are not being cr…

…eated Added CustomProbeEnricher for adding probes via XML config
rohanKanojia · Dec 13, 2018 · 13dacac · 13dacac
1 parent 0a5d1dc
commit 13dacac
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ After this we will switch probably to real [Semantic Versioning 2.0.0](http://se
 * Fix 1425: Added metadata visitors for imagestreams, build and buildconfig.
 * Fix 712: Add possibility to configure cluster access fexibly.
 * Upgraded Jgit to version 5.2.0.201812061821-r - https://github.com/fabric8io/fabric8-maven-plugin/pull/1452
+* Fix 1019: Custom liveness/readiness probes are not being created
 
 ### 3.5-SNAPSHOT
 * Fix 1021: Avoids empty deployment selector value in generated yaml resource

diff --git a/core/src/main/java/io/fabric8/maven/core/config/ResourceConfig.java b/core/src/main/java/io/fabric8/maven/core/config/ResourceConfig.java
@@ -189,6 +189,16 @@ public Builder withConfigMap(ConfigMap configMap) {
             return this;
         }
 
+        public Builder withLiveness(ProbeConfig liveness) {
+            config.liveness = liveness;
+            return this;
+        }
+
+        public Builder withReadiness(ProbeConfig readiness) {
+            config.readiness = readiness;
+            return this;
+        }
+
         public ResourceConfig build() {
             return config;
         }

diff --git a/core/src/main/java/io/fabric8/maven/core/handler/ProbeHandler.java b/core/src/main/java/io/fabric8/maven/core/handler/ProbeHandler.java
@@ -77,11 +77,11 @@ private HTTPGetAction getHTTPGetAction(String getUrl) {
         }
         try {
             URL url = new URL(getUrl);
-                return new HTTPGetAction(url.getHost(),
-                        null /* headers */,
-                        url.getPath(),
-                        new IntOrString(url.getPort()),
-                        url.getProtocol());
+            return new HTTPGetAction(url.getHost(),
+                    null /* headers */,
+                    url.getPath(),
+                    new IntOrString(url.getPort()),
+                    url.getProtocol().toUpperCase());
         } catch (MalformedURLException e) {
             throw new IllegalArgumentException("Invalid URL " + getUrl + " given for HTTP GET readiness check");
         }

diff --git a/core/src/test/java/io/fabric8/maven/core/handler/ProbeHandlerTest.java b/core/src/test/java/io/fabric8/maven/core/handler/ProbeHandlerTest.java
@@ -84,7 +84,7 @@ public void getHTTPProbeWithHTTPURLTest() {
         assertEquals(null,probe.getHttpGet().getHttpHeaders());
         assertEquals("/healthz",probe.getHttpGet().getPath());
         assertEquals(8080,probe.getHttpGet().getPort().getIntVal().intValue());
-        assertEquals("http",probe.getHttpGet().getScheme());
+        assertEquals("HTTP",probe.getHttpGet().getScheme());
         assertNull(probe.getExec());
         assertNull(probe.getTcpSocket());
     }
@@ -199,7 +199,7 @@ public void getTCPProbeWithHTTPURLAndPortTest() {
         assertEquals(null,probe.getHttpGet().getHttpHeaders());
         assertEquals("/healthz",probe.getHttpGet().getPath());
         assertEquals(8080,probe.getHttpGet().getPort().getIntVal().intValue());
-        assertEquals("http",probe.getHttpGet().getScheme());
+        assertEquals("HTTP",probe.getHttpGet().getScheme());
     }
 
     @Test
@@ -265,7 +265,7 @@ public void getTCPWithHTTPURLAndWithoutPort() {
         assertEquals(null,probe.getHttpGet().getHttpHeaders());
         assertEquals("/healthz",probe.getHttpGet().getPath());
         assertEquals(8080,probe.getHttpGet().getPort().getIntVal().intValue());
-        assertEquals("http",probe.getHttpGet().getScheme());
+        assertEquals("HTTP",probe.getHttpGet().getScheme());
     }
 
     @Test
@@ -293,4 +293,4 @@ public void getTCPProbeWithInvalidURLTest() {
 
         probe = probeHandler.getProbe(probeConfig);
     }
-}
+}
diff --git a/.../standard/src/main/java/io/fabric8/maven/enricher/standard/DefaultControllerEnricher.java b/.../standard/src/main/java/io/fabric8/maven/enricher/standard/DefaultControllerEnricher.java
@@ -97,12 +97,20 @@ public DefaultControllerEnricher(MavenEnricherContext buildContext) {
     @Override
     public void addMissingResources(KubernetesListBuilder builder) {
         final String name = getConfig(Config.name, MavenUtil.createDefaultResourceName(getContext().getGav().getSanitizedArtifactId()));
-        final ResourceConfig config = new ResourceConfig.Builder()
-                    .controllerName(name)
-                    .imagePullPolicy(getConfig(Config.pullPolicy))
-                    .withReplicas(Configs.asInt(getConfig(Config.replicaCount)))
-                    .build();
+        ResourceConfig resourceConfig = getConfiguration().getResource().orElse(null);
+        ResourceConfig.Builder configBuilder = new ResourceConfig.Builder()
+                .controllerName(name)
+                .imagePullPolicy(getConfig(Config.pullPolicy))
+                .withReplicas(Configs.asInt(getConfig(Config.replicaCount)));
+        if(resourceConfig != null) {
+            configBuilder.volumes(resourceConfig.getVolumes())
+                    .withLiveness(resourceConfig.getLiveness())
+                    .withReadiness(resourceConfig.getReadiness())
+                    .withConfigMap(resourceConfig.getConfigMap())
+                    .withServiceAccount(resourceConfig.getServiceAccount());
+        }
 
+        final ResourceConfig config = configBuilder.build();
         final List<ImageConfiguration> images = getImages().orElse(Collections.emptyList());
 
         // Check if at least a replica set is added. If not add a default one