Skip to content

Commit 01ac401

Browse files
committed
fix classes moved to new packages and deprecated methods
1 parent 6cee36b commit 01ac401

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
import com.github.containersolutions.operator.processing.EventScheduler;
66
import com.github.containersolutions.operator.processing.retry.GenericRetry;
77
import com.github.containersolutions.operator.processing.retry.Retry;
8-
import io.fabric8.kubernetes.api.model.apiextensions.CustomResourceDefinition;
8+
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
99
import io.fabric8.kubernetes.client.CustomResource;
1010
import io.fabric8.kubernetes.client.CustomResourceDoneable;
1111
import io.fabric8.kubernetes.client.CustomResourceList;
1212
import io.fabric8.kubernetes.client.KubernetesClient;
1313
import io.fabric8.kubernetes.client.dsl.MixedOperation;
14+
import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
1415
import io.fabric8.kubernetes.client.dsl.internal.CustomResourceOperationsImpl;
1516
import io.fabric8.kubernetes.internal.KubernetesDeserializer;
1617
import org.slf4j.Logger;
@@ -54,8 +55,8 @@ public <R extends CustomResource> void registerController(ResourceController<R>
5455
private <R extends CustomResource> void registerController(ResourceController<R> controller,
5556
boolean watchAllNamespaces, Retry retry, String... targetNamespaces) throws OperatorException {
5657
Class<R> resClass = getCustomResourceClass(controller);
57-
CustomResourceDefinition crd = getCustomResourceDefinitionForController(controller);
58-
KubernetesDeserializer.registerCustomKind(getApiVersion(crd), getKind(crd), resClass);
58+
CustomResourceDefinitionContext crd = getCustomResourceDefinitionForController(controller);
59+
KubernetesDeserializer.registerCustomKind(crd.getVersion(), crd.getKind(), resClass);
5960
String finalizer = getDefaultFinalizer(controller);
6061
MixedOperation client = k8sClient.customResources(crd, resClass, CustomResourceList.class, getCustomResourceDoneableClass(controller));
6162
EventDispatcher eventDispatcher = new EventDispatcher(controller,
@@ -85,13 +86,14 @@ private <R extends CustomResource> void registerWatches(ResourceController<R> co
8586
resClass, targetNamespaces.length == 0 ? "[all/client namespace]" : Arrays.toString(targetNamespaces));
8687
}
8788

88-
private CustomResourceDefinition getCustomResourceDefinitionForController(ResourceController controller) {
89+
private CustomResourceDefinitionContext getCustomResourceDefinitionForController(ResourceController controller) {
8990
String crdName = getCrdName(controller);
9091
CustomResourceDefinition customResourceDefinition = k8sClient.customResourceDefinitions().withName(crdName).get();
9192
if (customResourceDefinition == null) {
9293
throw new OperatorException("Cannot find Custom Resource Definition with name: " + crdName);
9394
}
94-
return customResourceDefinition;
95+
CustomResourceDefinitionContext context = CustomResourceDefinitionContext.fromCrd(customResourceDefinition);
96+
return context;
9597
}
9698

9799
public Map<Class<? extends CustomResource>, CustomResourceOperationsImpl> getCustomResourceClients() {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
import io.fabric8.kubernetes.api.model.Namespace;
77
import io.fabric8.kubernetes.api.model.NamespaceBuilder;
88
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
9-
import io.fabric8.kubernetes.api.model.apiextensions.CustomResourceDefinition;
9+
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
1010
import io.fabric8.kubernetes.client.CustomResource;
1111
import io.fabric8.kubernetes.client.CustomResourceDoneable;
1212
import io.fabric8.kubernetes.client.CustomResourceList;
1313
import io.fabric8.kubernetes.client.KubernetesClient;
1414
import io.fabric8.kubernetes.client.dsl.MixedOperation;
1515
import io.fabric8.kubernetes.client.dsl.Resource;
16+
import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
1617
import io.fabric8.kubernetes.client.utils.Serialization;
1718
import org.slf4j.Logger;
1819
import org.slf4j.LoggerFactory;
@@ -41,11 +42,12 @@ public void initialize(KubernetesClient k8sClient, ResourceController controller
4142
log.info("Initializing integration test in namespace {}", TEST_NAMESPACE);
4243
this.k8sClient = k8sClient;
4344
CustomResourceDefinition crd = loadCRDAndApplyToCluster(crdPath);
45+
CustomResourceDefinitionContext crdContext = CustomResourceDefinitionContext.fromCrd(crd);
4446
this.controller = controller;
4547

4648
Class doneableClass = getCustomResourceDoneableClass(controller);
4749
Class customResourceClass = getCustomResourceClass(controller);
48-
crOperations = k8sClient.customResources(crd, customResourceClass, CustomResourceList.class, doneableClass);
50+
crOperations = k8sClient.customResources(crdContext, customResourceClass, CustomResourceList.class, doneableClass);
4951

5052
if (k8sClient.namespaces().withName(TEST_NAMESPACE).get() == null) {
5153
k8sClient.namespaces().create(new NamespaceBuilder()

0 commit comments

Comments
 (0)