impl basic backwards compatible

Author: csviri

operator-framework/src/main/java/com/github/containersolutions/operator/ControllerUtils.java

@@ -6,6 +6,8 @@
 import io.fabric8.kubernetes.client.CustomResourceDoneable;
 import io.fabric8.kubernetes.client.CustomResourceList;
 
+import java.util.Optional;
+
 class ControllerUtils {
 
     public static final String GROUP_API_DELIMITER = "/";
@@ -22,16 +24,23 @@ static String getApiVersion(ResourceController controller) {
         return getGroup(controller) + GROUP_API_DELIMITER + getAnnotation(controller).version();
     }
 
-
     static String getVersion(ResourceController controller) {
         return getAnnotation(controller).version();
     }
 
+    static Optional<String> getCrdName(ResourceController controller) {
+        String crdName = getAnnotation(controller).crdName();
+        if (crdName.isEmpty()) {
+            return Optional.empty();
+        } else {
+            return Optional.of(crdName);
+        }
+    }
+
     static String getKind(ResourceController controller) {
         return getAnnotation(controller).kind();
     }
 
-
     static <R extends CustomResource> Class<? extends CustomResourceList<R>> getCustomResourceListClass(ResourceController controller) {
         return (Class<? extends CustomResourceList<R>>) getAnnotation(controller).customResourceListClass();
     }
@@ -40,10 +49,10 @@ static <R extends CustomResource> Class<? extends CustomResourceDoneable<R>> get
         return (Class<? extends CustomResourceDoneable<R>>) getAnnotation(controller).customResourceDonebaleClass();
     }
 
-
     private static String getGroup(ResourceController controller) {
         return getAnnotation(controller).group();
     }
+
     private static Controller getAnnotation(ResourceController controller) {
         return controller.getClass().getAnnotation(Controller.class);
     }

operator-framework/src/main/java/com/github/containersolutions/operator/Operator.java

@@ -84,12 +84,16 @@ private <R extends CustomResource> void registerWatches(ResourceController<R> co
     }
 
     private Optional<CustomResourceDefinition> getCustomResourceDefinitionForController(ResourceController controller) {
-        CustomResourceDefinitionList crdList = k8sClient.customResourceDefinitions().list();
-
-        return crdList.getItems().stream()
-                .filter(c -> getKind(controller).equals(c.getSpec().getNames().getKind()) &&
-                        getVersion(controller).equals(c.getSpec().getVersion()))
-                .findFirst();
+        Optional<String> crdName = getCrdName(controller);
+        if (crdName.isPresent()) {
+            return Optional.ofNullable(k8sClient.customResourceDefinitions().withName(crdName.get()).get());
+        } else {
+            CustomResourceDefinitionList crdList = k8sClient.customResourceDefinitions().list();
+            return crdList.getItems().stream()
+                    .filter(c -> getKind(controller).equals(c.getSpec().getNames().getKind()) &&
+                            getVersion(controller).equals(c.getSpec().getVersion()))
+                    .findFirst();
+        }
     }
 
     public Map<Class<? extends CustomResource>, CustomResourceOperationsImpl> getCustomResourceClients() {

operator-framework/src/main/java/com/github/containersolutions/operator/api/Controller.java

@@ -19,6 +19,8 @@
 
     String version() default DEFAULT_VERSION;
 
+    String crdName() default "";
+
     String group();
 
     String kind();

operator-framework/src/test/java/com/github/containersolutions/operator/ControllerUtilsTest.java

@@ -8,6 +8,7 @@
 
 import static com.github.containersolutions.operator.api.Controller.DEFAULT_FINALIZER;
 import static com.github.containersolutions.operator.api.Controller.DEFAULT_VERSION;
+import static com.github.containersolutions.operator.sample.TestCustomResourceController.CRD_NAME;
 import static com.github.containersolutions.operator.sample.TestCustomResourceController.TEST_GROUP;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -22,6 +23,7 @@ public void returnsValuesFromControllerAnnotationFinalizer() {
         assertEquals(TestCustomResource.class, ControllerUtils.getCustomResourceClass(new TestCustomResourceController()));
         assertEquals(TestCustomResourceDoneable.class, ControllerUtils.getCustomResourceDonebaleClass(new TestCustomResourceController()));
         assertEquals(TestCustomResourceList.class, ControllerUtils.getCustomResourceListClass(new TestCustomResourceController()));
+        assertEquals(CRD_NAME, ControllerUtils.getCrdName(new TestCustomResourceController()).get());
     }
 
-}
+}

operator-framework/src/test/java/com/github/containersolutions/operator/sample/TestCustomResourceController.java

@@ -7,6 +7,7 @@
 import java.util.Optional;
 
 @Controller(
+        crdName = TestCustomResourceController.CRD_NAME,
         group = TestCustomResourceController.TEST_GROUP,
         kind = TestCustomResourceController.KIND_NAME,
         customResourceClass = TestCustomResource.class,
@@ -16,6 +17,7 @@ public class TestCustomResourceController implements ResourceController<TestCust
 
     public static final String KIND_NAME = "customResourceDefinition";
     public static final String TEST_GROUP = "test.group";
+    public static final String CRD_NAME = "crdName";
 
     @Override
     public boolean deleteResource(TestCustomResource resource, Context<TestCustomResource> context) {

samples/basic/common/src/main/java/com/github/containersolutions/operator/sample/CustomServiceController.java

@@ -15,6 +15,7 @@
  * A very simple sample controller that creates a service with a label.
  */
 @Controller(customResourceClass = CustomService.class,
+        crdName = "customservices.sample.javaoperatorsdk",
         kind = CustomServiceController.KIND,
         group = CustomServiceController.GROUP,
         customResourceListClass = CustomServiceList.class,