DONT MERGE

Signed-off-by: Marc Nuri <[email protected]>

.jenkins/pipelines/java-8.Jenkinsfile

@@ -5,7 +5,7 @@ pipeline {
   tools {
     maven 'apache-maven-latest'
     // https://wiki.eclipse.org/Jenkins#JDK
-    jdk 'temurin-jdk8-latest'
+    jdk 'temurin-jdk11-latest'
   }
   options {
     disableConcurrentBuilds(abortPrevious: true)

gradle-plugin/kubernetes/pom.xml

@@ -182,7 +182,7 @@
         </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>
-            <artifactId>openshift-server-mock</artifactId>
+            <artifactId>kubernetes-server-mock</artifactId>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

gradle-plugin/openshift/pom.xml

@@ -79,7 +79,7 @@
         </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>
-            <artifactId>openshift-server-mock</artifactId>
+            <artifactId>kubernetes-server-mock</artifactId>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

jkube-kit/build/service/docker/src/test/java/org/eclipse/jkube/kit/build/service/docker/RegistryServicePullIT.java

@@ -224,7 +224,7 @@ void pullImageWithPolicy_whenPullFailure_thenThrowException() throws IOException
     // When
     assertThatExceptionOfType(DockerAccessException.class)
         .isThrownBy(() -> registryService.pullImageWithPolicy("example.org/foo/bar:latest", imagePullManager, registryConfig, buildConfiguration))
-        .withMessage("Unable to pull 'example.org/foo/bar:latest' from registry 'example.org' : {\"message\":\"ERROR\"} (Server Error: 500)");
+        .withMessage("Unable to pull 'example.org/foo/bar:latest' from registry 'example.org' : {\"message\":\"ERROR\"} (Internal Server Error: 500)");
   }
 
   private RegistryConfig createNewRegistryConfig(String registry) {

jkube-kit/build/service/docker/src/test/java/org/eclipse/jkube/kit/build/service/docker/RegistryServicePushIT.java

@@ -222,7 +222,7 @@ void pushImage_whenPushFailed_thenThrowException() throws IOException {
     // When
     assertThatExceptionOfType(DockerAccessException.class)
         .isThrownBy(() -> registryService.pushImage(imageConfiguration, 0, registryConfig, false))
-        .withMessage("Unable to push 'example.org/foo/bar:latest' to registry 'example.org' : {\"message\":\"ERROR\"} (Server Error: 500)");
+        .withMessage("Unable to push 'example.org/foo/bar:latest' to registry 'example.org' : {\"message\":\"ERROR\"} (Internal Server Error: 500)");
   }
 
   @Test

jkube-kit/common/pom.xml

@@ -40,6 +40,11 @@
       <artifactId>openshift-client</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kubernetes-model-validator</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
@@ -133,7 +138,7 @@
     </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
-      <artifactId>openshift-server-mock</artifactId>
+      <artifactId>kubernetes-server-mock</artifactId>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
@@ -143,10 +148,6 @@
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.networknt</groupId>
-      <artifactId>json-schema-validator</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.marcnuri.helm-java</groupId>
       <artifactId>helm-java</artifactId>

jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/KubernetesHelper.java

@@ -840,7 +840,7 @@ public static Path exportKubernetesClientConfigToFile(io.fabric8.kubernetes.clie
             kubeConfigBuilder.addToContexts(kubernetesClientConfig.getCurrentContext());
             kubeConfigBuilder.withCurrentContext(kubernetesClientConfig.getCurrentContext().getName());
             kubeConfigBuilder.addToUsers(createKubeConfigUserFromClient(kubernetesClientConfig));
-            KubeConfigUtils.persistKubeConfigIntoFile(kubeConfigBuilder.build(), targetKubeConfig.toString());
+            KubeConfigUtils.persistKubeConfigIntoFile(kubeConfigBuilder.build(), targetKubeConfig.toFile());
             return targetKubeConfig;
         } catch (IOException ioException) {
             throw new JKubeException("Failure in exporting KubernetesClient config : " + ioException.getMessage());

jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/OpenshiftHelper.java

@@ -17,6 +17,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -53,7 +54,7 @@ public static boolean isOpenShift(KubernetesClient client) {
 
 
     public static KubernetesList processTemplatesLocally(Template entity, boolean failOnMissingParameterValue) {
-        List<HasMetadata> objects = null;
+        List<?> objects = null;
         if (entity != null) {
             objects = entity.getObjects();
             if (objects == null || objects.isEmpty()) {
@@ -86,7 +87,8 @@ public static KubernetesList processTemplatesLocally(Template entity, boolean fa
             return  Serialization.unmarshal(json, KubernetesList.class);
         } else {
             KubernetesList answer = new KubernetesList();
-            answer.setItems(objects);
+            Objects.requireNonNull(objects).stream().filter(o -> o instanceof HasMetadata)
+              .forEach(o -> answer.getItems().add((HasMetadata) o));
             return answer;
         }
     }
@@ -109,9 +111,9 @@ public static boolean isFinished(String status) {
     }
 
     public static Template combineTemplates(Template firstTemplate, Template template) {
-        List<HasMetadata> objects = template.getObjects();
+        List<?> objects = template.getObjects();
         if (objects != null) {
-            for (HasMetadata object : objects) {
+            for (Object object : objects) {
                 addTemplateObject(firstTemplate, object);
             }
         }
@@ -156,8 +158,8 @@ private static void combineParameters(List<Parameter> parameters, List<Parameter
         }
     }
 
-    private static void addTemplateObject(Template template, HasMetadata object) {
-        List<HasMetadata> objects = template.getObjects();
+    private static void addTemplateObject(Template template, Object object) {
+        List<Object> objects = template.getObjects();
         objects.add(object);
         template.setObjects(objects);
     }

jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/validator/IgnorePortValidationRule.java

@@ -13,27 +13,18 @@
  */
 package org.eclipse.jkube.kit.common.util.validator;
 
-import com.networknt.schema.ValidationMessage;
+import io.fabric8.kubernetes.schema.validator.ValidationMessage;
 
 /**
  * Model to represent ignore validation rules as tuple of json tree path and constraint ruleType
  * for resource descriptor validations
  */
 public class IgnorePortValidationRule implements ValidationRule {
 
-    private final String ruleType;
-
-    public IgnorePortValidationRule(String aRuleType) {
-        this.ruleType = aRuleType;
-    }
-
-    public String getType() {
-        return ruleType;
-    }
-
     @Override
-    public boolean ignore(ValidationMessage msg) {
-        return msg.getType().equalsIgnoreCase(TYPE) &&
-                msg.getMessage().contains(": integer found, object expected");
+    public boolean ignore(ValidationMessage validationMessage) {
+        return validationMessage.getLevel() == ValidationMessage.Level.ERROR &&
+          (validationMessage.getSchema() != null && validationMessage.getSchema().endsWith("/io.k8s.apimachinery.pkg.util.intstr.IntOrString")) &&
+          validationMessage.getMessage().matches(".+/(targetPort|port)'] Instance type \\(integer\\) does not match any allowed primitive type \\(allowed: \\[\\\"string\\\"\\]\\)$");
     }
 }