Skip to content

Commit d93c1c8

Browse files
kirek007kirek007
committed
Update package and group name
1 parent 12aeacc commit d93c1c8

18 files changed

+89
-96
lines changed

‎operator-framework/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<parent>
7-
<groupId>com.github.containersolutions</groupId>
7+
<groupId>io.javaoperatorsdk</groupId>
88
<artifactId>java-operator-sdk</artifactId>
99
<version>1.3.1-SNAPSHOT</version>
1010
</parent>

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/ConcurrencyIT.java

+10-11
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.sample.TestCustomResource;
4-
import com.github.containersolutions.operator.sample.TestCustomResourceController;
3+
import io.javaoperatorsdk.operator.sample.TestCustomResource;
4+
import io.javaoperatorsdk.operator.sample.TestCustomResourceController;
55
import io.fabric8.kubernetes.api.model.ConfigMap;
66
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
77
import io.fabric8.kubernetes.client.KubernetesClient;
@@ -17,7 +17,6 @@
1717
import java.util.concurrent.TimeUnit;
1818
import java.util.stream.Collectors;
1919

20-
import static com.github.containersolutions.operator.IntegrationTestSupport.TEST_NAMESPACE;
2120
import static org.assertj.core.api.Assertions.assertThat;
2221

2322
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -48,13 +47,13 @@ public void manyResourcesGetCreatedUpdatedAndDeleted() {
4847
log.info("Creating {} new resources", NUMBER_OF_RESOURCES_CREATED);
4948
for (int i = 0; i < NUMBER_OF_RESOURCES_CREATED; i++) {
5049
TestCustomResource tcr = integrationTest.createTestCustomResource(String.valueOf(i));
51-
integrationTest.getCrOperations().inNamespace(TEST_NAMESPACE).create(tcr);
50+
integrationTest.getCrOperations().inNamespace(IntegrationTestSupport.TEST_NAMESPACE).create(tcr);
5251
}
5352

5453
Awaitility.await().atMost(1, TimeUnit.MINUTES)
5554
.untilAsserted(() -> {
5655
List<ConfigMap> items = integrationTest.getK8sClient().configMaps()
57-
.inNamespace(TEST_NAMESPACE)
56+
.inNamespace(IntegrationTestSupport.TEST_NAMESPACE)
5857
.withLabel("managedBy", TestCustomResourceController.class.getSimpleName())
5958
.list().getItems();
6059
assertThat(items).hasSize(NUMBER_OF_RESOURCES_CREATED);
@@ -64,33 +63,33 @@ public void manyResourcesGetCreatedUpdatedAndDeleted() {
6463
// update some resources
6564
for (int i = 0; i < NUMBER_OF_RESOURCES_UPDATED; i++) {
6665
TestCustomResource tcr = (TestCustomResource) integrationTest.getCrOperations()
67-
.inNamespace(TEST_NAMESPACE)
66+
.inNamespace(IntegrationTestSupport.TEST_NAMESPACE)
6867
.withName(IntegrationTestSupport.TEST_CUSTOM_RESOURCE_PREFIX + i)
6968
.get();
7069
tcr.getSpec().setValue(i + UPDATED_SUFFIX);
71-
integrationTest.getCrOperations().inNamespace(TEST_NAMESPACE).createOrReplace(tcr);
70+
integrationTest.getCrOperations().inNamespace(IntegrationTestSupport.TEST_NAMESPACE).createOrReplace(tcr);
7271
}
7372
// sleep for a short time to make variability to the test, so some updates are not executed before delete
7473
Thread.sleep(300);
7574

7675
log.info("Deleting {} resources", NUMBER_OF_RESOURCES_DELETED);
7776
for (int i = 0; i < NUMBER_OF_RESOURCES_DELETED; i++) {
7877
TestCustomResource tcr = integrationTest.createTestCustomResource(String.valueOf(i));
79-
integrationTest.getCrOperations().inNamespace(TEST_NAMESPACE).delete(tcr);
78+
integrationTest.getCrOperations().inNamespace(IntegrationTestSupport.TEST_NAMESPACE).delete(tcr);
8079
}
8180

8281
Awaitility.await().atMost(1, TimeUnit.MINUTES)
8382
.untilAsserted(() -> {
8483
List<ConfigMap> items = integrationTest.getK8sClient().configMaps()
85-
.inNamespace(TEST_NAMESPACE)
84+
.inNamespace(IntegrationTestSupport.TEST_NAMESPACE)
8685
.withLabel("managedBy", TestCustomResourceController.class.getSimpleName())
8786
.list().getItems();
8887
//reducing configmaps to names only - better for debugging
8988
List<String> itemDescs = items.stream().map(configMap -> configMap.getMetadata().getName()).collect(Collectors.toList());
9089
assertThat(itemDescs).hasSize(NUMBER_OF_RESOURCES_CREATED - NUMBER_OF_RESOURCES_DELETED);
9190

9291
List<TestCustomResource> crs = integrationTest.getCrOperations()
93-
.inNamespace(TEST_NAMESPACE)
92+
.inNamespace(IntegrationTestSupport.TEST_NAMESPACE)
9493
.list().getItems();
9594
assertThat(crs).hasSize(NUMBER_OF_RESOURCES_CREATED - NUMBER_OF_RESOURCES_DELETED);
9695
});

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerExecutionIT.java

+11-12
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.github.containersolutions.operator;
1+
package io.javaoperatorsdk.operator;
22

3-
import com.github.containersolutions.operator.sample.TestCustomResource;
4-
import com.github.containersolutions.operator.sample.TestCustomResourceController;
5-
import com.github.containersolutions.operator.sample.TestCustomResourceSpec;
3+
import io.javaoperatorsdk.operator.sample.TestCustomResource;
4+
import io.javaoperatorsdk.operator.sample.TestCustomResourceController;
5+
import io.javaoperatorsdk.operator.sample.TestCustomResourceSpec;
66
import io.fabric8.kubernetes.api.model.ConfigMap;
77
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
88
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
@@ -15,7 +15,6 @@
1515
import java.util.HashMap;
1616
import java.util.concurrent.TimeUnit;
1717

18-
import static com.github.containersolutions.operator.IntegrationTestSupport.TEST_NAMESPACE;
1918
import static org.assertj.core.api.Assertions.assertThat;
2019
import static org.awaitility.Awaitility.await;
2120

@@ -38,7 +37,7 @@ public void configMapGetsCreatedForTestCustomResource() {
3837
integrationTestSupport.teardownIfSuccess(() -> {
3938
TestCustomResource resource = testCustomResource();
4039

41-
integrationTestSupport.getCrOperations().inNamespace(TEST_NAMESPACE).create(resource);
40+
integrationTestSupport.getCrOperations().inNamespace(IntegrationTestSupport.TEST_NAMESPACE).create(resource);
4241

4342
awaitResourcesCreatedOrUpdated();
4443
awaitStatusUpdated();
@@ -52,7 +51,7 @@ public void eventIsSkippedChangedOnMetadataOnlyUpdate() {
5251
integrationTestSupport.teardownIfSuccess(() -> {
5352
TestCustomResource resource = testCustomResource();
5453

55-
integrationTestSupport.getCrOperations().inNamespace(TEST_NAMESPACE).create(resource);
54+
integrationTestSupport.getCrOperations().inNamespace(IntegrationTestSupport.TEST_NAMESPACE).create(resource);
5655

5756
awaitResourcesCreatedOrUpdated();
5857
assertThat(integrationTestSupport.numberOfControllerExecutions()).isEqualTo(1);
@@ -67,8 +66,8 @@ public void retryConflict() {
6766
TestCustomResource resource2 = testCustomResource();
6867
resource2.getMetadata().getAnnotations().put("test-annotation", "val");
6968

70-
integrationTestSupport.getCrOperations().inNamespace(TEST_NAMESPACE).create(resource);
71-
integrationTestSupport.getCrOperations().inNamespace(TEST_NAMESPACE).createOrReplace(resource2);
69+
integrationTestSupport.getCrOperations().inNamespace(IntegrationTestSupport.TEST_NAMESPACE).create(resource);
70+
integrationTestSupport.getCrOperations().inNamespace(IntegrationTestSupport.TEST_NAMESPACE).createOrReplace(resource2);
7271

7372
awaitResourcesCreatedOrUpdated();
7473
awaitStatusUpdated(5);
@@ -79,7 +78,7 @@ public void retryConflict() {
7978
void awaitResourcesCreatedOrUpdated() {
8079
await("config map created").atMost(5, TimeUnit.SECONDS)
8180
.untilAsserted(() -> {
82-
ConfigMap configMap = integrationTestSupport.getK8sClient().configMaps().inNamespace(TEST_NAMESPACE)
81+
ConfigMap configMap = integrationTestSupport.getK8sClient().configMaps().inNamespace(IntegrationTestSupport.TEST_NAMESPACE)
8382
.withName("test-config-map").get();
8483
assertThat(configMap).isNotNull();
8584
assertThat(configMap.getData().get("test-key")).isEqualTo("test-value");
@@ -94,7 +93,7 @@ void awaitStatusUpdated(int timeout) {
9493
await("cr status updated").atMost(timeout, TimeUnit.SECONDS)
9594
.untilAsserted(() -> {
9695
TestCustomResource cr = (TestCustomResource) integrationTestSupport.getCrOperations()
97-
.inNamespace(TEST_NAMESPACE).withName(TEST_CUSTOM_RESOURCE_NAME).get();
96+
.inNamespace(IntegrationTestSupport.TEST_NAMESPACE).withName(TEST_CUSTOM_RESOURCE_NAME).get();
9897
assertThat(cr).isNotNull();
9998
assertThat(cr.getStatus()).isNotNull();
10099
assertThat(cr.getStatus().getConfigMapStatus()).isEqualTo("ConfigMap Ready");
@@ -105,7 +104,7 @@ private TestCustomResource testCustomResource() {
105104
TestCustomResource resource = new TestCustomResource();
106105
resource.setMetadata(new ObjectMetaBuilder()
107106
.withName(TEST_CUSTOM_RESOURCE_NAME)
108-
.withNamespace(TEST_NAMESPACE)
107+
.withNamespace(IntegrationTestSupport.TEST_NAMESPACE)
109108
.build());
110109
resource.getMetadata().setAnnotations(new HashMap<>());
111110
resource.setKind("CustomService");

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerUtilsTest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
package com.github.containersolutions.operator;
1+
package io.javaoperatorsdk.operator;
22

3-
import com.github.containersolutions.operator.sample.TestCustomResource;
4-
import com.github.containersolutions.operator.sample.TestCustomResourceController;
3+
import io.javaoperatorsdk.operator.sample.TestCustomResource;
4+
import io.javaoperatorsdk.operator.sample.TestCustomResourceController;
55
import io.fabric8.kubernetes.client.CustomResourceDoneable;
6+
import io.javaoperatorsdk.operator.api.Controller;
7+
import org.junit.jupiter.api.Assertions;
68
import org.junit.jupiter.api.Test;
79

8-
import static com.github.containersolutions.operator.api.Controller.DEFAULT_FINALIZER;
9-
import static com.github.containersolutions.operator.sample.TestCustomResourceController.CRD_NAME;
1010
import static org.junit.jupiter.api.Assertions.assertEquals;
1111
import static org.junit.jupiter.api.Assertions.assertTrue;
1212

1313
class ControllerUtilsTest {
1414

1515
@Test
1616
public void returnsValuesFromControllerAnnotationFinalizer() {
17-
assertEquals(DEFAULT_FINALIZER, ControllerUtils.getDefaultFinalizer(new TestCustomResourceController(null)));
17+
Assertions.assertEquals(Controller.DEFAULT_FINALIZER, ControllerUtils.getDefaultFinalizer(new TestCustomResourceController(null)));
1818
assertEquals(TestCustomResource.class, ControllerUtils.getCustomResourceClass(new TestCustomResourceController(null)));
19-
assertEquals(CRD_NAME, ControllerUtils.getCrdName(new TestCustomResourceController(null)));
19+
Assertions.assertEquals(TestCustomResourceController.CRD_NAME, ControllerUtils.getCrdName(new TestCustomResourceController(null)));
2020
assertEquals(false, ControllerUtils.getGenerationEventProcessing(new TestCustomResourceController(null)));
2121
assertTrue(CustomResourceDoneable.class.isAssignableFrom(ControllerUtils.getCustomResourceDoneableClass(new TestCustomResourceController(null))));
2222
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/EventDispatcherTest.java

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
package com.github.containersolutions.operator;
2-
3-
import com.github.containersolutions.operator.api.ResourceController;
4-
import com.github.containersolutions.operator.api.UpdateControl;
5-
import com.github.containersolutions.operator.processing.CustomResourceEvent;
6-
import com.github.containersolutions.operator.processing.EventDispatcher;
7-
import com.github.containersolutions.operator.processing.retry.GenericRetry;
8-
import com.github.containersolutions.operator.sample.TestCustomResource;
1+
package io.javaoperatorsdk.operator;
2+
3+
import io.javaoperatorsdk.operator.api.ResourceController;
4+
import io.javaoperatorsdk.operator.api.UpdateControl;
5+
import io.javaoperatorsdk.operator.processing.CustomResourceEvent;
6+
import io.javaoperatorsdk.operator.processing.EventDispatcher;
7+
import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
8+
import io.javaoperatorsdk.operator.sample.TestCustomResource;
99
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
1010
import io.fabric8.kubernetes.client.CustomResource;
1111
import io.fabric8.kubernetes.client.Watcher;
12+
import io.javaoperatorsdk.operator.api.Controller;
1213
import org.junit.jupiter.api.Assertions;
1314
import org.junit.jupiter.api.BeforeEach;
1415
import org.junit.jupiter.api.Test;
1516
import org.mockito.ArgumentMatchers;
1617

17-
import static com.github.containersolutions.operator.api.Controller.DEFAULT_FINALIZER;
1818
import static org.junit.jupiter.api.Assertions.assertEquals;
1919
import static org.mockito.Mockito.*;
2020

@@ -28,7 +28,7 @@ class EventDispatcherTest {
2828
@BeforeEach
2929
void setup() {
3030
eventDispatcher = new EventDispatcher(controller,
31-
DEFAULT_FINALIZER, customResourceFacade, false);
31+
Controller.DEFAULT_FINALIZER, customResourceFacade, false);
3232

3333
testCustomResource = getResource();
3434

@@ -45,7 +45,7 @@ void callCreateOrUpdateOnNewResource() {
4545

4646
@Test
4747
void updatesOnlyStatusSubResource() {
48-
testCustomResource.getMetadata().getFinalizers().add(DEFAULT_FINALIZER);
48+
testCustomResource.getMetadata().getFinalizers().add(Controller.DEFAULT_FINALIZER);
4949
when(controller.createOrUpdateResource(eq(testCustomResource), any()))
5050
.thenReturn(UpdateControl.updateStatusSubResource(testCustomResource));
5151

@@ -67,13 +67,13 @@ void adsDefaultFinalizerOnCreateIfNotThere() {
6767
eventDispatcher.handleEvent(customResourceEvent(Watcher.Action.MODIFIED, testCustomResource));
6868
verify(controller, times(1))
6969
.createOrUpdateResource(argThat(testCustomResource ->
70-
testCustomResource.getMetadata().getFinalizers().contains(DEFAULT_FINALIZER)), any());
70+
testCustomResource.getMetadata().getFinalizers().contains(Controller.DEFAULT_FINALIZER)), any());
7171
}
7272

7373
@Test
7474
void callsDeleteIfObjectHasFinalizerAndMarkedForDelete() {
7575
testCustomResource.getMetadata().setDeletionTimestamp("2019-8-10");
76-
testCustomResource.getMetadata().getFinalizers().add(DEFAULT_FINALIZER);
76+
testCustomResource.getMetadata().getFinalizers().add(Controller.DEFAULT_FINALIZER);
7777

7878
eventDispatcher.handleEvent(customResourceEvent(Watcher.Action.MODIFIED, testCustomResource));
7979

@@ -183,7 +183,7 @@ void doesNotMarkNewGenerationInCaseOfException() {
183183

184184
void generationAwareMode() {
185185
eventDispatcher = new EventDispatcher(controller,
186-
DEFAULT_FINALIZER, customResourceFacade, true);
186+
Controller.DEFAULT_FINALIZER, customResourceFacade, true);
187187
}
188188

189189
private void markForDeletion(CustomResource customResource) {
@@ -202,7 +202,7 @@ CustomResource getResource() {
202202
.withDeletionGracePeriodSeconds(10L)
203203
.withGeneration(10L)
204204
.withName("name")
205-
.withFinalizers(DEFAULT_FINALIZER)
205+
.withFinalizers(Controller.DEFAULT_FINALIZER)
206206
.withNamespace("namespace")
207207
.withResourceVersion("resourceVersion")
208208
.withSelfLink("selfLink")

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/EventSchedulerTest.java

+7-8
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.processing.CustomResourceEvent;
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.sample.TestCustomResource;
3+
import io.javaoperatorsdk.operator.processing.CustomResourceEvent;
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.sample.TestCustomResource;
88
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
99
import io.fabric8.kubernetes.client.CustomResource;
1010
import io.fabric8.kubernetes.client.Watcher;
@@ -21,7 +21,6 @@
2121
import java.util.Collections;
2222
import java.util.List;
2323

24-
import static com.github.containersolutions.operator.processing.retry.GenericRetry.DEFAULT_INITIAL_INTERVAL;
2524
import static org.assertj.core.api.Assertions.assertThat;
2625
import static org.assertj.core.api.Assertions.atIndex;
2726
import static org.mockito.Mockito.*;
@@ -242,7 +241,7 @@ private void waitTimeForExecution(int numberOfEvents) {
242241
private void waitTimeForExecution(int numberOfEvents, int retries) {
243242
try {
244243
Thread.sleep(200 + ((INVOCATION_DURATION + 30) * numberOfEvents) + (retries * (INVOCATION_DURATION + 100)) +
245-
retries * (DEFAULT_INITIAL_INTERVAL + 100));
244+
retries * (GenericRetry.DEFAULT_INITIAL_INTERVAL + 100));
246245
} catch (InterruptedException e) {
247246
throw new IllegalStateException(e);
248247
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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.sample.TestCustomResource;
5-
import com.github.containersolutions.operator.sample.TestCustomResourceSpec;
3+
import io.javaoperatorsdk.operator.api.ResourceController;
4+
import io.javaoperatorsdk.operator.sample.TestCustomResource;
5+
import io.javaoperatorsdk.operator.sample.TestCustomResourceSpec;
66
import io.fabric8.kubernetes.api.model.Namespace;
77
import io.fabric8.kubernetes.api.model.NamespaceBuilder;
88
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
@@ -22,8 +22,6 @@
2222
import java.io.InputStream;
2323
import java.util.concurrent.TimeUnit;
2424

25-
import static com.github.containersolutions.operator.ControllerUtils.getCustomResourceClass;
26-
import static com.github.containersolutions.operator.ControllerUtils.getCustomResourceDoneableClass;
2725
import static org.assertj.core.api.Assertions.assertThat;
2826
import static org.awaitility.Awaitility.await;
2927

@@ -45,8 +43,8 @@ public void initialize(KubernetesClient k8sClient, ResourceController controller
4543
CustomResourceDefinitionContext crdContext = CustomResourceDefinitionContext.fromCrd(crd);
4644
this.controller = controller;
4745

48-
Class doneableClass = getCustomResourceDoneableClass(controller);
49-
Class customResourceClass = getCustomResourceClass(controller);
46+
Class doneableClass = ControllerUtils.getCustomResourceDoneableClass(controller);
47+
Class customResourceClass = ControllerUtils.getCustomResourceClass(controller);
5048
crOperations = k8sClient.customResources(crdContext, customResourceClass, CustomResourceList.class, doneableClass);
5149

5250
if (k8sClient.namespaces().withName(TEST_NAMESPACE).get() == null) {

0 commit comments

Comments
 (0)