Skip to content

Commit f985219

Browse files
authored
Merge pull request #220 from java-operator-sdk/update-package-name
Update package name
2 parents 5fab7c6 + 0361ca9 commit f985219

File tree

98 files changed

+242
-250
lines changed

Some content is hidden

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

98 files changed

+242
-250
lines changed

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ unacceptable behaviour to any of the project admins or adam.sandor@container-sol
1414

1515
## Bugs
1616

17-
If you find a bug, please [open an issue](https://github.com/ContainerSolutions/java-operator-sdk/issues)! Do try
17+
If you find a bug, please [open an issue](https://github.com/java-operator-sdk/java-operator-sdk/issues)! Do try
1818
to include all the details needed to recreate your problem. This is likely to include:
1919

2020
- The version of the Operator SDK being used
@@ -24,7 +24,7 @@ to include all the details needed to recreate your problem. This is likely to in
2424
## Building Features and Documentation
2525

2626
If you're looking for something to work on, take look at the issue tracker, in particular any items
27-
labelled [good first issue](https://github.com/ContainerSolutions/java-operator-sdk/labels/good%20first%20issue).
27+
labelled [good first issue](https://github.com/java-operator-sdk/java-operator-sdk/labels/good%20first%20issue).
2828
Please leave a comment on the issue to mention that you have started work, in order to avoid
2929
multiple people working on the same issue.
3030

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ![java-operator-sdk](docs/assets/images/logo.png)
2-
![Java CI with Maven](https://github.com/ContainerSolutions/java-operator-sdk/workflows/Java%20CI%20with%20Maven/badge.svg)
2+
![Java CI with Maven](https://github.com/java-operator-sdk/java-operator-sdk/workflows/Java%20CI%20with%20Maven/badge.svg)
33

44
Build Kubernetes Operators in Java without hassle. Inspired by [operator-sdk](https://github.com/operator-framework/operator-sdk).
55

@@ -57,7 +57,7 @@ Add [dependency](https://search.maven.org/search?q=a:operator-framework) to your
5757

5858
```xml
5959
<dependency>
60-
<groupId>com.github.containersolutions</groupId>
60+
<groupId>io.javaoperatorsdk</groupId>
6161
<artifactId>operator-framework</artifactId>
6262
<version>{see https://search.maven.org/search?q=a:operator-framework for latest version}</version>
6363
</dependency>
@@ -145,7 +145,7 @@ Add [this dependency](https://search.maven.org/search?q=a:spring-boot-operator-f
145145

146146
```xml
147147
<dependency>
148-
<groupId>com.github.containersolutions</groupId>
148+
<groupId>io.javaoperatorsdk</groupId>
149149
<artifactId>spring-boot-operator-framework-starter</artifactId>
150150
<version>{see https://search.maven.org/search?q=a:spring-boot-operator-framework-starter for latest version}</version>
151151
</dependency>

docs/DOCS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ You can read about the common problems what is this operator framework is solvin
1313
## Getting Started
1414

1515
The easiest way to get started with SDK is start [minikube](https://kubernetes.io/docs/tasks/tools/install-minikube/) and
16-
execute one of our [examples](https://github.com/ContainerSolutions/java-operator-sdk/tree/master/samples/mysql-schema)
16+
execute one of our [examples](https://github.com/java-operator-sdk/java-operator-sdk/tree/master/samples/mysql-schema)
1717

1818
Here are the main steps to develop the code and deploy the operator to a Kubernetes cluster. A more detailed and specific
1919
version can be found under `samples/mysql-schema/README.md`.

docs/index.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ Operators are the way to go. This SDK will make it easy for Java developers to e
3030
We are a friendly team of Java and Kubernetes enthusiasts and welcome everyone to contribute in any way to the framework!
3131
Get in touch either on GitHub or our [Discord server](https://discord.gg/DacEhAy), we are always happy to chat and help
3232
you find the right issue to get started. Feel free to stop by for questions, comments or just saying hi.
33-
We have a [code of conduct](https://github.com/ContainerSolutions/java-operator-sdk/blob/master/CODE_OF_CONDUCT.md)
34-
which we strictly enforce, as well as [issues marked for new joiners](https://github.com/ContainerSolutions/java-operator-sdk/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22).
33+
We have a [code of conduct](https://github.com/java-operator-sdk/java-operator-sdk/blob/master/CODE_OF_CONDUCT.md)
34+
which we strictly enforce, as well as [issues marked for new joiners](https://github.com/java-operator-sdk/java-operator-sdk/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22).
3535

3636
We are also supporting [#HacktoberFest](https://hacktoberfest.digitalocean.com/) and have several issues marked as [good
37-
candidates](https://github.com/ContainerSolutions/java-operator-sdk/issues?q=is%3Aissue+is%3Aopen+label%3A%22hacktoberfest%22+) to pick up during the event.
37+
candidates](https://github.com/java-operator-sdk/java-operator-sdk/issues?q=is%3Aissue+is%3Aopen+label%3A%22hacktoberfest%22+) to pick up during the event.
3838

39-
[Maven](https://mvnrepository.com/artifact/com.github.containersolutions/java-operator-sdk){:.button-text}
40-
[GitHub](https://github.com/ContainerSolutions/java-operator-sdk){:.button-text}
39+
[Maven](https://mvnrepository.com/artifact/io.javaoperatorsdk/java-operator-sdk){:.button-text}
40+
[GitHub](https://github.com/java-operator-sdk/java-operator-sdk){:.button-text}
4141
[Discord](https://discord.gg/DacEhAy){:.button-text}

operator-framework/pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
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>
10+
<relativePath>../pom.xml</relativePath>
1011
</parent>
1112

1213
<artifactId>operator-framework</artifactId>

operator-framework/src/main/java/com/github/containersolutions/operator/ControllerUtils.java operator-framework/src/main/java/io/javaoperatorsdk/operator/ControllerUtils.java

+3-3
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 operator-framework/src/main/java/io/javaoperatorsdk/operator/Operator.java

+10-12
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);

operator-framework/src/main/java/com/github/containersolutions/operator/OperatorException.java operator-framework/src/main/java/io/javaoperatorsdk/operator/OperatorException.java

+1-1
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 operator-framework/src/main/java/io/javaoperatorsdk/operator/api/Context.java

+1-1
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

operator-framework/src/main/java/com/github/containersolutions/operator/api/Controller.java operator-framework/src/main/java/io/javaoperatorsdk/operator/api/Controller.java

+1-1
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

operator-framework/src/main/java/com/github/containersolutions/operator/api/DefaultContext.java operator-framework/src/main/java/io/javaoperatorsdk/operator/api/DefaultContext.java

+1-1
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

operator-framework/src/main/java/com/github/containersolutions/operator/api/ResourceController.java operator-framework/src/main/java/io/javaoperatorsdk/operator/api/ResourceController.java

+1-1
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

operator-framework/src/main/java/com/github/containersolutions/operator/api/RetryInfo.java operator-framework/src/main/java/io/javaoperatorsdk/operator/api/RetryInfo.java

+1-1
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

operator-framework/src/main/java/com/github/containersolutions/operator/api/UpdateControl.java operator-framework/src/main/java/io/javaoperatorsdk/operator/api/UpdateControl.java

+1-1
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

operator-framework/src/main/java/com/github/containersolutions/operator/processing/CustomResourceEvent.java operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/CustomResourceEvent.java

+3-3
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

operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventConsumer.java operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventConsumer.java

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

33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;

operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventDispatcher.java operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventDispatcher.java

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

3-
import com.github.containersolutions.operator.ControllerUtils;
4-
import com.github.containersolutions.operator.api.*;
3+
import io.javaoperatorsdk.operator.ControllerUtils;
54
import io.fabric8.kubernetes.client.CustomResource;
65
import io.fabric8.kubernetes.client.Watcher;
76
import io.fabric8.kubernetes.client.dsl.MixedOperation;
87
import io.fabric8.kubernetes.client.dsl.Resource;
8+
import io.javaoperatorsdk.operator.api.*;
99
import org.slf4j.Logger;
1010
import org.slf4j.LoggerFactory;
1111

operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventScheduler.java operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventScheduler.java

+2-2
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

33

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

operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventStore.java operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventStore.java

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

33
import java.util.HashMap;
44
import java.util.Map;

operator-framework/src/main/java/com/github/containersolutions/operator/processing/retry/GenericRetry.java operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/GenericRetry.java

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

33
public class GenericRetry implements Retry {
44

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

33
import java.util.Optional;
44

operator-framework/src/main/java/com/github/containersolutions/operator/processing/retry/Retry.java operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/Retry.java

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

33
public interface Retry {
44

operator-framework/src/main/java/com/github/containersolutions/operator/processing/retry/RetryExecution.java operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/RetryExecution.java

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

33
import java.util.Optional;
44

operator-framework/src/test/java/com/github/containersolutions/operator/ConcurrencyIT.java 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
});

0 commit comments

Comments
 (0)