fix fabric8io#3993: further restricting / refining type resolution

doc/MIGRATION-v6.md

@@ -89,7 +89,13 @@ To use it, exclude the kubernetes-httpclient-okhttp dependency and add the kuber
 
 ## Deserialization Resolution
 
-The group on the object being deserialized is not required to match the prospective class - even for built-in types.  This prevents the unintentional parsing of custom types without a registered class as a built-in type of the same name.  This also means that you must ensure the apiVersion values are correct on the objects you are deserializing as they will no longer resolve to built-in type of the same name when there is a mistake.
+The apiVersion on an resource being deserialized is required.
+
+If a version only is specified as the apiVersion, it may match kubernetes built-in types with an empty group (for example Pod), or OpenShift built in types (for example kind: Template apiVersion: v1 is allowed to match apiVersion: template.openshift.io/v1).
+
+Otherwise with group and version specified, the resource match uniquely with a class.  This prevents the unintentional parsing of custom types without a registered class as a built-in type of the same name.  
+
+This means that you must ensure the apiVersion values are correct on the objects you are deserializing as they will no longer resolve to built-in type of the same name when there is a mistake.
 
 ## Deprecation Removals
 

kubernetes-itests/src/test/resources/replicationcontroller-it.yml

@@ -16,6 +16,7 @@
 
 ---
 kind: ReplicationController
+apiVersion: v1
 metadata:
   name: rc-get
 spec:
@@ -35,6 +36,7 @@ spec:
             - containerPort: 80
 ---
 kind: ReplicationController
+apiVersion: v1
 metadata:
   name: rc-list
 spec:
@@ -54,6 +56,7 @@ spec:
             - containerPort: 80
 ---
 kind: ReplicationController
+apiVersion: v1
 metadata:
   name: rc-update
 spec:
@@ -73,6 +76,7 @@ spec:
             - containerPort: 80
 ---
 kind: ReplicationController
+apiVersion: v1
 metadata:
   name: rc-delete
 spec:

kubernetes-itests/src/test/resources/secret-it.yml

@@ -15,7 +15,7 @@
 #
 
 ---
-apiversion: v1
+apiVersion: v1
 kind: Secret
 metadata:
   name: secret-get
@@ -24,7 +24,7 @@ data:
   username: "guccifer"
   password: "shadowgovernment"
 ---
-apiversion: v1
+apiVersion: v1
 kind: Secret
 metadata:
   name: secret-list
@@ -33,7 +33,7 @@ data:
   username: "guccifer"
   password: "shadowgovernment"
 ---
-apiversion: v1
+apiVersion: v1
 kind: Secret
 metadata:
   name: secret-update
@@ -42,7 +42,7 @@ data:
   username: "guccifer"
   password: "shadowgovernment"
 ---
-apiversion: v1
+apiVersion: v1
 kind: Secret
 metadata:
   name: secret-delete

kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/internal/KubernetesDeserializer.java

@@ -282,8 +282,10 @@ public Class<? extends KubernetesResource> getForKey(TypeKey key) {
                     }
                     bestMatch = typeKey;
                     break;
+                } else if (typeKey.apiGroup != null && !typeKey.apiGroup.endsWith(".openshift.io")) {
+                    continue;
                 }
