Skip to content

Commit 12aeacc

Browse files
committed
Update package and group name
1 parent 5fab7c6 commit 12aeacc

File tree

81 files changed

+34
-36
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+34
-36
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.github.containersolutions.operator;
1+
package io.javaoperatorsdk.operator;
22

3-
import com.github.containersolutions.operator.api.Controller;
4-
import com.github.containersolutions.operator.api.ResourceController;
3+
import io.javaoperatorsdk.operator.api.Controller;
4+
import io.javaoperatorsdk.operator.api.ResourceController;
55
import io.fabric8.kubernetes.api.builder.Function;
66
import io.fabric8.kubernetes.client.CustomResource;
77
import io.fabric8.kubernetes.client.CustomResourceDoneable;

operator-framework/src/main/java/com/github/containersolutions/operator/Operator.java renamed to operator-framework/src/main/java/io/javaoperatorsdk/operator/Operator.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.github.containersolutions.operator;
1+
package io.javaoperatorsdk.operator;
22

3-
import com.github.containersolutions.operator.api.ResourceController;
4-
import com.github.containersolutions.operator.processing.EventDispatcher;
5-
import com.github.containersolutions.operator.processing.EventScheduler;
6-
import com.github.containersolutions.operator.processing.retry.GenericRetry;
7-
import com.github.containersolutions.operator.processing.retry.Retry;
3+
import io.javaoperatorsdk.operator.api.ResourceController;
4+
import io.javaoperatorsdk.operator.processing.EventDispatcher;
5+
import io.javaoperatorsdk.operator.processing.EventScheduler;
6+
import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
7+
import io.javaoperatorsdk.operator.processing.retry.Retry;
88
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
99
import io.fabric8.kubernetes.client.CustomResource;
1010
import io.fabric8.kubernetes.client.CustomResourceDoneable;
@@ -21,8 +21,6 @@
2121
import java.util.HashMap;
2222
import java.util.Map;
2323

24-
import static com.github.containersolutions.operator.ControllerUtils.*;
25-
2624
@SuppressWarnings("rawtypes")
2725
public class Operator {
2826

@@ -54,11 +52,11 @@ public <R extends CustomResource> void registerController(ResourceController<R>
5452
@SuppressWarnings("rawtypes")
5553
private <R extends CustomResource> void registerController(ResourceController<R> controller,
5654
boolean watchAllNamespaces, Retry retry, String... targetNamespaces) throws OperatorException {
57-
Class<R> resClass = getCustomResourceClass(controller);
55+
Class<R> resClass = ControllerUtils.getCustomResourceClass(controller);
5856
CustomResourceDefinitionContext crd = getCustomResourceDefinitionForController(controller);
5957
KubernetesDeserializer.registerCustomKind(crd.getVersion(), crd.getKind(), resClass);
60-
String finalizer = getDefaultFinalizer(controller);
61-
MixedOperation client = k8sClient.customResources(crd, resClass, CustomResourceList.class, getCustomResourceDoneableClass(controller));
58+
String finalizer = ControllerUtils.getDefaultFinalizer(controller);
59+
MixedOperation client = k8sClient.customResources(crd, resClass, CustomResourceList.class, ControllerUtils.getCustomResourceDoneableClass(controller));
6260
EventDispatcher eventDispatcher = new EventDispatcher(controller,
6361
finalizer, new EventDispatcher.CustomResourceFacade(client), ControllerUtils.getGenerationEventProcessing(controller));
6462
EventScheduler eventScheduler = new EventScheduler(eventDispatcher, retry);
@@ -87,7 +85,7 @@ private <R extends CustomResource> void registerWatches(ResourceController<R> co
8785
}
8886

8987
private CustomResourceDefinitionContext getCustomResourceDefinitionForController(ResourceController controller) {
90-
String crdName = getCrdName(controller);
88+
String crdName = ControllerUtils.getCrdName(controller);
9189
CustomResourceDefinition customResourceDefinition = k8sClient.customResourceDefinitions().withName(crdName).get();
9290
if (customResourceDefinition == null) {
9391
throw new OperatorException("Cannot find Custom Resource Definition with name: " + crdName);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.containersolutions.operator;
1+
package io.javaoperatorsdk.operator;
22

33
public class OperatorException extends RuntimeException {
44

operator-framework/src/main/java/com/github/containersolutions/operator/api/Context.java renamed to operator-framework/src/main/java/io/javaoperatorsdk/operator/api/Context.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.containersolutions.operator.api;
1+
package io.javaoperatorsdk.operator.api;
22

33
import io.fabric8.kubernetes.client.CustomResource;
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.containersolutions.operator.api;
1+
package io.javaoperatorsdk.operator.api;
22

33
import io.fabric8.kubernetes.client.CustomResource;
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.containersolutions.operator.api;
1+
package io.javaoperatorsdk.operator.api;
22

33
import io.fabric8.kubernetes.client.CustomResource;
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.containersolutions.operator.api;
1+
package io.javaoperatorsdk.operator.api;
22

33
import io.fabric8.kubernetes.client.CustomResource;
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.containersolutions.operator.api;
1+
package io.javaoperatorsdk.operator.api;
22

33
public class RetryInfo {
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.containersolutions.operator.api;
1+
package io.javaoperatorsdk.operator.api;
22

33
import io.fabric8.kubernetes.client.CustomResource;
44

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.github.containersolutions.operator.processing;
1+
package io.javaoperatorsdk.operator.processing;
22

3-
import com.github.containersolutions.operator.processing.retry.Retry;
4-
import com.github.containersolutions.operator.processing.retry.RetryExecution;
3+
import io.javaoperatorsdk.operator.processing.retry.Retry;
4+
import io.javaoperatorsdk.operator.processing.retry.RetryExecution;
55
import io.fabric8.kubernetes.client.CustomResource;
66
import io.fabric8.kubernetes.client.Watcher;
77

0 commit comments

Comments
 (0)