Merge branch 'master' into pr/removeImageChangeTriggerFlag

fabric8io · May 21, 2019 · 2dca34d · 2dca34d
2 parents 153e67d + 9f75dfb
commit 2dca34d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/plugin/src/main/java/io/fabric8/maven/plugin/mojo/build/ApplyMojo.java b/plugin/src/main/java/io/fabric8/maven/plugin/mojo/build/ApplyMojo.java
@@ -532,7 +532,7 @@ protected void applyEntities(KubernetesClient kubernetes, String namespace, Stri
                 }
             }
         }
-        processCustomEntities(kubernetes, namespace, resources.getCrdContexts(), false);
+        processCustomEntities(kubernetes, namespace, resources != null ? resources.getCrdContexts() : null, false);
     }
 
     protected String getExternalServiceURL(Service service) {
@@ -635,6 +635,9 @@ protected void createIngress(KubernetesClient kubernetesClient, Collection<HasMe
     }
 
     protected void processCustomEntities(KubernetesClient client, String namespace, List<String> customResourceDefinitions, boolean isDelete) throws Exception {
+        if(customResourceDefinitions == null)
+            return;
+
         List<CustomResourceDefinitionContext> crdContexts = KubernetesClientUtil.getCustomResourceDefinitionContext(client ,customResourceDefinitions);
         Map<File, String> fileToCrdMap = getCustomResourcesFileToNamemap();