-                if (key.version != null && key.version.equals(typeKey.apiGroup)) {
+                if (key.version != null && key.version.equals(typeKey.version)) {
                     bestMatch = typeKey;
                     break;
                 }

kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/DeploymentTest.java

@@ -708,21 +708,6 @@ void testDeploymentGetLogMultiContainer() {
     assertEquals("hello", log);
   }
 
-  @Test
-  void testDeploymentLoadWithoutApiVersion() {
-    // Given
-
-    // When
-    List<HasMetadata> list = client.load(getClass().getResourceAsStream("/valid-deployment-without-apiversion.json")).get();
-    Deployment deployment = (Deployment) list.get(0);
-
-    // Then
-    assertNotNull(deployment);
-    assertEquals("test", deployment.getMetadata().getName());
-    assertEquals(1, deployment.getSpec().getReplicas());
-    assertEquals(1, deployment.getSpec().getTemplate().getSpec().getContainers().size());
-  }
-
   private DeploymentBuilder createDeploymentBuilder() {
     return new DeploymentBuilder()
       .withNewMetadata()

kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/NetworkingV1IngressTest.java

@@ -181,19 +181,6 @@ void testCreateWithNameMismatch() {
     Assertions.assertThrows(KubernetesClientException.class, () -> ingressOp.create(ingress1));
   }
 
-  @Test
-  void testIngressLoadWithoutApiVersion() {
-    // Given
-
-    // When
-    List<HasMetadata> items = client.load(getClass().getResourceAsStream("/test-ingress-no-apiversion.yml")).get();
-
-    // Then
-    assertNotNull(items);
-    assertEquals(1, items.size());
-    assertTrue(items.get(0) instanceof io.fabric8.kubernetes.api.model.networking.v1.Ingress);
-  }
-
   @Test
   void testCreateOrReplaceWhenAnnotationUpdated() {
     // Given

kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/NetworkingV1beta1IngressTest.java

@@ -178,19 +178,6 @@ void testCreateWithNameMismatch() {
     });
   }
 
-  @Test
-  void testIngressLoadWithoutApiVersion() {
-    // Given
-
-    // When
-    List<HasMetadata> items = client.load(getClass().getResourceAsStream("/test-ingress-no-apiversion.yml")).get();
-
-    // Then
-    assertNotNull(items);
-    assertEquals(1, items.size());
-    assertTrue(items.get(0) instanceof io.fabric8.kubernetes.api.model.networking.v1.Ingress);
-  }
-
   @Test
   void testCreateOrReplaceWhenAnnotationUpdated() {
     // Given

kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1CustomResourceDefinitionTest.java

@@ -25,7 +25,6 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -120,17 +119,6 @@ void testDelete() {
     assertTrue(deleted);
   }
 
-  @Test
-  void testCustomResourceDefinitionTest() {
-    // When
-    List<HasMetadata> items = client.load(getClass().getResourceAsStream("/test-crd-no-apiversion.yml")).get();
-
-    // Then
-    Assertions.assertNotNull(items);
-    Assertions.assertEquals(1, items.size());
-    Assertions.assertTrue(items.get(0) instanceof CustomResourceDefinition);
-  }
-
   JSONSchemaProps readSchema() throws IOException {
     ObjectMapper mapper = new ObjectMapper();
     final URL resource = getClass().getResource("/test-crd-validation-schema.json");

kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1HorizontalPodAutoscalerTest.java

@@ -189,17 +189,4 @@ void testBuild() {
     assertNotNull(horizontalPodAutoscaler);
   }
 
-  @Test
-  void testHorizontalPodAutoscalerLoadWithNoApiVersion() {
-    // Given
-
-    // When
-    List<HasMetadata> items = client.load(getClass().getResourceAsStream("/test-hpa-no-apiversion.yml")).get();
-
-    // Then
-    assertNotNull(items);
-    assertEquals(1, items.size());
-    assertTrue(items.get(0) instanceof HorizontalPodAutoscaler);
-  }
-
 }

kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1MutatingWebhookConfigurationTest.java

@@ -26,8 +26,6 @@
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
 import org.junit.jupiter.api.Test;
 
-import java.util.List;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -101,19 +99,6 @@ public void delete() {
     assertTrue(isDeleted);
   }
 
-  @Test
-  void testMutatingWebhookConfigurationLoadWithNoApiVersion() {
-    // Given
-
-    // When
-    List<HasMetadata> items = client.load(getClass().getResourceAsStream("/test-mwc-no-apiversion.yml")).get();
-
-    // Then
-    assertNotNull(items);
-    assertEquals(1, items.size());
-    assertTrue(items.get(0) instanceof MutatingWebhookConfiguration);
-  }
-
   public MutatingWebhookConfiguration getMutatingWebhookConfigurationSample() {
     return new MutatingWebhookConfigurationBuilder()
       .withNewMetadata().withName("mutatingWebhookConfiguration1").endMetadata()

kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1ValidatingWebhookConfigurationTest.java

@@ -26,8 +26,6 @@
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
 import org.junit.jupiter.api.Test;
 
-import java.util.List;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -110,18 +108,6 @@ public void delete() {
     assertTrue(isDeleted);
   }
 
-  @Test
-  void testValidatingWebhookConfigurationLoadWithNoApiVersion() {
-
-    // When
-    List<HasMetadata> items = client.load(getClass().getResourceAsStream("/test-vwc-no-apiversion.yml")).get();
-
-    // Then
-    assertNotNull(items);
-    assertEquals(1, items.size());
-    assertTrue(items.get(0) instanceof ValidatingWebhookConfiguration);
-  }
-
   public ValidatingWebhookConfiguration getValidatingWebhookConfigurationSample() {
     return new ValidatingWebhookConfigurationBuilder()
       .withNewMetadata().withName("validatingWebhookConfiguration1").endMetadata()

kubernetes-tests/src/test/resources/test-cronjob.yml

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-apiVersion: batch/v2alpha1
+apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: pi