Merge pull request #178 from ContainerSolutions/dependabot/maven/io.fabric8-openshift-client-4.11.0

Bump openshift-client from 4.10.3 to 4.11.0

Author: adam-sandor

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

@@ -5,12 +5,13 @@
 import com.github.containersolutions.operator.processing.EventScheduler;
 import com.github.containersolutions.operator.processing.retry.GenericRetry;
 import com.github.containersolutions.operator.processing.retry.Retry;
-import io.fabric8.kubernetes.api.model.apiextensions.CustomResourceDefinition;
+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 org.slf4j.Logger;
@@ -54,8 +55,8 @@ public <R extends CustomResource> void registerController(ResourceController<R>
     private <R extends CustomResource> void registerController(ResourceController<R> controller,
                                                                boolean watchAllNamespaces, Retry retry, String... targetNamespaces) throws OperatorException {
         Class<R> resClass = getCustomResourceClass(controller);
-        CustomResourceDefinition crd = getCustomResourceDefinitionForController(controller);
-        KubernetesDeserializer.registerCustomKind(getApiVersion(crd), getKind(crd), resClass);
+        CustomResourceDefinitionContext crd = getCustomResourceDefinitionForController(controller);
+        KubernetesDeserializer.registerCustomKind(crd.getVersion(), crd.getKind(), resClass);
         String finalizer = getDefaultFinalizer(controller);
         MixedOperation client = k8sClient.customResources(crd, resClass, CustomResourceList.class, getCustomResourceDoneableClass(controller));
         EventDispatcher eventDispatcher = new EventDispatcher(controller,
@@ -85,13 +86,14 @@ private <R extends CustomResource> void registerWatches(ResourceController<R> co
                 resClass, targetNamespaces.length == 0 ? "[all/client namespace]" : Arrays.toString(targetNamespaces));
     }
 
-    private CustomResourceDefinition getCustomResourceDefinitionForController(ResourceController controller) {
+    private CustomResourceDefinitionContext getCustomResourceDefinitionForController(ResourceController controller) {
         String crdName = getCrdName(controller);
         CustomResourceDefinition customResourceDefinition = k8sClient.customResourceDefinitions().withName(crdName).get();
         if (customResourceDefinition == null) {
             throw new OperatorException("Cannot find Custom Resource Definition with name: " + crdName);
         }
-        return customResourceDefinition;
+        CustomResourceDefinitionContext context = CustomResourceDefinitionContext.fromCrd(customResourceDefinition);
+        return context;
     }
 
     public Map<Class<? extends CustomResource>, CustomResourceOperationsImpl> getCustomResourceClients() {

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

@@ -6,13 +6,14 @@
 import io.fabric8.kubernetes.api.model.Namespace;
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
-import io.fabric8.kubernetes.api.model.apiextensions.CustomResourceDefinition;
+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.Resource;
+import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,11 +42,12 @@ public void initialize(KubernetesClient k8sClient, ResourceController controller
         log.info("Initializing integration test in namespace {}", TEST_NAMESPACE);
         this.k8sClient = k8sClient;
         CustomResourceDefinition crd = loadCRDAndApplyToCluster(crdPath);
+        CustomResourceDefinitionContext crdContext = CustomResourceDefinitionContext.fromCrd(crd);
         this.controller = controller;
 
         Class doneableClass = getCustomResourceDoneableClass(controller);
         Class customResourceClass = getCustomResourceClass(controller);
-        crOperations = k8sClient.customResources(crd, customResourceClass, CustomResourceList.class, doneableClass);
+        crOperations = k8sClient.customResources(crdContext, customResourceClass, CustomResourceList.class, doneableClass);
 
         if (k8sClient.namespaces().withName(TEST_NAMESPACE).get() == null) {
             k8sClient.namespaces().create(new NamespaceBuilder()

pom.xml

@@ -46,7 +46,7 @@
             <dependency>
                 <groupId>io.fabric8</groupId>
                 <artifactId>openshift-client</artifactId>
-                <version>4.10.3</version>
+                <version>4.11.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>