feat: initial upgrade of client to 5.0.0 and quarkus to 1.11.0.CR1

Quarkus 1.11.0.CR1 is the first version to use Fabric8's client 5.0 so
we need to update both at the same time. Note that tests are not
expected to pass at this point yet.

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java

@@ -2,13 +2,11 @@
 
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
 import io.fabric8.kubernetes.client.CustomResource;
-import io.fabric8.kubernetes.client.CustomResourceDoneable;
 import io.fabric8.kubernetes.client.CustomResourceList;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
 import io.fabric8.kubernetes.client.dsl.internal.CustomResourceOperationsImpl;
-import io.fabric8.kubernetes.internal.KubernetesDeserializer;
 import io.javaoperatorsdk.operator.api.ResourceController;
 import io.javaoperatorsdk.operator.api.config.ConfigurationService;
 import io.javaoperatorsdk.operator.processing.CustomResourceCache;
@@ -76,12 +74,10 @@ private <R extends CustomResource> void registerController(
       throws OperatorException {
     final var configuration = configurationService.getConfigurationFor(controller);
     Class<R> resClass = configuration.getCustomResourceClass();
-    CustomResourceDefinitionContext crd = getCustomResourceDefinitionForController(controller);
-    KubernetesDeserializer.registerCustomKind(crd.getVersion(), crd.getKind(), resClass);
+    /*CustomResourceDefinitionContext crd = getCustomResourceDefinitionForController(controller);
+    KubernetesDeserializer.registerCustomKind(crd.getVersion(), crd.getKind(), resClass);*/
     String finalizer = configuration.getFinalizer();
-    MixedOperation client =
-        k8sClient.customResources(
-            crd, resClass, CustomResourceList.class, configuration.getDoneableClass());
+    MixedOperation client = k8sClient.customResources(resClass);
     EventDispatcher eventDispatcher =
         new EventDispatcher(
             controller, finalizer, new EventDispatcher.CustomResourceFacade(client));
@@ -156,11 +152,8 @@ private CustomResourceDefinitionContext getCustomResourceDefinitionForController
     return customResourceClients;
   }
 
-  public <
-          T extends CustomResource,
-          L extends CustomResourceList<T>,
-          D extends CustomResourceDoneable<T>>
-      CustomResourceOperationsImpl<T, L, D> getCustomResourceClients(Class<T> customResourceClass) {
+  public <T extends CustomResource, L extends CustomResourceList<T>>
+      CustomResourceOperationsImpl<T, L> getCustomResourceClients(Class<T> customResourceClass) {
     return customResourceClients.get(customResourceClass);
   }
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/Controller.java

@@ -11,8 +11,6 @@
 
   String NULL = "";
 
-  String crdName();
-
   String name() default NULL;
 
   /**

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfiguration.java

@@ -1,7 +1,6 @@
 package io.javaoperatorsdk.operator.api.config;
 
 import io.fabric8.kubernetes.client.CustomResource;
-import io.fabric8.kubernetes.client.CustomResourceDoneable;
 import java.util.Collections;
 import java.util.Set;
 
@@ -19,8 +18,6 @@ public interface ControllerConfiguration<R extends CustomResource> {
 
   Class<R> getCustomResourceClass();
 
-  Class<? extends CustomResourceDoneable<R>> getDoneableClass();
-
   String getAssociatedControllerClassName();
 
   default boolean isClusterScoped() {

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/EventDispatcher.java

@@ -191,10 +191,9 @@ private void addFinalizerIfNotPresent(CustomResource resource) {
   // created to support unit testing
   public static class CustomResourceFacade {
 
-    private final MixedOperation<?, ?, ?, Resource<CustomResource, ?>> resourceOperation;
+    private final MixedOperation<?, ?, Resource<CustomResource>> resourceOperation;
 
-    public CustomResourceFacade(
-        MixedOperation<?, ?, ?, Resource<CustomResource, ?>> resourceOperation) {
+    public CustomResourceFacade(MixedOperation<?, ?, Resource<CustomResource>> resourceOperation) {
       this.resourceOperation = resourceOperation;
     }
 

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceEventSource.java

@@ -3,11 +3,10 @@
 import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;
 import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getVersion;
 import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.markedForDeletion;
-import static java.net.HttpURLConnection.HTTP_GONE;
 
 import io.fabric8.kubernetes.client.CustomResource;
-import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.internal.CustomResourceOperationsImpl;
 import io.javaoperatorsdk.operator.ControllerUtils;
@@ -151,11 +150,11 @@ public void eventSourceDeRegisteredForResource(String customResourceUid) {
   }
 
   @Override
-  public void onClose(KubernetesClientException e) {
+  public void onClose(WatcherException e) {
     if (e == null) {
       return;
     }
-    if (e.getCode() == HTTP_GONE) {
+    if (e.isHttpGone()) {
       log.warn("Received error for watch, will try to reconnect.", e);
       registerWatch();
     } else {

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomResource.java

@@ -1,38 +1,10 @@
 package io.javaoperatorsdk.operator.sample.simple;
 
 import io.fabric8.kubernetes.client.CustomResource;
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.Version;
 
-public class TestCustomResource extends CustomResource {
-
-  private TestCustomResourceSpec spec;
-
-  private TestCustomResourceStatus status;
-
-  public TestCustomResourceSpec getSpec() {
-    return spec;
-  }
-
-  public void setSpec(TestCustomResourceSpec spec) {
-    this.spec = spec;
-  }
-
-  public TestCustomResourceStatus getStatus() {
-    return status;
-  }
-
-  public void setStatus(TestCustomResourceStatus status) {
-    this.status = status;
-  }
-
-  @Override
-  public String toString() {
-    return "TestCustomResource{"
-        + "spec="
-        + spec
-        + ", status="
-        + status
-        + ", extendedFrom="
-        + super.toString()
-        + '}';
-  }
-}
+@Group("sample.javaoperatorsdk.io")
+@Version("v1")
+public class TestCustomResource
+    extends CustomResource<TestCustomResourceSpec, TestCustomResourceStatus> {}

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomResourceController.java

@@ -3,6 +3,7 @@
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.api.Context;
 import io.javaoperatorsdk.operator.api.Controller;
@@ -14,12 +15,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Controller(generationAwareEventProcessing = false, crdName = TestCustomResourceController.CRD_NAME)
+@Controller(generationAwareEventProcessing = false)
 public class TestCustomResourceController implements ResourceController<TestCustomResource> {
 
   private static final Logger log = LoggerFactory.getLogger(TestCustomResourceController.class);
 
-  public static final String CRD_NAME = "customservices.sample.javaoperatorsdk";
+  public static final String CRD_NAME = CustomResource.getCRDName(TestCustomResource.class);
   public static final String FINALIZER_NAME = CRD_NAME + "/finalizer";
 
   private final KubernetesClient kubernetesClient;

operator-framework-quarkus-extension/deployment/src/main/java/io/javaoperatorsdk/quarkus/extension/deployment/QuarkusExtensionProcessor.java

@@ -1,7 +1,6 @@
 package io.javaoperatorsdk.quarkus.extension.deployment;
 
 import io.fabric8.kubernetes.client.CustomResource;
-import io.fabric8.kubernetes.client.CustomResourceDoneable;
 import io.javaoperatorsdk.operator.ControllerUtils;
 import io.javaoperatorsdk.operator.api.Controller;
 import io.javaoperatorsdk.operator.api.ResourceController;
@@ -13,21 +12,14 @@
 import io.javaoperatorsdk.quarkus.extension.QuarkusControllerConfiguration;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
-import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
 import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import io.quarkus.gizmo.ClassCreator;
-import io.quarkus.gizmo.ClassOutput;
-import io.quarkus.gizmo.MethodCreator;
-import io.quarkus.gizmo.MethodDescriptor;
-import java.lang.reflect.Modifier;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -66,21 +58,19 @@ void indexSDKDependencies(BuildProducer<IndexDependencyBuildItem> indexDependenc
   @Record(ExecutionTime.STATIC_INIT)
   void createConfigurationServiceAndOperator(
       CombinedIndexBuildItem combinedIndexBuildItem,
-      BuildProducer<GeneratedClassBuildItem> generatedClass,
       BuildProducer<SyntheticBeanBuildItem> syntheticBeanBuildItemBuildProducer,
       BuildProducer<AdditionalBeanBuildItem> additionalBeans,
       BuildProducer<ReflectiveClassBuildItem> reflectionClasses,
       ConfigurationServiceRecorder recorder) {
     final var index = combinedIndexBuildItem.getIndex();
     final var resourceControllers = index.getAllKnownImplementors(RESOURCE_CONTROLLER);
 
-    final var classOutput = new GeneratedClassGizmoAdaptor(generatedClass, true);
     final List<ControllerConfiguration> controllerConfigs =
         resourceControllers.stream()
             .map(
                 ci ->
                     createControllerConfiguration(
-                        ci, classOutput, additionalBeans, reflectionClasses))
+                        ci, additionalBeans, reflectionClasses))
             .collect(Collectors.toList());
 
     final var supplier = recorder.configurationServiceSupplier(controllerConfigs);
@@ -96,9 +86,7 @@ void createConfigurationServiceAndOperator(
   }
 
   private ControllerConfiguration createControllerConfiguration(
-      ClassInfo info,
-      ClassOutput classOutput,
-      BuildProducer<AdditionalBeanBuildItem> additionalBeans,
+      ClassInfo info, BuildProducer<AdditionalBeanBuildItem> additionalBeans,
       BuildProducer<ReflectiveClassBuildItem> reflectionClasses) {
     // first retrieve the custom resource class
     final var rcInterface =
@@ -115,33 +103,6 @@ private ControllerConfiguration createControllerConfiguration(
     final var resourceControllerClassName = info.name().toString();
     additionalBeans.produce(AdditionalBeanBuildItem.unremovableOf(resourceControllerClassName));
 
-    // generate associated Doneable class
-    final var doneableClassName = crType + "Doneable";
-    final var crDoneableClassName = CustomResourceDoneable.class.getName();
-    try (ClassCreator cc =
-        ClassCreator.builder()
-            .signature(
-                String.format(
-                    "Lio/fabric8/kubernetes/client/CustomResourceDoneable<L%s;>;",
-                    crType.replace('.', '/')))
-            .classOutput(classOutput)
-            .className(doneableClassName)
-            .superClass(crDoneableClassName)
-            .build()) {
-
-      final var functionName = io.fabric8.kubernetes.api.builder.Function.class.getName();
-      MethodCreator ctor =
-          cc.getMethodCreator("<init>", void.class.getName(), crType, functionName);
-      ctor.setModifiers(Modifier.PUBLIC);
-      ctor.invokeSpecialMethod(
-          MethodDescriptor.ofConstructor(
-              crDoneableClassName, CustomResource.class.getName(), functionName),
-          ctor.getThis(),
-          ctor.getMethodParam(0),
-          ctor.getMethodParam(1));
-      ctor.returnValue(null);
-    }
-
     // generate configuration
     final var controllerAnnotation = info.classAnnotation(CONTROLLER);
     if (controllerAnnotation == null) {
@@ -158,9 +119,8 @@ private ControllerConfiguration createControllerConfiguration(
     // register CR class for introspection
     reflectionClasses.produce(new ReflectiveClassBuildItem(true, true, crClass));
 
-    final var crdName =
-        valueOrDefault(
-            controllerAnnotation, "crdName", AnnotationValue::asString, EXCEPTION_SUPPLIER);
+    // retrieve CRD name from CR type
+    final var crdName = CustomResource.getCRDName(crClass);
 
     // create the configuration
     final var configuration =
@@ -192,7 +152,6 @@ private ControllerConfiguration createControllerConfiguration(
                     AnnotationValue::asStringArray,
                     () -> new String[] {})),
             crType,
-            doneableClassName,
             null // todo: fix-me
             );
 

operator-framework-quarkus-extension/pom.xml

@@ -19,7 +19,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <maven.compiler.parameters>true</maven.compiler.parameters>
-    <quarkus.version>1.10.5.Final</quarkus.version>
+    <quarkus.version>1.11.0.CR1</quarkus.version>
     <compiler-plugin.version>3.8.1</compiler-plugin.version>
     <maven.surefire.version>3.0.0-M5</maven.surefire.version>
   </properties>

operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/QuarkusControllerConfiguration.java

@@ -1,7 +1,6 @@
 package io.javaoperatorsdk.quarkus.extension;
 
 import io.fabric8.kubernetes.client.CustomResource;
-import io.fabric8.kubernetes.client.CustomResourceDoneable;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.config.RetryConfiguration;
 import io.quarkus.runtime.annotations.RecordableConstructor;
@@ -18,7 +17,6 @@ public class QuarkusControllerConfiguration<R extends CustomResource>
   private final boolean clusterScoped;
   private final Set<String> namespaces;
   private final String crClass;
-  private final String doneableClassName;
   private final boolean watchAllNamespaces;
   private final RetryConfiguration retryConfiguration;
 
@@ -32,7 +30,6 @@ public QuarkusControllerConfiguration(
       boolean clusterScoped,
       Set<String> namespaces,
       String crClass,
-      String doneableClassName,
       RetryConfiguration retryConfiguration) {
     this.associatedControllerClassName = associatedControllerClassName;
     this.name = name;
@@ -42,7 +39,6 @@ public QuarkusControllerConfiguration(
     this.clusterScoped = clusterScoped;
     this.namespaces = namespaces;
     this.crClass = crClass;
-    this.doneableClassName = doneableClassName;
     this.watchAllNamespaces = this.namespaces.contains(WATCH_ALL_NAMESPACES_MARKER);
     this.retryConfiguration =
         retryConfiguration == null
@@ -66,11 +62,6 @@ public String getCrClass() {
     return crClass;
   }
 
-  // Needed for Quarkus to find the associated constructor parameter
-  public String getDoneableClassName() {
-    return doneableClassName;
-  }
-
   @Override
   public String getName() {
     return name;
@@ -96,11 +87,6 @@ public Class<R> getCustomResourceClass() {
     return (Class<R>) loadClass(crClass);
   }
 
-  @Override
-  public Class<? extends CustomResourceDoneable<R>> getDoneableClass() {
-    return (Class<? extends CustomResourceDoneable<R>>) loadClass(doneableClassName);
-  }
-
   private Class<?> loadClass(String className) {
     try {
       return Thread.currentThread().getContextClassLoader().loadClass(className);

operator-framework-quarkus-extension/tests/src/main/java/io/javaoperatorsdk/quarkus/it/TestController.java

@@ -6,10 +6,9 @@
 import io.javaoperatorsdk.operator.api.ResourceController;
 import io.javaoperatorsdk.operator.api.UpdateControl;
 
-@Controller(crdName = TestController.CRD_NAME, name = TestController.NAME)
+@Controller(name = TestController.NAME)
 public class TestController implements ResourceController<TestResource> {
   public static final String NAME = "test";
-  public static final String CRD_NAME = "test.example.com";
 
   @Override
   public DeleteControl deleteResource(TestResource resource, Context<TestResource> context) {

operator-framework-quarkus-extension/tests/src/main/java/io/javaoperatorsdk/quarkus/it/TestResource.java

@@ -1,5 +1,9 @@
 package io.javaoperatorsdk.quarkus.it;
 
 import io.fabric8.kubernetes.client.CustomResource;
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.Version;
 
+@Group("example.com")
+@Version("v1")
 public class TestResource extends CustomResource {}

operator-framework-quarkus-extension/tests/src/test/java/io/javaoperatorsdk/quarkus/it/QuarkusExtensionProcessorTest.java

@@ -49,8 +49,6 @@ void configurationForControllerShouldExist() {
         .statusCode(200)
         .body(
             "customResourceClass", equalTo(resourceName),
-            "doneableClass", equalTo(resourceName + "Doneable"),
-            "name", equalTo(TestController.NAME),
-            "crdName", equalTo(TestController.CRD_NAME));
+            "name", equalTo(TestController.NAME));
   }
 }