diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fd60fd026d..a5e0622190 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ unacceptable behaviour to any of the project admins or adam.sandor@container-sol ## Bugs -If you find a bug, please [open an issue](https://github.com/ContainerSolutions/java-operator-sdk/issues)! Do try +If you find a bug, please [open an issue](https://github.com/java-operator-sdk/java-operator-sdk/issues)! Do try to include all the details needed to recreate your problem. This is likely to include: - 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 ## Building Features and Documentation If you're looking for something to work on, take look at the issue tracker, in particular any items -labelled [good first issue](https://github.com/ContainerSolutions/java-operator-sdk/labels/good%20first%20issue). +labelled [good first issue](https://github.com/java-operator-sdk/java-operator-sdk/labels/good%20first%20issue). Please leave a comment on the issue to mention that you have started work, in order to avoid multiple people working on the same issue. diff --git a/README.md b/README.md index 8964718981..4ba12ffcdb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # ![java-operator-sdk](docs/assets/images/logo.png) -![Java CI with Maven](https://github.com/ContainerSolutions/java-operator-sdk/workflows/Java%20CI%20with%20Maven/badge.svg) +![Java CI with Maven](https://github.com/java-operator-sdk/java-operator-sdk/workflows/Java%20CI%20with%20Maven/badge.svg) Build Kubernetes Operators in Java without hassle. Inspired by [operator-sdk](https://github.com/operator-framework/operator-sdk). @@ -57,7 +57,7 @@ Add [dependency](https://search.maven.org/search?q=a:operator-framework) to your ```xml - com.github.containersolutions + io.javaoperatorsdk operator-framework {see https://search.maven.org/search?q=a:operator-framework for latest version} @@ -145,7 +145,7 @@ Add [this dependency](https://search.maven.org/search?q=a:spring-boot-operator-f ```xml - com.github.containersolutions + io.javaoperatorsdk spring-boot-operator-framework-starter {see https://search.maven.org/search?q=a:spring-boot-operator-framework-starter for latest version} diff --git a/docs/DOCS.md b/docs/DOCS.md index 1f508259fb..b8bef15afd 100644 --- a/docs/DOCS.md +++ b/docs/DOCS.md @@ -13,7 +13,7 @@ You can read about the common problems what is this operator framework is solvin ## Getting Started The easiest way to get started with SDK is start [minikube](https://kubernetes.io/docs/tasks/tools/install-minikube/) and -execute one of our [examples](https://github.com/ContainerSolutions/java-operator-sdk/tree/master/samples/mysql-schema) +execute one of our [examples](https://github.com/java-operator-sdk/java-operator-sdk/tree/master/samples/mysql-schema) Here are the main steps to develop the code and deploy the operator to a Kubernetes cluster. A more detailed and specific version can be found under `samples/mysql-schema/README.md`. diff --git a/docs/index.md b/docs/index.md index 02555bbb56..871e586cdc 100644 --- a/docs/index.md +++ b/docs/index.md @@ -30,12 +30,12 @@ Operators are the way to go. This SDK will make it easy for Java developers to e We are a friendly team of Java and Kubernetes enthusiasts and welcome everyone to contribute in any way to the framework! Get in touch either on GitHub or our [Discord server](https://discord.gg/DacEhAy), we are always happy to chat and help you find the right issue to get started. Feel free to stop by for questions, comments or just saying hi. -We have a [code of conduct](https://github.com/ContainerSolutions/java-operator-sdk/blob/master/CODE_OF_CONDUCT.md) -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). +We have a [code of conduct](https://github.com/java-operator-sdk/java-operator-sdk/blob/master/CODE_OF_CONDUCT.md) +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). We are also supporting [#HacktoberFest](https://hacktoberfest.digitalocean.com/) and have several issues marked as [good -candidates](https://github.com/ContainerSolutions/java-operator-sdk/issues?q=is%3Aissue+is%3Aopen+label%3A%22hacktoberfest%22+) to pick up during the event. +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. -[Maven](https://mvnrepository.com/artifact/com.github.containersolutions/java-operator-sdk){:.button-text} -[GitHub](https://github.com/ContainerSolutions/java-operator-sdk){:.button-text} +[Maven](https://mvnrepository.com/artifact/io.javaoperatorsdk/java-operator-sdk){:.button-text} +[GitHub](https://github.com/java-operator-sdk/java-operator-sdk){:.button-text} [Discord](https://discord.gg/DacEhAy){:.button-text} diff --git a/operator-framework/pom.xml b/operator-framework/pom.xml index bc6fb58a35..46c87c5009 100644 --- a/operator-framework/pom.xml +++ b/operator-framework/pom.xml @@ -4,9 +4,10 @@ 4.0.0 - com.github.containersolutions + io.javaoperatorsdk java-operator-sdk 1.3.1-SNAPSHOT + ../pom.xml operator-framework diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/ControllerUtils.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/ControllerUtils.java similarity index 95% rename from operator-framework/src/main/java/com/github/containersolutions/operator/ControllerUtils.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/ControllerUtils.java index 31575c5734..baaa7d798b 100644 --- a/operator-framework/src/main/java/com/github/containersolutions/operator/ControllerUtils.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/ControllerUtils.java @@ -1,7 +1,7 @@ -package com.github.containersolutions.operator; +package io.javaoperatorsdk.operator; -import com.github.containersolutions.operator.api.Controller; -import com.github.containersolutions.operator.api.ResourceController; +import io.javaoperatorsdk.operator.api.Controller; +import io.javaoperatorsdk.operator.api.ResourceController; import io.fabric8.kubernetes.api.builder.Function; import io.fabric8.kubernetes.client.CustomResource; import io.fabric8.kubernetes.client.CustomResourceDoneable; diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/Operator.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/Operator.java similarity index 88% rename from operator-framework/src/main/java/com/github/containersolutions/operator/Operator.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/Operator.java index d013a015f3..655849a644 100644 --- a/operator-framework/src/main/java/com/github/containersolutions/operator/Operator.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/Operator.java @@ -1,10 +1,10 @@ -package com.github.containersolutions.operator; +package io.javaoperatorsdk.operator; -import com.github.containersolutions.operator.api.ResourceController; -import com.github.containersolutions.operator.processing.EventDispatcher; -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.javaoperatorsdk.operator.api.ResourceController; +import io.javaoperatorsdk.operator.processing.EventDispatcher; +import io.javaoperatorsdk.operator.processing.EventScheduler; +import io.javaoperatorsdk.operator.processing.retry.GenericRetry; +import io.javaoperatorsdk.operator.processing.retry.Retry; import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition; import io.fabric8.kubernetes.client.CustomResource; import io.fabric8.kubernetes.client.CustomResourceDoneable; @@ -21,8 +21,6 @@ import java.util.HashMap; import java.util.Map; -import static com.github.containersolutions.operator.ControllerUtils.*; - @SuppressWarnings("rawtypes") public class Operator { @@ -54,11 +52,11 @@ public void registerController(ResourceController @SuppressWarnings("rawtypes") private void registerController(ResourceController controller, boolean watchAllNamespaces, Retry retry, String... targetNamespaces) throws OperatorException { - Class resClass = getCustomResourceClass(controller); + Class resClass = ControllerUtils.getCustomResourceClass(controller); 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)); + String finalizer = ControllerUtils.getDefaultFinalizer(controller); + MixedOperation client = k8sClient.customResources(crd, resClass, CustomResourceList.class, ControllerUtils.getCustomResourceDoneableClass(controller)); EventDispatcher eventDispatcher = new EventDispatcher(controller, finalizer, new EventDispatcher.CustomResourceFacade(client), ControllerUtils.getGenerationEventProcessing(controller)); EventScheduler eventScheduler = new EventScheduler(eventDispatcher, retry); @@ -87,7 +85,7 @@ private void registerWatches(ResourceController co } private CustomResourceDefinitionContext getCustomResourceDefinitionForController(ResourceController controller) { - String crdName = getCrdName(controller); + String crdName = ControllerUtils.getCrdName(controller); CustomResourceDefinition customResourceDefinition = k8sClient.customResourceDefinitions().withName(crdName).get(); if (customResourceDefinition == null) { throw new OperatorException("Cannot find Custom Resource Definition with name: " + crdName); diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/OperatorException.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/OperatorException.java similarity index 85% rename from operator-framework/src/main/java/com/github/containersolutions/operator/OperatorException.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/OperatorException.java index 232c794ac5..da1040f3ab 100644 --- a/operator-framework/src/main/java/com/github/containersolutions/operator/OperatorException.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/OperatorException.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator; +package io.javaoperatorsdk.operator; public class OperatorException extends RuntimeException { diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/api/Context.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/api/Context.java similarity index 72% rename from operator-framework/src/main/java/com/github/containersolutions/operator/api/Context.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/api/Context.java index 16cde8f72b..eafc50a274 100644 --- a/operator-framework/src/main/java/com/github/containersolutions/operator/api/Context.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/api/Context.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.api; +package io.javaoperatorsdk.operator.api; import io.fabric8.kubernetes.client.CustomResource; diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/api/Controller.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/api/Controller.java similarity index 94% rename from operator-framework/src/main/java/com/github/containersolutions/operator/api/Controller.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/api/Controller.java index 4a5988a78d..a2aba33cb7 100644 --- a/operator-framework/src/main/java/com/github/containersolutions/operator/api/Controller.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/api/Controller.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.api; +package io.javaoperatorsdk.operator.api; import io.fabric8.kubernetes.client.CustomResource; diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/api/DefaultContext.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/api/DefaultContext.java similarity index 87% rename from operator-framework/src/main/java/com/github/containersolutions/operator/api/DefaultContext.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/api/DefaultContext.java index bf80268c31..c7283c7130 100644 --- a/operator-framework/src/main/java/com/github/containersolutions/operator/api/DefaultContext.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/api/DefaultContext.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.api; +package io.javaoperatorsdk.operator.api; import io.fabric8.kubernetes.client.CustomResource; diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/api/ResourceController.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/api/ResourceController.java similarity index 96% rename from operator-framework/src/main/java/com/github/containersolutions/operator/api/ResourceController.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/api/ResourceController.java index f4039902cd..15c464a3cd 100644 --- a/operator-framework/src/main/java/com/github/containersolutions/operator/api/ResourceController.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/api/ResourceController.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.api; +package io.javaoperatorsdk.operator.api; import io.fabric8.kubernetes.client.CustomResource; diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/api/RetryInfo.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/api/RetryInfo.java similarity index 87% rename from operator-framework/src/main/java/com/github/containersolutions/operator/api/RetryInfo.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/api/RetryInfo.java index e364bc3e0b..a1b385a51a 100644 --- a/operator-framework/src/main/java/com/github/containersolutions/operator/api/RetryInfo.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/api/RetryInfo.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.api; +package io.javaoperatorsdk.operator.api; public class RetryInfo { diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/api/UpdateControl.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/api/UpdateControl.java similarity index 96% rename from operator-framework/src/main/java/com/github/containersolutions/operator/api/UpdateControl.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/api/UpdateControl.java index 76adf14559..0c152b67e6 100644 --- a/operator-framework/src/main/java/com/github/containersolutions/operator/api/UpdateControl.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/api/UpdateControl.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.api; +package io.javaoperatorsdk.operator.api; import io.fabric8.kubernetes.client.CustomResource; diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/CustomResourceEvent.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/CustomResourceEvent.java similarity index 88% rename from operator-framework/src/main/java/com/github/containersolutions/operator/processing/CustomResourceEvent.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/CustomResourceEvent.java index 433131a312..1e5e0d5dc0 100644 --- a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/CustomResourceEvent.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/CustomResourceEvent.java @@ -1,7 +1,7 @@ -package com.github.containersolutions.operator.processing; +package io.javaoperatorsdk.operator.processing; -import com.github.containersolutions.operator.processing.retry.Retry; -import com.github.containersolutions.operator.processing.retry.RetryExecution; +import io.javaoperatorsdk.operator.processing.retry.Retry; +import io.javaoperatorsdk.operator.processing.retry.RetryExecution; import io.fabric8.kubernetes.client.CustomResource; import io.fabric8.kubernetes.client.Watcher; diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventConsumer.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventConsumer.java similarity index 95% rename from operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventConsumer.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventConsumer.java index 766b4f8c07..aba4fae5ed 100644 --- a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventConsumer.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventConsumer.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.processing; +package io.javaoperatorsdk.operator.processing; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventDispatcher.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventDispatcher.java similarity index 97% rename from operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventDispatcher.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventDispatcher.java index 0d6f5346d1..11cc350ad1 100644 --- a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventDispatcher.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventDispatcher.java @@ -1,11 +1,11 @@ -package com.github.containersolutions.operator.processing; +package io.javaoperatorsdk.operator.processing; -import com.github.containersolutions.operator.ControllerUtils; -import com.github.containersolutions.operator.api.*; +import io.javaoperatorsdk.operator.ControllerUtils; import io.fabric8.kubernetes.client.CustomResource; import io.fabric8.kubernetes.client.Watcher; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.Resource; +import io.javaoperatorsdk.operator.api.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventScheduler.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventScheduler.java similarity index 98% rename from operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventScheduler.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventScheduler.java index b72ba8da69..d2ed63a218 100644 --- a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventScheduler.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventScheduler.java @@ -1,7 +1,7 @@ -package com.github.containersolutions.operator.processing; +package io.javaoperatorsdk.operator.processing; -import com.github.containersolutions.operator.processing.retry.Retry; +import io.javaoperatorsdk.operator.processing.retry.Retry; import io.fabric8.kubernetes.client.CustomResource; import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.Watcher; diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventStore.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventStore.java similarity index 94% rename from operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventStore.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventStore.java index 29cfac5348..99d84864b4 100644 --- a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventStore.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventStore.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.processing; +package io.javaoperatorsdk.operator.processing; import java.util.HashMap; import java.util.Map; diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/retry/GenericRetry.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/GenericRetry.java similarity index 97% rename from operator-framework/src/main/java/com/github/containersolutions/operator/processing/retry/GenericRetry.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/GenericRetry.java index ea51e20b86..31f65bf21e 100644 --- a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/retry/GenericRetry.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/GenericRetry.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.processing.retry; +package io.javaoperatorsdk.operator.processing.retry; public class GenericRetry implements Retry { diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/retry/GenericRetryExecution.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/GenericRetryExecution.java similarity index 95% rename from operator-framework/src/main/java/com/github/containersolutions/operator/processing/retry/GenericRetryExecution.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/GenericRetryExecution.java index e6e9070ca9..c39ae93709 100644 --- a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/retry/GenericRetryExecution.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/GenericRetryExecution.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.processing.retry; +package io.javaoperatorsdk.operator.processing.retry; import java.util.Optional; diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/retry/Retry.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/Retry.java similarity index 50% rename from operator-framework/src/main/java/com/github/containersolutions/operator/processing/retry/Retry.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/Retry.java index 99546a4fbb..cd71bd57f4 100644 --- a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/retry/Retry.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/Retry.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.processing.retry; +package io.javaoperatorsdk.operator.processing.retry; public interface Retry { diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/retry/RetryExecution.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/RetryExecution.java similarity index 86% rename from operator-framework/src/main/java/com/github/containersolutions/operator/processing/retry/RetryExecution.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/RetryExecution.java index af95f20c0e..d365b3d4de 100644 --- a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/retry/RetryExecution.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/RetryExecution.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.processing.retry; +package io.javaoperatorsdk.operator.processing.retry; import java.util.Optional; diff --git a/operator-framework/src/test/java/com/github/containersolutions/operator/ConcurrencyIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ConcurrencyIT.java similarity index 82% rename from operator-framework/src/test/java/com/github/containersolutions/operator/ConcurrencyIT.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/ConcurrencyIT.java index 6d1dcab565..845ab3a26c 100644 --- a/operator-framework/src/test/java/com/github/containersolutions/operator/ConcurrencyIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ConcurrencyIT.java @@ -1,7 +1,7 @@ -package com.github.containersolutions.operator; +package io.javaoperatorsdk.operator; -import com.github.containersolutions.operator.sample.TestCustomResource; -import com.github.containersolutions.operator.sample.TestCustomResourceController; +import io.javaoperatorsdk.operator.sample.TestCustomResource; +import io.javaoperatorsdk.operator.sample.TestCustomResourceController; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; @@ -17,7 +17,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.github.containersolutions.operator.IntegrationTestSupport.TEST_NAMESPACE; import static org.assertj.core.api.Assertions.assertThat; @TestInstance(TestInstance.Lifecycle.PER_CLASS) @@ -48,13 +47,13 @@ public void manyResourcesGetCreatedUpdatedAndDeleted() { log.info("Creating {} new resources", NUMBER_OF_RESOURCES_CREATED); for (int i = 0; i < NUMBER_OF_RESOURCES_CREATED; i++) { TestCustomResource tcr = integrationTest.createTestCustomResource(String.valueOf(i)); - integrationTest.getCrOperations().inNamespace(TEST_NAMESPACE).create(tcr); + integrationTest.getCrOperations().inNamespace(IntegrationTestSupport.TEST_NAMESPACE).create(tcr); } Awaitility.await().atMost(1, TimeUnit.MINUTES) .untilAsserted(() -> { List items = integrationTest.getK8sClient().configMaps() - .inNamespace(TEST_NAMESPACE) + .inNamespace(IntegrationTestSupport.TEST_NAMESPACE) .withLabel("managedBy", TestCustomResourceController.class.getSimpleName()) .list().getItems(); assertThat(items).hasSize(NUMBER_OF_RESOURCES_CREATED); @@ -64,11 +63,11 @@ public void manyResourcesGetCreatedUpdatedAndDeleted() { // update some resources for (int i = 0; i < NUMBER_OF_RESOURCES_UPDATED; i++) { TestCustomResource tcr = (TestCustomResource) integrationTest.getCrOperations() - .inNamespace(TEST_NAMESPACE) + .inNamespace(IntegrationTestSupport.TEST_NAMESPACE) .withName(IntegrationTestSupport.TEST_CUSTOM_RESOURCE_PREFIX + i) .get(); tcr.getSpec().setValue(i + UPDATED_SUFFIX); - integrationTest.getCrOperations().inNamespace(TEST_NAMESPACE).createOrReplace(tcr); + integrationTest.getCrOperations().inNamespace(IntegrationTestSupport.TEST_NAMESPACE).createOrReplace(tcr); } // sleep for a short time to make variability to the test, so some updates are not executed before delete Thread.sleep(300); @@ -76,13 +75,13 @@ public void manyResourcesGetCreatedUpdatedAndDeleted() { log.info("Deleting {} resources", NUMBER_OF_RESOURCES_DELETED); for (int i = 0; i < NUMBER_OF_RESOURCES_DELETED; i++) { TestCustomResource tcr = integrationTest.createTestCustomResource(String.valueOf(i)); - integrationTest.getCrOperations().inNamespace(TEST_NAMESPACE).delete(tcr); + integrationTest.getCrOperations().inNamespace(IntegrationTestSupport.TEST_NAMESPACE).delete(tcr); } Awaitility.await().atMost(1, TimeUnit.MINUTES) .untilAsserted(() -> { List items = integrationTest.getK8sClient().configMaps() - .inNamespace(TEST_NAMESPACE) + .inNamespace(IntegrationTestSupport.TEST_NAMESPACE) .withLabel("managedBy", TestCustomResourceController.class.getSimpleName()) .list().getItems(); //reducing configmaps to names only - better for debugging @@ -90,7 +89,7 @@ public void manyResourcesGetCreatedUpdatedAndDeleted() { assertThat(itemDescs).hasSize(NUMBER_OF_RESOURCES_CREATED - NUMBER_OF_RESOURCES_DELETED); List crs = integrationTest.getCrOperations() - .inNamespace(TEST_NAMESPACE) + .inNamespace(IntegrationTestSupport.TEST_NAMESPACE) .list().getItems(); assertThat(crs).hasSize(NUMBER_OF_RESOURCES_CREATED - NUMBER_OF_RESOURCES_DELETED); }); diff --git a/operator-framework/src/test/java/com/github/containersolutions/operator/ControllerExecutionIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerExecutionIT.java similarity index 85% rename from operator-framework/src/test/java/com/github/containersolutions/operator/ControllerExecutionIT.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerExecutionIT.java index f369250667..0cf0478342 100644 --- a/operator-framework/src/test/java/com/github/containersolutions/operator/ControllerExecutionIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerExecutionIT.java @@ -1,8 +1,8 @@ -package com.github.containersolutions.operator; +package io.javaoperatorsdk.operator; -import com.github.containersolutions.operator.sample.TestCustomResource; -import com.github.containersolutions.operator.sample.TestCustomResourceController; -import com.github.containersolutions.operator.sample.TestCustomResourceSpec; +import io.javaoperatorsdk.operator.sample.TestCustomResource; +import io.javaoperatorsdk.operator.sample.TestCustomResourceController; +import io.javaoperatorsdk.operator.sample.TestCustomResourceSpec; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; @@ -15,7 +15,6 @@ import java.util.HashMap; import java.util.concurrent.TimeUnit; -import static com.github.containersolutions.operator.IntegrationTestSupport.TEST_NAMESPACE; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -38,7 +37,7 @@ public void configMapGetsCreatedForTestCustomResource() { integrationTestSupport.teardownIfSuccess(() -> { TestCustomResource resource = testCustomResource(); - integrationTestSupport.getCrOperations().inNamespace(TEST_NAMESPACE).create(resource); + integrationTestSupport.getCrOperations().inNamespace(IntegrationTestSupport.TEST_NAMESPACE).create(resource); awaitResourcesCreatedOrUpdated(); awaitStatusUpdated(); @@ -52,7 +51,7 @@ public void eventIsSkippedChangedOnMetadataOnlyUpdate() { integrationTestSupport.teardownIfSuccess(() -> { TestCustomResource resource = testCustomResource(); - integrationTestSupport.getCrOperations().inNamespace(TEST_NAMESPACE).create(resource); + integrationTestSupport.getCrOperations().inNamespace(IntegrationTestSupport.TEST_NAMESPACE).create(resource); awaitResourcesCreatedOrUpdated(); assertThat(integrationTestSupport.numberOfControllerExecutions()).isEqualTo(1); @@ -67,8 +66,8 @@ public void retryConflict() { TestCustomResource resource2 = testCustomResource(); resource2.getMetadata().getAnnotations().put("test-annotation", "val"); - integrationTestSupport.getCrOperations().inNamespace(TEST_NAMESPACE).create(resource); - integrationTestSupport.getCrOperations().inNamespace(TEST_NAMESPACE).createOrReplace(resource2); + integrationTestSupport.getCrOperations().inNamespace(IntegrationTestSupport.TEST_NAMESPACE).create(resource); + integrationTestSupport.getCrOperations().inNamespace(IntegrationTestSupport.TEST_NAMESPACE).createOrReplace(resource2); awaitResourcesCreatedOrUpdated(); awaitStatusUpdated(5); @@ -79,7 +78,7 @@ public void retryConflict() { void awaitResourcesCreatedOrUpdated() { await("config map created").atMost(5, TimeUnit.SECONDS) .untilAsserted(() -> { - ConfigMap configMap = integrationTestSupport.getK8sClient().configMaps().inNamespace(TEST_NAMESPACE) + ConfigMap configMap = integrationTestSupport.getK8sClient().configMaps().inNamespace(IntegrationTestSupport.TEST_NAMESPACE) .withName("test-config-map").get(); assertThat(configMap).isNotNull(); assertThat(configMap.getData().get("test-key")).isEqualTo("test-value"); @@ -94,7 +93,7 @@ void awaitStatusUpdated(int timeout) { await("cr status updated").atMost(timeout, TimeUnit.SECONDS) .untilAsserted(() -> { TestCustomResource cr = (TestCustomResource) integrationTestSupport.getCrOperations() - .inNamespace(TEST_NAMESPACE).withName(TEST_CUSTOM_RESOURCE_NAME).get(); + .inNamespace(IntegrationTestSupport.TEST_NAMESPACE).withName(TEST_CUSTOM_RESOURCE_NAME).get(); assertThat(cr).isNotNull(); assertThat(cr.getStatus()).isNotNull(); assertThat(cr.getStatus().getConfigMapStatus()).isEqualTo("ConfigMap Ready"); @@ -105,7 +104,7 @@ private TestCustomResource testCustomResource() { TestCustomResource resource = new TestCustomResource(); resource.setMetadata(new ObjectMetaBuilder() .withName(TEST_CUSTOM_RESOURCE_NAME) - .withNamespace(TEST_NAMESPACE) + .withNamespace(IntegrationTestSupport.TEST_NAMESPACE) .build()); resource.getMetadata().setAnnotations(new HashMap<>()); resource.setKind("CustomService"); diff --git a/operator-framework/src/test/java/com/github/containersolutions/operator/ControllerUtilsTest.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerUtilsTest.java similarity index 54% rename from operator-framework/src/test/java/com/github/containersolutions/operator/ControllerUtilsTest.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerUtilsTest.java index 7f7731e9bd..d0a143e427 100644 --- a/operator-framework/src/test/java/com/github/containersolutions/operator/ControllerUtilsTest.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerUtilsTest.java @@ -1,12 +1,12 @@ -package com.github.containersolutions.operator; +package io.javaoperatorsdk.operator; -import com.github.containersolutions.operator.sample.TestCustomResource; -import com.github.containersolutions.operator.sample.TestCustomResourceController; +import io.javaoperatorsdk.operator.sample.TestCustomResource; +import io.javaoperatorsdk.operator.sample.TestCustomResourceController; import io.fabric8.kubernetes.client.CustomResourceDoneable; +import io.javaoperatorsdk.operator.api.Controller; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import static com.github.containersolutions.operator.api.Controller.DEFAULT_FINALIZER; -import static com.github.containersolutions.operator.sample.TestCustomResourceController.CRD_NAME; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -14,9 +14,9 @@ class ControllerUtilsTest { @Test public void returnsValuesFromControllerAnnotationFinalizer() { - assertEquals(DEFAULT_FINALIZER, ControllerUtils.getDefaultFinalizer(new TestCustomResourceController(null))); + Assertions.assertEquals(Controller.DEFAULT_FINALIZER, ControllerUtils.getDefaultFinalizer(new TestCustomResourceController(null))); assertEquals(TestCustomResource.class, ControllerUtils.getCustomResourceClass(new TestCustomResourceController(null))); - assertEquals(CRD_NAME, ControllerUtils.getCrdName(new TestCustomResourceController(null))); + Assertions.assertEquals(TestCustomResourceController.CRD_NAME, ControllerUtils.getCrdName(new TestCustomResourceController(null))); assertEquals(false, ControllerUtils.getGenerationEventProcessing(new TestCustomResourceController(null))); assertTrue(CustomResourceDoneable.class.isAssignableFrom(ControllerUtils.getCustomResourceDoneableClass(new TestCustomResourceController(null)))); } diff --git a/operator-framework/src/test/java/com/github/containersolutions/operator/EventDispatcherTest.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/EventDispatcherTest.java similarity index 89% rename from operator-framework/src/test/java/com/github/containersolutions/operator/EventDispatcherTest.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/EventDispatcherTest.java index bd7a2e1d3b..9509880bf3 100644 --- a/operator-framework/src/test/java/com/github/containersolutions/operator/EventDispatcherTest.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/EventDispatcherTest.java @@ -1,20 +1,20 @@ -package com.github.containersolutions.operator; - -import com.github.containersolutions.operator.api.ResourceController; -import com.github.containersolutions.operator.api.UpdateControl; -import com.github.containersolutions.operator.processing.CustomResourceEvent; -import com.github.containersolutions.operator.processing.EventDispatcher; -import com.github.containersolutions.operator.processing.retry.GenericRetry; -import com.github.containersolutions.operator.sample.TestCustomResource; +package io.javaoperatorsdk.operator; + +import io.javaoperatorsdk.operator.api.ResourceController; +import io.javaoperatorsdk.operator.api.UpdateControl; +import io.javaoperatorsdk.operator.processing.CustomResourceEvent; +import io.javaoperatorsdk.operator.processing.EventDispatcher; +import io.javaoperatorsdk.operator.processing.retry.GenericRetry; +import io.javaoperatorsdk.operator.sample.TestCustomResource; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.fabric8.kubernetes.client.CustomResource; import io.fabric8.kubernetes.client.Watcher; +import io.javaoperatorsdk.operator.api.Controller; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; -import static com.github.containersolutions.operator.api.Controller.DEFAULT_FINALIZER; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.*; @@ -28,7 +28,7 @@ class EventDispatcherTest { @BeforeEach void setup() { eventDispatcher = new EventDispatcher(controller, - DEFAULT_FINALIZER, customResourceFacade, false); + Controller.DEFAULT_FINALIZER, customResourceFacade, false); testCustomResource = getResource(); @@ -45,7 +45,7 @@ void callCreateOrUpdateOnNewResource() { @Test void updatesOnlyStatusSubResource() { - testCustomResource.getMetadata().getFinalizers().add(DEFAULT_FINALIZER); + testCustomResource.getMetadata().getFinalizers().add(Controller.DEFAULT_FINALIZER); when(controller.createOrUpdateResource(eq(testCustomResource), any())) .thenReturn(UpdateControl.updateStatusSubResource(testCustomResource)); @@ -67,13 +67,13 @@ void adsDefaultFinalizerOnCreateIfNotThere() { eventDispatcher.handleEvent(customResourceEvent(Watcher.Action.MODIFIED, testCustomResource)); verify(controller, times(1)) .createOrUpdateResource(argThat(testCustomResource -> - testCustomResource.getMetadata().getFinalizers().contains(DEFAULT_FINALIZER)), any()); + testCustomResource.getMetadata().getFinalizers().contains(Controller.DEFAULT_FINALIZER)), any()); } @Test void callsDeleteIfObjectHasFinalizerAndMarkedForDelete() { testCustomResource.getMetadata().setDeletionTimestamp("2019-8-10"); - testCustomResource.getMetadata().getFinalizers().add(DEFAULT_FINALIZER); + testCustomResource.getMetadata().getFinalizers().add(Controller.DEFAULT_FINALIZER); eventDispatcher.handleEvent(customResourceEvent(Watcher.Action.MODIFIED, testCustomResource)); @@ -183,7 +183,7 @@ void doesNotMarkNewGenerationInCaseOfException() { void generationAwareMode() { eventDispatcher = new EventDispatcher(controller, - DEFAULT_FINALIZER, customResourceFacade, true); + Controller.DEFAULT_FINALIZER, customResourceFacade, true); } private void markForDeletion(CustomResource customResource) { @@ -202,7 +202,7 @@ CustomResource getResource() { .withDeletionGracePeriodSeconds(10L) .withGeneration(10L) .withName("name") - .withFinalizers(DEFAULT_FINALIZER) + .withFinalizers(Controller.DEFAULT_FINALIZER) .withNamespace("namespace") .withResourceVersion("resourceVersion") .withSelfLink("selfLink") diff --git a/operator-framework/src/test/java/com/github/containersolutions/operator/EventSchedulerTest.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/EventSchedulerTest.java similarity index 95% rename from operator-framework/src/test/java/com/github/containersolutions/operator/EventSchedulerTest.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/EventSchedulerTest.java index 5dec1b5528..106b81df11 100644 --- a/operator-framework/src/test/java/com/github/containersolutions/operator/EventSchedulerTest.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/EventSchedulerTest.java @@ -1,10 +1,10 @@ -package com.github.containersolutions.operator; +package io.javaoperatorsdk.operator; -import com.github.containersolutions.operator.processing.CustomResourceEvent; -import com.github.containersolutions.operator.processing.EventDispatcher; -import com.github.containersolutions.operator.processing.EventScheduler; -import com.github.containersolutions.operator.processing.retry.GenericRetry; -import com.github.containersolutions.operator.sample.TestCustomResource; +import io.javaoperatorsdk.operator.processing.CustomResourceEvent; +import io.javaoperatorsdk.operator.processing.EventDispatcher; +import io.javaoperatorsdk.operator.processing.EventScheduler; +import io.javaoperatorsdk.operator.processing.retry.GenericRetry; +import io.javaoperatorsdk.operator.sample.TestCustomResource; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.fabric8.kubernetes.client.CustomResource; import io.fabric8.kubernetes.client.Watcher; @@ -21,7 +21,6 @@ import java.util.Collections; import java.util.List; -import static com.github.containersolutions.operator.processing.retry.GenericRetry.DEFAULT_INITIAL_INTERVAL; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.atIndex; import static org.mockito.Mockito.*; @@ -242,7 +241,7 @@ private void waitTimeForExecution(int numberOfEvents) { private void waitTimeForExecution(int numberOfEvents, int retries) { try { Thread.sleep(200 + ((INVOCATION_DURATION + 30) * numberOfEvents) + (retries * (INVOCATION_DURATION + 100)) + - retries * (DEFAULT_INITIAL_INTERVAL + 100)); + retries * (GenericRetry.DEFAULT_INITIAL_INTERVAL + 100)); } catch (InterruptedException e) { throw new IllegalStateException(e); } diff --git a/operator-framework/src/test/java/com/github/containersolutions/operator/IntegrationTestSupport.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java similarity index 91% rename from operator-framework/src/test/java/com/github/containersolutions/operator/IntegrationTestSupport.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java index e79606e5c4..b9bd2f6f69 100644 --- a/operator-framework/src/test/java/com/github/containersolutions/operator/IntegrationTestSupport.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java @@ -1,8 +1,8 @@ -package com.github.containersolutions.operator; +package io.javaoperatorsdk.operator; -import com.github.containersolutions.operator.api.ResourceController; -import com.github.containersolutions.operator.sample.TestCustomResource; -import com.github.containersolutions.operator.sample.TestCustomResourceSpec; +import io.javaoperatorsdk.operator.api.ResourceController; +import io.javaoperatorsdk.operator.sample.TestCustomResource; +import io.javaoperatorsdk.operator.sample.TestCustomResourceSpec; import io.fabric8.kubernetes.api.model.Namespace; import io.fabric8.kubernetes.api.model.NamespaceBuilder; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; @@ -22,8 +22,6 @@ import java.io.InputStream; import java.util.concurrent.TimeUnit; -import static com.github.containersolutions.operator.ControllerUtils.getCustomResourceClass; -import static com.github.containersolutions.operator.ControllerUtils.getCustomResourceDoneableClass; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -45,8 +43,8 @@ public void initialize(KubernetesClient k8sClient, ResourceController controller CustomResourceDefinitionContext crdContext = CustomResourceDefinitionContext.fromCrd(crd); this.controller = controller; - Class doneableClass = getCustomResourceDoneableClass(controller); - Class customResourceClass = getCustomResourceClass(controller); + Class doneableClass = ControllerUtils.getCustomResourceDoneableClass(controller); + Class customResourceClass = ControllerUtils.getCustomResourceClass(controller); crOperations = k8sClient.customResources(crdContext, customResourceClass, CustomResourceList.class, doneableClass); if (k8sClient.namespaces().withName(TEST_NAMESPACE).get() == null) { diff --git a/operator-framework/src/test/java/com/github/containersolutions/operator/SubResourceUpdateIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/SubResourceUpdateIT.java similarity index 87% rename from operator-framework/src/test/java/com/github/containersolutions/operator/SubResourceUpdateIT.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/SubResourceUpdateIT.java index fa049d29fb..c070fab162 100644 --- a/operator-framework/src/test/java/com/github/containersolutions/operator/SubResourceUpdateIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/SubResourceUpdateIT.java @@ -1,20 +1,20 @@ -package com.github.containersolutions.operator; +package io.javaoperatorsdk.operator; -import com.github.containersolutions.operator.sample.subresource.SubResourceTestCustomResource; -import com.github.containersolutions.operator.sample.subresource.SubResourceTestCustomResourceController; -import com.github.containersolutions.operator.sample.subresource.SubResourceTestCustomResourceSpec; +import io.javaoperatorsdk.operator.sample.subresource.SubResourceTestCustomResource; +import io.javaoperatorsdk.operator.sample.subresource.SubResourceTestCustomResourceController; +import io.javaoperatorsdk.operator.sample.subresource.SubResourceTestCustomResourceSpec; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; +import io.javaoperatorsdk.operator.api.Controller; +import io.javaoperatorsdk.operator.sample.subresource.SubResourceTestCustomResourceStatus; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import java.util.concurrent.TimeUnit; -import static com.github.containersolutions.operator.IntegrationTestSupport.TEST_NAMESPACE; -import static com.github.containersolutions.operator.api.Controller.DEFAULT_FINALIZER; -import static com.github.containersolutions.operator.sample.subresource.SubResourceTestCustomResourceStatus.State.SUCCESS; +import static io.javaoperatorsdk.operator.IntegrationTestSupport.TEST_NAMESPACE; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -95,7 +95,7 @@ void awaitStatusUpdated(String name) { assertThat(cr.getMetadata().getFinalizers()).hasSize(1); assertThat(cr).isNotNull(); assertThat(cr.getStatus()).isNotNull(); - assertThat(cr.getStatus().getState()).isEqualTo(SUCCESS); + assertThat(cr.getStatus().getState()).isEqualTo(SubResourceTestCustomResourceStatus.State.SUCCESS); }); } @@ -104,7 +104,7 @@ public SubResourceTestCustomResource createTestCustomResource(String id) { resource.setMetadata(new ObjectMetaBuilder() .withName("subresource-" + id) .withNamespace(TEST_NAMESPACE) - .withFinalizers(DEFAULT_FINALIZER) + .withFinalizers(Controller.DEFAULT_FINALIZER) .build()); resource.setKind("SubresourceSample"); resource.setSpec(new SubResourceTestCustomResourceSpec()); diff --git a/operator-framework/src/test/java/com/github/containersolutions/operator/TestExecutionInfoProvider.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/TestExecutionInfoProvider.java similarity index 63% rename from operator-framework/src/test/java/com/github/containersolutions/operator/TestExecutionInfoProvider.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/TestExecutionInfoProvider.java index e7efb09f5a..4a6548c727 100644 --- a/operator-framework/src/test/java/com/github/containersolutions/operator/TestExecutionInfoProvider.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/TestExecutionInfoProvider.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator; +package io.javaoperatorsdk.operator; public interface TestExecutionInfoProvider { diff --git a/operator-framework/src/test/java/com/github/containersolutions/operator/processing/retry/GenericRetryExecutionTest.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/processing/retry/GenericRetryExecutionTest.java similarity index 80% rename from operator-framework/src/test/java/com/github/containersolutions/operator/processing/retry/GenericRetryExecutionTest.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/processing/retry/GenericRetryExecutionTest.java index 9fab7e2615..ffc5238998 100644 --- a/operator-framework/src/test/java/com/github/containersolutions/operator/processing/retry/GenericRetryExecutionTest.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/processing/retry/GenericRetryExecutionTest.java @@ -1,11 +1,9 @@ -package com.github.containersolutions.operator.processing.retry; +package io.javaoperatorsdk.operator.processing.retry; import org.junit.jupiter.api.Test; import java.util.Optional; -import static com.github.containersolutions.operator.processing.retry.GenericRetry.DEFAULT_INITIAL_INTERVAL; -import static com.github.containersolutions.operator.processing.retry.GenericRetry.DEFAULT_MULTIPLIER; import static org.assertj.core.api.Assertions.assertThat; public class GenericRetryExecutionTest { @@ -20,13 +18,13 @@ public void delayIsMultipliedEveryNextDelayCall() { RetryExecution retryExecution = getDefaultRetryExecution(); Optional res = callNextDelayNTimes(retryExecution, 2); - assertThat(res.get()).isEqualTo(DEFAULT_INITIAL_INTERVAL); + assertThat(res.get()).isEqualTo(GenericRetry.DEFAULT_INITIAL_INTERVAL); res = retryExecution.nextDelay(); - assertThat(res.get()).isEqualTo((long) (DEFAULT_INITIAL_INTERVAL * DEFAULT_MULTIPLIER)); + assertThat(res.get()).isEqualTo((long) (GenericRetry.DEFAULT_INITIAL_INTERVAL * GenericRetry.DEFAULT_MULTIPLIER)); res = retryExecution.nextDelay(); - assertThat(res.get()).isEqualTo((long) (DEFAULT_INITIAL_INTERVAL * DEFAULT_MULTIPLIER * DEFAULT_MULTIPLIER)); + assertThat(res.get()).isEqualTo((long) (GenericRetry.DEFAULT_INITIAL_INTERVAL * GenericRetry.DEFAULT_MULTIPLIER * GenericRetry.DEFAULT_MULTIPLIER)); } @Test diff --git a/operator-framework/src/test/java/com/github/containersolutions/operator/sample/TestCustomResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/TestCustomResource.java similarity index 93% rename from operator-framework/src/test/java/com/github/containersolutions/operator/sample/TestCustomResource.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/TestCustomResource.java index a24e4e4757..3a2110960c 100644 --- a/operator-framework/src/test/java/com/github/containersolutions/operator/sample/TestCustomResource.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/TestCustomResource.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; import io.fabric8.kubernetes.client.CustomResource; diff --git a/operator-framework/src/test/java/com/github/containersolutions/operator/sample/TestCustomResourceController.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/TestCustomResourceController.java similarity index 91% rename from operator-framework/src/test/java/com/github/containersolutions/operator/sample/TestCustomResourceController.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/TestCustomResourceController.java index ce08d6778c..d272563537 100644 --- a/operator-framework/src/test/java/com/github/containersolutions/operator/sample/TestCustomResourceController.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/TestCustomResourceController.java @@ -1,10 +1,10 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; -import com.github.containersolutions.operator.TestExecutionInfoProvider; -import com.github.containersolutions.operator.api.Context; -import com.github.containersolutions.operator.api.Controller; -import com.github.containersolutions.operator.api.ResourceController; -import com.github.containersolutions.operator.api.UpdateControl; +import io.javaoperatorsdk.operator.TestExecutionInfoProvider; +import io.javaoperatorsdk.operator.api.Context; +import io.javaoperatorsdk.operator.api.Controller; +import io.javaoperatorsdk.operator.api.ResourceController; +import io.javaoperatorsdk.operator.api.UpdateControl; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; diff --git a/operator-framework/src/test/java/com/github/containersolutions/operator/sample/TestCustomResourceSpec.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/TestCustomResourceSpec.java similarity index 93% rename from operator-framework/src/test/java/com/github/containersolutions/operator/sample/TestCustomResourceSpec.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/TestCustomResourceSpec.java index 31a060733f..63878a0c1e 100644 --- a/operator-framework/src/test/java/com/github/containersolutions/operator/sample/TestCustomResourceSpec.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/TestCustomResourceSpec.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; public class TestCustomResourceSpec { diff --git a/operator-framework/src/test/java/com/github/containersolutions/operator/sample/TestCustomResourceStatus.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/TestCustomResourceStatus.java similarity index 89% rename from operator-framework/src/test/java/com/github/containersolutions/operator/sample/TestCustomResourceStatus.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/TestCustomResourceStatus.java index 686804232c..111a313f8a 100644 --- a/operator-framework/src/test/java/com/github/containersolutions/operator/sample/TestCustomResourceStatus.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/TestCustomResourceStatus.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; public class TestCustomResourceStatus { diff --git a/operator-framework/src/test/java/com/github/containersolutions/operator/sample/subresource/SubResourceTestCustomResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResource.java similarity index 92% rename from operator-framework/src/test/java/com/github/containersolutions/operator/sample/subresource/SubResourceTestCustomResource.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResource.java index 39f3474852..caab91bfe6 100644 --- a/operator-framework/src/test/java/com/github/containersolutions/operator/sample/subresource/SubResourceTestCustomResource.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResource.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample.subresource; +package io.javaoperatorsdk.operator.sample.subresource; import io.fabric8.kubernetes.client.CustomResource; diff --git a/operator-framework/src/test/java/com/github/containersolutions/operator/sample/subresource/SubResourceTestCustomResourceController.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResourceController.java similarity index 83% rename from operator-framework/src/test/java/com/github/containersolutions/operator/sample/subresource/SubResourceTestCustomResourceController.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResourceController.java index e0c227e2a1..a08076e472 100644 --- a/operator-framework/src/test/java/com/github/containersolutions/operator/sample/subresource/SubResourceTestCustomResourceController.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResourceController.java @@ -1,10 +1,10 @@ -package com.github.containersolutions.operator.sample.subresource; +package io.javaoperatorsdk.operator.sample.subresource; -import com.github.containersolutions.operator.TestExecutionInfoProvider; -import com.github.containersolutions.operator.api.Context; -import com.github.containersolutions.operator.api.Controller; -import com.github.containersolutions.operator.api.ResourceController; -import com.github.containersolutions.operator.api.UpdateControl; +import io.javaoperatorsdk.operator.TestExecutionInfoProvider; +import io.javaoperatorsdk.operator.api.Context; +import io.javaoperatorsdk.operator.api.Controller; +import io.javaoperatorsdk.operator.api.ResourceController; +import io.javaoperatorsdk.operator.api.UpdateControl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/operator-framework/src/test/java/com/github/containersolutions/operator/sample/subresource/SubResourceTestCustomResourceSpec.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResourceSpec.java similarity index 79% rename from operator-framework/src/test/java/com/github/containersolutions/operator/sample/subresource/SubResourceTestCustomResourceSpec.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResourceSpec.java index a67babf9c8..b9bc226a33 100644 --- a/operator-framework/src/test/java/com/github/containersolutions/operator/sample/subresource/SubResourceTestCustomResourceSpec.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResourceSpec.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample.subresource; +package io.javaoperatorsdk.operator.sample.subresource; public class SubResourceTestCustomResourceSpec { diff --git a/operator-framework/src/test/java/com/github/containersolutions/operator/sample/subresource/SubResourceTestCustomResourceStatus.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResourceStatus.java similarity index 83% rename from operator-framework/src/test/java/com/github/containersolutions/operator/sample/subresource/SubResourceTestCustomResourceStatus.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResourceStatus.java index 3e8ab5afa0..4ca0de5fe7 100644 --- a/operator-framework/src/test/java/com/github/containersolutions/operator/sample/subresource/SubResourceTestCustomResourceStatus.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResourceStatus.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample.subresource; +package io.javaoperatorsdk.operator.sample.subresource; public class SubResourceTestCustomResourceStatus { diff --git a/operator-framework/src/test/resources/com/github/containersolutions/operator/subresource-test-crd.yaml b/operator-framework/src/test/resources/io/javaoperatorsdk/operator/subresource-test-crd.yaml similarity index 100% rename from operator-framework/src/test/resources/com/github/containersolutions/operator/subresource-test-crd.yaml rename to operator-framework/src/test/resources/io/javaoperatorsdk/operator/subresource-test-crd.yaml diff --git a/operator-framework/src/test/resources/com/github/containersolutions/operator/test-crd.yaml b/operator-framework/src/test/resources/io/javaoperatorsdk/operator/test-crd.yaml similarity index 100% rename from operator-framework/src/test/resources/com/github/containersolutions/operator/test-crd.yaml rename to operator-framework/src/test/resources/io/javaoperatorsdk/operator/test-crd.yaml diff --git a/pom.xml b/pom.xml index 46603a5d4e..98640f5348 100644 --- a/pom.xml +++ b/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.github.containersolutions + io.javaoperatorsdk java-operator-sdk 1.3.1-SNAPSHOT Operator SDK for Java Java SDK for implementing Kubernetes operators pom - https://github.com/ContainerSolutions/java-operator-sdk + https://github.com/java-operator-sdk/java-operator-sdk @@ -29,14 +29,15 @@ - scm:git:git://github.com/ContainerSolutions/java-operator-sdk.git - scm:git:git@github.com/ContainerSolutions/java-operator-sdk.git - https://github.com/ContainerSolutions/java-operator-sdk/tree/master + scm:git:git://github.com/java-operator-sdk/java-operator-sdk.git + scm:git:git@github.com/java-operator-sdk/java-operator-sdk.git + https://github.com/java-operator-sdk/java-operator-sdk/tree/master 5.7.0 3.0.0-M5 + UTF-8 diff --git a/samples/common/pom.xml b/samples/common/pom.xml index aa0e9eeb8e..729083b7cd 100644 --- a/samples/common/pom.xml +++ b/samples/common/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.github.containersolutions + io.javaoperatorsdk java-operator-sdk-samples 1.3.1-SNAPSHOT @@ -22,7 +22,7 @@ - com.github.containersolutions + io.javaoperatorsdk operator-framework ${project.version} diff --git a/samples/common/src/main/java/com/github/containersolutions/operator/sample/CustomService.java b/samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomService.java similarity index 83% rename from samples/common/src/main/java/com/github/containersolutions/operator/sample/CustomService.java rename to samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomService.java index 17f6e768f0..404a07c672 100644 --- a/samples/common/src/main/java/com/github/containersolutions/operator/sample/CustomService.java +++ b/samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomService.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; import io.fabric8.kubernetes.client.CustomResource; diff --git a/samples/common/src/main/java/com/github/containersolutions/operator/sample/CustomServiceController.java b/samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomServiceController.java similarity index 86% rename from samples/common/src/main/java/com/github/containersolutions/operator/sample/CustomServiceController.java rename to samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomServiceController.java index 140d3eee6f..e93f61034e 100644 --- a/samples/common/src/main/java/com/github/containersolutions/operator/sample/CustomServiceController.java +++ b/samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomServiceController.java @@ -1,16 +1,15 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; -import com.github.containersolutions.operator.api.Context; -import com.github.containersolutions.operator.api.Controller; -import com.github.containersolutions.operator.api.ResourceController; -import com.github.containersolutions.operator.api.UpdateControl; +import io.javaoperatorsdk.operator.api.Context; +import io.javaoperatorsdk.operator.api.Controller; +import io.javaoperatorsdk.operator.api.ResourceController; +import io.javaoperatorsdk.operator.api.UpdateControl; import io.fabric8.kubernetes.api.model.ServicePort; import io.fabric8.kubernetes.api.model.ServiceSpec; import io.fabric8.kubernetes.client.KubernetesClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Arrays; import java.util.Collections; /** diff --git a/samples/common/src/main/java/com/github/containersolutions/operator/sample/ServiceSpec.java b/samples/common/src/main/java/io/javaoperatorsdk/operator/sample/ServiceSpec.java similarity index 86% rename from samples/common/src/main/java/com/github/containersolutions/operator/sample/ServiceSpec.java rename to samples/common/src/main/java/io/javaoperatorsdk/operator/sample/ServiceSpec.java index 4cd8228746..840cbf581f 100644 --- a/samples/common/src/main/java/com/github/containersolutions/operator/sample/ServiceSpec.java +++ b/samples/common/src/main/java/io/javaoperatorsdk/operator/sample/ServiceSpec.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; public class ServiceSpec { diff --git a/samples/mysql-schema/pom.xml b/samples/mysql-schema/pom.xml index faee4b6b08..5e89cdedef 100644 --- a/samples/mysql-schema/pom.xml +++ b/samples/mysql-schema/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.github.containersolutions + io.javaoperatorsdk java-operator-sdk-samples 1.3.1-SNAPSHOT @@ -22,7 +22,7 @@ - com.github.containersolutions + io.javaoperatorsdk operator-framework ${project.version} @@ -92,7 +92,7 @@ - com.github.containersolutions.operator.sample.MySQLSchemaOperator + io.javaoperatorsdk.operator.sample.MySQLSchemaOperator 1.0 true diff --git a/samples/mysql-schema/src/main/java/com/github/containersolutions/operator/sample/MySQLSchemaOperator.java b/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java similarity index 90% rename from samples/mysql-schema/src/main/java/com/github/containersolutions/operator/sample/MySQLSchemaOperator.java rename to samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java index 72863bd9e9..0b9aee41e0 100644 --- a/samples/mysql-schema/src/main/java/com/github/containersolutions/operator/sample/MySQLSchemaOperator.java +++ b/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java @@ -1,6 +1,6 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; -import com.github.containersolutions.operator.Operator; +import io.javaoperatorsdk.operator.Operator; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; diff --git a/samples/mysql-schema/src/main/java/com/github/containersolutions/operator/sample/Schema.java b/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/Schema.java similarity index 89% rename from samples/mysql-schema/src/main/java/com/github/containersolutions/operator/sample/Schema.java rename to samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/Schema.java index e9adcabcdb..93e028b716 100644 --- a/samples/mysql-schema/src/main/java/com/github/containersolutions/operator/sample/Schema.java +++ b/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/Schema.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; import io.fabric8.kubernetes.client.CustomResource; diff --git a/samples/mysql-schema/src/main/java/com/github/containersolutions/operator/sample/SchemaController.java b/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/SchemaController.java similarity index 95% rename from samples/mysql-schema/src/main/java/com/github/containersolutions/operator/sample/SchemaController.java rename to samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/SchemaController.java index c6bfdefa98..bda42ac066 100644 --- a/samples/mysql-schema/src/main/java/com/github/containersolutions/operator/sample/SchemaController.java +++ b/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/SchemaController.java @@ -1,9 +1,9 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; -import com.github.containersolutions.operator.api.Context; -import com.github.containersolutions.operator.api.Controller; -import com.github.containersolutions.operator.api.ResourceController; -import com.github.containersolutions.operator.api.UpdateControl; +import io.javaoperatorsdk.operator.api.Context; +import io.javaoperatorsdk.operator.api.Controller; +import io.javaoperatorsdk.operator.api.ResourceController; +import io.javaoperatorsdk.operator.api.UpdateControl; import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.SecretBuilder; import io.fabric8.kubernetes.client.KubernetesClient; diff --git a/samples/mysql-schema/src/main/java/com/github/containersolutions/operator/sample/SchemaSpec.java b/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/SchemaSpec.java similarity index 79% rename from samples/mysql-schema/src/main/java/com/github/containersolutions/operator/sample/SchemaSpec.java rename to samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/SchemaSpec.java index 495e53673a..3bf564f797 100644 --- a/samples/mysql-schema/src/main/java/com/github/containersolutions/operator/sample/SchemaSpec.java +++ b/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/SchemaSpec.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; public class SchemaSpec { diff --git a/samples/mysql-schema/src/main/java/com/github/containersolutions/operator/sample/SchemaStatus.java b/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/SchemaStatus.java similarity index 92% rename from samples/mysql-schema/src/main/java/com/github/containersolutions/operator/sample/SchemaStatus.java rename to samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/SchemaStatus.java index 49f1f075ef..41f18ab49f 100644 --- a/samples/mysql-schema/src/main/java/com/github/containersolutions/operator/sample/SchemaStatus.java +++ b/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/SchemaStatus.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; public class SchemaStatus { diff --git a/samples/pom.xml b/samples/pom.xml index 0b6da3bf21..877fcd4130 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.github.containersolutions + io.javaoperatorsdk java-operator-sdk 1.3.1-SNAPSHOT diff --git a/samples/pure-java/pom.xml b/samples/pure-java/pom.xml index e6c4e54f38..356a3e1fcb 100644 --- a/samples/pure-java/pom.xml +++ b/samples/pure-java/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.github.containersolutions + io.javaoperatorsdk java-operator-sdk-samples 1.3.1-SNAPSHOT @@ -22,7 +22,7 @@ - com.github.containersolutions + io.javaoperatorsdk operator-framework-samples-common ${project.version} diff --git a/samples/pure-java/src/main/java/com/github/containersolutions/operator/sample/PureJavaApplicationRunner.java b/samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java similarity index 78% rename from samples/pure-java/src/main/java/com/github/containersolutions/operator/sample/PureJavaApplicationRunner.java rename to samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java index e0837e6217..673dbe4727 100644 --- a/samples/pure-java/src/main/java/com/github/containersolutions/operator/sample/PureJavaApplicationRunner.java +++ b/samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java @@ -1,6 +1,6 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; -import com.github.containersolutions.operator.Operator; +import io.javaoperatorsdk.operator.Operator; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; diff --git a/samples/spring-boot-auto-config/pom.xml b/samples/spring-boot-auto-config/pom.xml index 1763bcc558..4b28f592f4 100644 --- a/samples/spring-boot-auto-config/pom.xml +++ b/samples/spring-boot-auto-config/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.github.containersolutions + io.javaoperatorsdk java-operator-sdk-samples 1.3.1-SNAPSHOT @@ -22,12 +22,12 @@ - com.github.containersolutions + io.javaoperatorsdk operator-framework-samples-common ${project.version} - com.github.containersolutions + io.javaoperatorsdk spring-boot-operator-framework-starter ${project.version} diff --git a/samples/spring-boot-auto-config/src/main/java/com/github/containersolutions/operator/sample/SampleComponent.java b/samples/spring-boot-auto-config/src/main/java/io/javaoperatorsdk/operator/sample/SampleComponent.java similarity index 86% rename from samples/spring-boot-auto-config/src/main/java/com/github/containersolutions/operator/sample/SampleComponent.java rename to samples/spring-boot-auto-config/src/main/java/io/javaoperatorsdk/operator/sample/SampleComponent.java index cd06988f29..fa38106cd7 100644 --- a/samples/spring-boot-auto-config/src/main/java/com/github/containersolutions/operator/sample/SampleComponent.java +++ b/samples/spring-boot-auto-config/src/main/java/io/javaoperatorsdk/operator/sample/SampleComponent.java @@ -1,6 +1,6 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; -import com.github.containersolutions.operator.Operator; +import io.javaoperatorsdk.operator.Operator; import io.fabric8.kubernetes.client.KubernetesClient; import org.springframework.stereotype.Component; diff --git a/samples/spring-boot-auto-config/src/main/java/com/github/containersolutions/operator/sample/SpringBootStarterSampleApplication.java b/samples/spring-boot-auto-config/src/main/java/io/javaoperatorsdk/operator/sample/SpringBootStarterSampleApplication.java similarity index 87% rename from samples/spring-boot-auto-config/src/main/java/com/github/containersolutions/operator/sample/SpringBootStarterSampleApplication.java rename to samples/spring-boot-auto-config/src/main/java/io/javaoperatorsdk/operator/sample/SpringBootStarterSampleApplication.java index 3a3731afbd..818a642fe7 100644 --- a/samples/spring-boot-auto-config/src/main/java/com/github/containersolutions/operator/sample/SpringBootStarterSampleApplication.java +++ b/samples/spring-boot-auto-config/src/main/java/io/javaoperatorsdk/operator/sample/SpringBootStarterSampleApplication.java @@ -1,6 +1,6 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; -import com.github.containersolutions.operator.api.Controller; +import io.javaoperatorsdk.operator.api.Controller; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; diff --git a/samples/spring-boot-auto-config/src/test/java/com/github/containersolutions/operator/sample/SpringBootStarterSampleApplicationIT.java b/samples/spring-boot-auto-config/src/test/java/io/javaoperatorsdk/operator/sample/SpringBootStarterSampleApplicationIT.java similarity index 79% rename from samples/spring-boot-auto-config/src/test/java/com/github/containersolutions/operator/sample/SpringBootStarterSampleApplicationIT.java rename to samples/spring-boot-auto-config/src/test/java/io/javaoperatorsdk/operator/sample/SpringBootStarterSampleApplicationIT.java index 2c77c9bee7..fa103be82f 100644 --- a/samples/spring-boot-auto-config/src/test/java/com/github/containersolutions/operator/sample/SpringBootStarterSampleApplicationIT.java +++ b/samples/spring-boot-auto-config/src/test/java/io/javaoperatorsdk/operator/sample/SpringBootStarterSampleApplicationIT.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/samples/spring-boot-plain/pom.xml b/samples/spring-boot-plain/pom.xml index a6efcbbacd..5a6c3cd0ab 100644 --- a/samples/spring-boot-plain/pom.xml +++ b/samples/spring-boot-plain/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.github.containersolutions + io.javaoperatorsdk java-operator-sdk-samples 1.3.1-SNAPSHOT @@ -22,7 +22,7 @@ - com.github.containersolutions + io.javaoperatorsdk operator-framework-samples-common ${project.version} diff --git a/samples/spring-boot-plain/src/main/java/com/github/containersolutions/operator/sample/Config.java b/samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java similarity index 78% rename from samples/spring-boot-plain/src/main/java/com/github/containersolutions/operator/sample/Config.java rename to samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java index e8795d0a83..39d1bb71c4 100644 --- a/samples/spring-boot-plain/src/main/java/com/github/containersolutions/operator/sample/Config.java +++ b/samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java @@ -1,8 +1,8 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; -import com.github.containersolutions.operator.Operator; -import com.github.containersolutions.operator.api.ResourceController; -import com.github.containersolutions.operator.processing.retry.GenericRetry; +import io.javaoperatorsdk.operator.Operator; +import io.javaoperatorsdk.operator.api.ResourceController; +import io.javaoperatorsdk.operator.processing.retry.GenericRetry; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; import org.springframework.context.annotation.Bean; diff --git a/samples/spring-boot-plain/src/main/java/com/github/containersolutions/operator/sample/SpringBootStarterSampleApplication.java b/samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/SpringBootStarterSampleApplication.java similarity index 85% rename from samples/spring-boot-plain/src/main/java/com/github/containersolutions/operator/sample/SpringBootStarterSampleApplication.java rename to samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/SpringBootStarterSampleApplication.java index 2d52de2d07..85ab957e78 100644 --- a/samples/spring-boot-plain/src/main/java/com/github/containersolutions/operator/sample/SpringBootStarterSampleApplication.java +++ b/samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/SpringBootStarterSampleApplication.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/samples/tomcat/pom.xml b/samples/tomcat/pom.xml index 138f72c5c2..d68905321d 100644 --- a/samples/tomcat/pom.xml +++ b/samples/tomcat/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.github.containersolutions + io.javaoperatorsdk java-operator-sdk-samples 1.3.1-SNAPSHOT @@ -26,7 +26,7 @@ - com.github.containersolutions + io.javaoperatorsdk operator-framework ${project.version} @@ -87,7 +87,7 @@ - com.github.containersolutions.operator.sample.TomcatOperator + io.javaoperatorsdk.operator.sample.TomcatOperator 1.0 true diff --git a/samples/tomcat/src/main/java/META-INF/MANIFEST.MF b/samples/tomcat/src/main/java/META-INF/MANIFEST.MF index f31a13bda4..6181b20f25 100644 --- a/samples/tomcat/src/main/java/META-INF/MANIFEST.MF +++ b/samples/tomcat/src/main/java/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ Manifest-Version: 1.0 -Main-Class: com.github.containersolutions.operator.sample.TomcatOperator +Main-Class: io.javaoperatorsdk.operator.sample.TomcatOperator diff --git a/samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/Tomcat.java b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/Tomcat.java similarity index 91% rename from samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/Tomcat.java rename to samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/Tomcat.java index b761e0e3a2..749048945f 100644 --- a/samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/Tomcat.java +++ b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/Tomcat.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; import io.fabric8.kubernetes.client.CustomResource; diff --git a/samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/TomcatController.java b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatController.java similarity index 96% rename from samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/TomcatController.java rename to samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatController.java index 992a556899..1034ce1b39 100644 --- a/samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/TomcatController.java +++ b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatController.java @@ -1,9 +1,9 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; -import com.github.containersolutions.operator.api.Context; -import com.github.containersolutions.operator.api.Controller; -import com.github.containersolutions.operator.api.ResourceController; -import com.github.containersolutions.operator.api.UpdateControl; +import io.javaoperatorsdk.operator.api.Context; +import io.javaoperatorsdk.operator.api.Controller; +import io.javaoperatorsdk.operator.api.ResourceController; +import io.javaoperatorsdk.operator.api.UpdateControl; import io.fabric8.kubernetes.api.model.DoneableService; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.Service; diff --git a/samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/TomcatOperator.java b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java similarity index 91% rename from samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/TomcatOperator.java rename to samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java index 14d0f4a25d..fe1efe418f 100644 --- a/samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/TomcatOperator.java +++ b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java @@ -1,6 +1,6 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; -import com.github.containersolutions.operator.Operator; +import io.javaoperatorsdk.operator.Operator; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; diff --git a/samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/TomcatSpec.java b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatSpec.java similarity index 87% rename from samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/TomcatSpec.java rename to samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatSpec.java index 875c181820..317ce022ad 100644 --- a/samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/TomcatSpec.java +++ b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatSpec.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; public class TomcatSpec { diff --git a/samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/TomcatStatus.java b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatStatus.java similarity index 82% rename from samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/TomcatStatus.java rename to samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatStatus.java index 4d40c30b01..66984e73f5 100644 --- a/samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/TomcatStatus.java +++ b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatStatus.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; public class TomcatStatus { diff --git a/samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/Webapp.java b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/Webapp.java similarity index 90% rename from samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/Webapp.java rename to samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/Webapp.java index 4ceab94270..124a2ed454 100644 --- a/samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/Webapp.java +++ b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/Webapp.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; import io.fabric8.kubernetes.client.CustomResource; diff --git a/samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/WebappController.java b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/WebappController.java similarity index 91% rename from samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/WebappController.java rename to samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/WebappController.java index 79fd07c4f2..4c2083a08d 100644 --- a/samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/WebappController.java +++ b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/WebappController.java @@ -1,9 +1,9 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; -import com.github.containersolutions.operator.api.Context; -import com.github.containersolutions.operator.api.Controller; -import com.github.containersolutions.operator.api.ResourceController; -import com.github.containersolutions.operator.api.UpdateControl; +import io.javaoperatorsdk.operator.api.Context; +import io.javaoperatorsdk.operator.api.Controller; +import io.javaoperatorsdk.operator.api.ResourceController; +import io.javaoperatorsdk.operator.api.UpdateControl; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.client.KubernetesClient; diff --git a/samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/WebappSpec.java b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/WebappSpec.java similarity index 90% rename from samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/WebappSpec.java rename to samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/WebappSpec.java index db754b6756..c652e2f713 100644 --- a/samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/WebappSpec.java +++ b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/WebappSpec.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; public class WebappSpec { diff --git a/samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/WebappStatus.java b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/WebappStatus.java similarity index 83% rename from samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/WebappStatus.java rename to samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/WebappStatus.java index 229b3653f1..2eba99a93b 100644 --- a/samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/WebappStatus.java +++ b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/WebappStatus.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; public class WebappStatus { diff --git a/samples/tomcat/src/main/resources/com/github/containersolutions/operator/sample/deployment.yaml b/samples/tomcat/src/main/resources/io/javaoperatorsdk/operator/sample/deployment.yaml similarity index 100% rename from samples/tomcat/src/main/resources/com/github/containersolutions/operator/sample/deployment.yaml rename to samples/tomcat/src/main/resources/io/javaoperatorsdk/operator/sample/deployment.yaml diff --git a/samples/tomcat/src/main/resources/com/github/containersolutions/operator/sample/service.yaml b/samples/tomcat/src/main/resources/io/javaoperatorsdk/operator/sample/service.yaml similarity index 100% rename from samples/tomcat/src/main/resources/com/github/containersolutions/operator/sample/service.yaml rename to samples/tomcat/src/main/resources/io/javaoperatorsdk/operator/sample/service.yaml diff --git a/samples/webserver/pom.xml b/samples/webserver/pom.xml index eb1f8d10b4..d63d33d5d0 100644 --- a/samples/webserver/pom.xml +++ b/samples/webserver/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.github.containersolutions + io.javaoperatorsdk java-operator-sdk-samples 1.3.1-SNAPSHOT @@ -22,7 +22,7 @@ - com.github.containersolutions + io.javaoperatorsdk operator-framework ${project.version} @@ -83,7 +83,7 @@ - com.github.containersolutions.operator.sample.WebServerOperator + io.javaoperatorsdk.operator.sample.WebServerOperator 1.0 true diff --git a/samples/webserver/src/main/java/com/github/containersolutions/operator/sample/ErrorSimulationException.java b/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/ErrorSimulationException.java similarity index 73% rename from samples/webserver/src/main/java/com/github/containersolutions/operator/sample/ErrorSimulationException.java rename to samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/ErrorSimulationException.java index 3033c86689..f87cb9898e 100644 --- a/samples/webserver/src/main/java/com/github/containersolutions/operator/sample/ErrorSimulationException.java +++ b/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/ErrorSimulationException.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; public class ErrorSimulationException extends RuntimeException { diff --git a/samples/webserver/src/main/java/com/github/containersolutions/operator/sample/WebServer.java b/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServer.java similarity index 89% rename from samples/webserver/src/main/java/com/github/containersolutions/operator/sample/WebServer.java rename to samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServer.java index 8ac9f6eb2b..9ec51c6954 100644 --- a/samples/webserver/src/main/java/com/github/containersolutions/operator/sample/WebServer.java +++ b/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServer.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; import io.fabric8.kubernetes.client.CustomResource; diff --git a/samples/webserver/src/main/java/com/github/containersolutions/operator/sample/WebServerController.java b/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerController.java similarity index 95% rename from samples/webserver/src/main/java/com/github/containersolutions/operator/sample/WebServerController.java rename to samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerController.java index e762be6586..984e6d3d43 100644 --- a/samples/webserver/src/main/java/com/github/containersolutions/operator/sample/WebServerController.java +++ b/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerController.java @@ -1,9 +1,9 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; -import com.github.containersolutions.operator.api.Context; -import com.github.containersolutions.operator.api.Controller; -import com.github.containersolutions.operator.api.ResourceController; -import com.github.containersolutions.operator.api.UpdateControl; +import io.javaoperatorsdk.operator.api.Context; +import io.javaoperatorsdk.operator.api.Controller; +import io.javaoperatorsdk.operator.api.ResourceController; +import io.javaoperatorsdk.operator.api.UpdateControl; import io.fabric8.kubernetes.api.model.*; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.apps.DoneableDeployment; diff --git a/samples/webserver/src/main/java/com/github/containersolutions/operator/sample/WebServerOperator.java b/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerOperator.java similarity index 90% rename from samples/webserver/src/main/java/com/github/containersolutions/operator/sample/WebServerOperator.java rename to samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerOperator.java index 10667d327d..5bedebeac9 100644 --- a/samples/webserver/src/main/java/com/github/containersolutions/operator/sample/WebServerOperator.java +++ b/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerOperator.java @@ -1,6 +1,6 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; -import com.github.containersolutions.operator.Operator; +import io.javaoperatorsdk.operator.Operator; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; diff --git a/samples/webserver/src/main/java/com/github/containersolutions/operator/sample/WebServerSpec.java b/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerSpec.java similarity index 77% rename from samples/webserver/src/main/java/com/github/containersolutions/operator/sample/WebServerSpec.java rename to samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerSpec.java index 58226fc296..284004cdc1 100644 --- a/samples/webserver/src/main/java/com/github/containersolutions/operator/sample/WebServerSpec.java +++ b/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerSpec.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; public class WebServerSpec { diff --git a/samples/webserver/src/main/java/com/github/containersolutions/operator/sample/WebServerStatus.java b/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerStatus.java similarity index 91% rename from samples/webserver/src/main/java/com/github/containersolutions/operator/sample/WebServerStatus.java rename to samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerStatus.java index 4f57156529..d1d0d9367a 100644 --- a/samples/webserver/src/main/java/com/github/containersolutions/operator/sample/WebServerStatus.java +++ b/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerStatus.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.sample; +package io.javaoperatorsdk.operator.sample; public class WebServerStatus { diff --git a/samples/webserver/src/main/resources/com/github/containersolutions/operator/sample/deployment.yaml b/samples/webserver/src/main/resources/io/javaoperatorsdk/operator/sample/deployment.yaml similarity index 100% rename from samples/webserver/src/main/resources/com/github/containersolutions/operator/sample/deployment.yaml rename to samples/webserver/src/main/resources/io/javaoperatorsdk/operator/sample/deployment.yaml diff --git a/samples/webserver/src/main/resources/com/github/containersolutions/operator/sample/html-configmap.yaml b/samples/webserver/src/main/resources/io/javaoperatorsdk/operator/sample/html-configmap.yaml similarity index 100% rename from samples/webserver/src/main/resources/com/github/containersolutions/operator/sample/html-configmap.yaml rename to samples/webserver/src/main/resources/io/javaoperatorsdk/operator/sample/html-configmap.yaml diff --git a/samples/webserver/src/main/resources/com/github/containersolutions/operator/sample/ingress.yaml b/samples/webserver/src/main/resources/io/javaoperatorsdk/operator/sample/ingress.yaml similarity index 100% rename from samples/webserver/src/main/resources/com/github/containersolutions/operator/sample/ingress.yaml rename to samples/webserver/src/main/resources/io/javaoperatorsdk/operator/sample/ingress.yaml diff --git a/samples/webserver/src/main/resources/com/github/containersolutions/operator/sample/service.yaml b/samples/webserver/src/main/resources/io/javaoperatorsdk/operator/sample/service.yaml similarity index 100% rename from samples/webserver/src/main/resources/com/github/containersolutions/operator/sample/service.yaml rename to samples/webserver/src/main/resources/io/javaoperatorsdk/operator/sample/service.yaml diff --git a/spring-boot-starter/pom.xml b/spring-boot-starter/pom.xml index 23e2c770c3..8c641001a8 100644 --- a/spring-boot-starter/pom.xml +++ b/spring-boot-starter/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.github.containersolutions + io.javaoperatorsdk java-operator-sdk 1.3.1-SNAPSHOT @@ -87,7 +87,7 @@ test - com.github.containersolutions + io.javaoperatorsdk operator-framework ${project.version} diff --git a/spring-boot-starter/src/main/java/com/github/containersolutions/operator/spingboot/starter/OperatorAutoConfiguration.java b/spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/spingboot/starter/OperatorAutoConfiguration.java similarity index 89% rename from spring-boot-starter/src/main/java/com/github/containersolutions/operator/spingboot/starter/OperatorAutoConfiguration.java rename to spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/spingboot/starter/OperatorAutoConfiguration.java index edcf441287..5f3273fa3d 100644 --- a/spring-boot-starter/src/main/java/com/github/containersolutions/operator/spingboot/starter/OperatorAutoConfiguration.java +++ b/spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/spingboot/starter/OperatorAutoConfiguration.java @@ -1,9 +1,9 @@ -package com.github.containersolutions.operator.spingboot.starter; +package io.javaoperatorsdk.operator.spingboot.starter; -import com.github.containersolutions.operator.Operator; -import com.github.containersolutions.operator.api.ResourceController; -import com.github.containersolutions.operator.processing.retry.GenericRetry; -import com.github.containersolutions.operator.processing.retry.Retry; +import io.javaoperatorsdk.operator.Operator; +import io.javaoperatorsdk.operator.api.ResourceController; +import io.javaoperatorsdk.operator.processing.retry.GenericRetry; +import io.javaoperatorsdk.operator.processing.retry.Retry; import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; diff --git a/spring-boot-starter/src/main/java/com/github/containersolutions/operator/spingboot/starter/OperatorProperties.java b/spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/spingboot/starter/OperatorProperties.java similarity index 95% rename from spring-boot-starter/src/main/java/com/github/containersolutions/operator/spingboot/starter/OperatorProperties.java rename to spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/spingboot/starter/OperatorProperties.java index 0893399871..5dae605517 100644 --- a/spring-boot-starter/src/main/java/com/github/containersolutions/operator/spingboot/starter/OperatorProperties.java +++ b/spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/spingboot/starter/OperatorProperties.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.spingboot.starter; +package io.javaoperatorsdk.operator.spingboot.starter; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-boot-starter/src/main/java/com/github/containersolutions/operator/spingboot/starter/RetryProperties.java b/spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/spingboot/starter/RetryProperties.java similarity index 95% rename from spring-boot-starter/src/main/java/com/github/containersolutions/operator/spingboot/starter/RetryProperties.java rename to spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/spingboot/starter/RetryProperties.java index 1f12a0b159..ce80ecf2ad 100644 --- a/spring-boot-starter/src/main/java/com/github/containersolutions/operator/spingboot/starter/RetryProperties.java +++ b/spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/spingboot/starter/RetryProperties.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.spingboot.starter; +package io.javaoperatorsdk.operator.spingboot.starter; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-boot-starter/src/main/resources/META-INF/spring.factories b/spring-boot-starter/src/main/resources/META-INF/spring.factories index 0e07c6e6d4..0a2e5b25b7 100644 --- a/spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.github.containersolutions.operator.spingboot.starter.OperatorAutoConfiguration \ No newline at end of file + io.javaoperatorsdk.operator.spingboot.starter.OperatorAutoConfiguration \ No newline at end of file diff --git a/spring-boot-starter/src/test/java/com/github/containersolutions/operator/spingboot/starter/AutoConfigurationTest.java b/spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/AutoConfigurationTest.java similarity index 90% rename from spring-boot-starter/src/test/java/com/github/containersolutions/operator/spingboot/starter/AutoConfigurationTest.java rename to spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/AutoConfigurationTest.java index 1ccfa3f452..4712b4f66b 100644 --- a/spring-boot-starter/src/test/java/com/github/containersolutions/operator/spingboot/starter/AutoConfigurationTest.java +++ b/spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/AutoConfigurationTest.java @@ -1,7 +1,7 @@ -package com.github.containersolutions.operator.spingboot.starter; +package io.javaoperatorsdk.operator.spingboot.starter; -import com.github.containersolutions.operator.Operator; -import com.github.containersolutions.operator.api.ResourceController; +import io.javaoperatorsdk.operator.Operator; +import io.javaoperatorsdk.operator.api.ResourceController; import io.fabric8.kubernetes.client.KubernetesClient; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-boot-starter/src/test/java/com/github/containersolutions/operator/spingboot/starter/TestApplication.java b/spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/TestApplication.java similarity index 81% rename from spring-boot-starter/src/test/java/com/github/containersolutions/operator/spingboot/starter/TestApplication.java rename to spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/TestApplication.java index 72bbf53477..d88ad8e7e7 100644 --- a/spring-boot-starter/src/test/java/com/github/containersolutions/operator/spingboot/starter/TestApplication.java +++ b/spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/TestApplication.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.spingboot.starter; +package io.javaoperatorsdk.operator.spingboot.starter; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-boot-starter/src/test/java/com/github/containersolutions/operator/spingboot/starter/TestController.java b/spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/TestController.java similarity index 56% rename from spring-boot-starter/src/test/java/com/github/containersolutions/operator/spingboot/starter/TestController.java rename to spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/TestController.java index 4b5b94756b..10a0f5b91a 100644 --- a/spring-boot-starter/src/test/java/com/github/containersolutions/operator/spingboot/starter/TestController.java +++ b/spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/TestController.java @@ -1,10 +1,10 @@ -package com.github.containersolutions.operator.spingboot.starter; +package io.javaoperatorsdk.operator.spingboot.starter; -import com.github.containersolutions.operator.api.Context; -import com.github.containersolutions.operator.api.Controller; -import com.github.containersolutions.operator.api.ResourceController; -import com.github.containersolutions.operator.api.UpdateControl; -import com.github.containersolutions.operator.spingboot.starter.model.TestResource; +import io.javaoperatorsdk.operator.api.Context; +import io.javaoperatorsdk.operator.api.Controller; +import io.javaoperatorsdk.operator.api.ResourceController; +import io.javaoperatorsdk.operator.api.UpdateControl; +import io.javaoperatorsdk.operator.spingboot.starter.model.TestResource; import io.fabric8.kubernetes.client.CustomResource; import org.springframework.stereotype.Component; diff --git a/spring-boot-starter/src/test/java/com/github/containersolutions/operator/spingboot/starter/model/TestResource.java b/spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/model/TestResource.java similarity index 60% rename from spring-boot-starter/src/test/java/com/github/containersolutions/operator/spingboot/starter/model/TestResource.java rename to spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/model/TestResource.java index a5fce7a525..ad29290cae 100644 --- a/spring-boot-starter/src/test/java/com/github/containersolutions/operator/spingboot/starter/model/TestResource.java +++ b/spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/model/TestResource.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.spingboot.starter.model; +package io.javaoperatorsdk.operator.spingboot.starter.model; import io.fabric8.kubernetes.client.CustomResource; diff --git a/spring-boot-starter/src/test/java/com/github/containersolutions/operator/spingboot/starter/model/TestResourceDoneable.java b/spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/model/TestResourceDoneable.java similarity index 82% rename from spring-boot-starter/src/test/java/com/github/containersolutions/operator/spingboot/starter/model/TestResourceDoneable.java rename to spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/model/TestResourceDoneable.java index 972e742221..a54ffe9321 100644 --- a/spring-boot-starter/src/test/java/com/github/containersolutions/operator/spingboot/starter/model/TestResourceDoneable.java +++ b/spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/model/TestResourceDoneable.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.spingboot.starter.model; +package io.javaoperatorsdk.operator.spingboot.starter.model; import io.fabric8.kubernetes.api.builder.Function; import io.fabric8.kubernetes.client.CustomResourceDoneable; diff --git a/spring-boot-starter/src/test/java/com/github/containersolutions/operator/spingboot/starter/model/TestResourceList.java b/spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/model/TestResourceList.java similarity index 64% rename from spring-boot-starter/src/test/java/com/github/containersolutions/operator/spingboot/starter/model/TestResourceList.java rename to spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/model/TestResourceList.java index a8983b17b2..978fdde00a 100644 --- a/spring-boot-starter/src/test/java/com/github/containersolutions/operator/spingboot/starter/model/TestResourceList.java +++ b/spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/model/TestResourceList.java @@ -1,4 +1,4 @@ -package com.github.containersolutions.operator.spingboot.starter.model; +package io.javaoperatorsdk.operator.spingboot.starter.model; import io.fabric8.kubernetes.client.CustomResourceList;