using oc style resolving for openshift resources

fabric8io · Apr 2, 2022 · 0fb3068 · 0fb3068
1 parent b3ae5a7
commit 0fb3068
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/...netes-model-core/src/main/java/io/fabric8/kubernetes/internal/KubernetesDeserializer.java b/...netes-model-core/src/main/java/io/fabric8/kubernetes/internal/KubernetesDeserializer.java
@@ -251,7 +251,13 @@ private void internalLoadFromJandex(ClassLoader classLoader) throws IOException
               continue;
             }
             Class<? extends KubernetesResource> krClazz = (Class<? extends KubernetesResource>) clazz;
-            mappings.put(getKeyFromClass(krClazz), krClazz);
+            TypeKey keyFromClass = getKeyFromClass(krClazz);
+            mappings.put(keyFromClass, krClazz);
+
+            // oc behavior - allow resolving against just the version
+            if (keyFromClass.apiGroup != null && keyFromClass.apiGroup.endsWith(".openshift.io")) {
+              mappings.putIfAbsent(new TypeKey(keyFromClass.kind, null, keyFromClass.version), krClazz);
+            }
           }
         }
       }

diff --git a/...rnetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftLoadTest.java b/...rnetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftLoadTest.java
@@ -55,7 +55,7 @@ void testResourceGetFromLoadWhenSingleDocumentsWithoutDelimiter() {
     assertNotNull(result);
     assertEquals(1, result.size());
     HasMetadata deploymentResource = result.get(0);
-    assertEquals("template.openshift.io/v1", deploymentResource.getApiVersion());
+    assertEquals("v1", deploymentResource.getApiVersion());
     assertEquals("Pod", deploymentResource.getKind());
     assertEquals("example-pod", deploymentResource.getMetadata().getName());
   }

diff --git a/kubernetes-tests/src/test/resources/template-with-json-params.yml b/kubernetes-tests/src/test/resources/template-with-json-params.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-apiVersion: template.openshift.io/v1
+apiVersion: v1
 kind: Template
 metadata:
   name: example-template

diff --git a/kubernetes-tests/src/test/resources/template-with-multiple-objects.yml b/kubernetes-tests/src/test/resources/template-with-multiple-objects.yml
@@ -15,7 +15,7 @@
 #
 
 ---
-apiVersion: template.openshift.io/v1
+apiVersion: v1
 kind: Template
 metadata:
   name: foo

diff --git a/kubernetes-tests/src/test/resources/template-with-number-params.yml b/kubernetes-tests/src/test/resources/template-with-number-params.yml
@@ -15,7 +15,7 @@
 #
 
 ---
-apiVersion: template.openshift.io/v1
+apiVersion: v1
 kind: Template
 metadata:
   name: foo

diff --git a/kubernetes-tests/src/test/resources/template-with-params.yml b/kubernetes-tests/src/test/resources/template-with-params.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-apiVersion: template.openshift.io/v1
+apiVersion: v1
 kind: Template
 metadata:
   name: example-template

diff --git a/kubernetes-tests/src/test/resources/test-scc.yml b/kubernetes-tests/src/test/resources/test-scc.yml
@@ -16,7 +16,7 @@
 
 ---
 kind: SecurityContextConstraints
-apiVersion: security.openshift.io/v1
+apiVersion: v1
 metadata:
   name: scc-get
 allowPrivilegedContainer: true

diff --git a/kubernetes-tests/src/test/resources/test-template.yml b/kubernetes-tests/src/test/resources/test-template.yml
@@ -16,7 +16,7 @@
 
 ---
   kind: "Template"
-  apiVersion: "template.openshift.io/v1"
+  apiVersion: "v1"
   metadata: 
     annotations: 
       iconClass: "icon-jboss"