Merge remote-tracking branch 'origin/master' into annotation-processor-test

# Conflicts:
#	spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/TestController.java

Author: Soroosh Sarabadani

README.md

@@ -20,7 +20,7 @@ Build Kubernetes Operators in Java without hassle. Inspired by [operator-sdk](ht
 * Smart event scheduling (only handle latest event for the same resource)
 
 Check out this [blog post](https://blog.container-solutions.com/a-deep-dive-into-the-java-operator-sdk) 
-about the non-trivial yet common problems needs to be solved for every operator. 
+about the non-trivial yet common problems needed to be solved for every operator. 
 
 #### Why build your own Operator?
 * Infrastructure automation using the power and flexibility of Java. See [blog post](https://blog.container-solutions.com/cloud-native-java-infrastructure-automation-with-kubernetes-operators).
@@ -31,7 +31,7 @@ about the non-trivial yet common problems needs to be solved for every operator.
 #### Roadmap
 * Testing of the framework and all samples while running on a real cluster.
 * Generate a project skeleton
-* Generate Java classes from CRD definion (and/or the other way around)
+* Generate Java classes from CRD defintion (and/or the other way around)
 * Integrate with Quarkus (including native image build)
 * Integrate with OLM (Operator Lifecycle Manager)
 

docs/DOCS.md

@@ -56,16 +56,16 @@ TODO: explain running operator locally against a cluster
 
 ### Run Single Instance
 
-There should be always just one instance of an operator running at a time (think process). If there there would be 
+There should be always just one instance of an operator running at a time (think process). If there would be 
 two ore more, in general it could lead to concurrency issues. Note that we are also doing optimistic locking when we update a resource.
-In this way the operator is not highly available. However for operators this not necessary an issue, 
+In this way the operator is not highly available. However for operators this is not necessarily an issue, 
 if the operator just gets restarted after it went down. 
 
 ### At Least Once
 
 To implement controller logic, we have to override two methods: `createOrUpdateResource` and `deleteResource`. 
-These methods are called if a resource is create/changed or marked for deletion. In most cases these methods will be
-called just once, but in some rare cases can happen that are called more then once. In practice this means that the 
+These methods are called if a resource is created/changed or marked for deletion. In most cases these methods will be
+called just once, but in some rare cases, it can happen that they are called more then once. In practice this means that the 
 implementation needs to be **idempotent**.    
 
 ### Smart Scheduling
@@ -77,11 +77,11 @@ a customizable retry mechanism to deal with temporal errors.
 
 When an operator is started we got events for every resource (of a type we listen to) already on the cluster. Even if the resource is not changed 
 (We use `kubectl get ... --watch` in the background). This can be a huge amount of resources depending on your use case.
-So it could be a good case just have a status field on the resource which is checked, if there anything needs to be done.
+So it could be a good case to just have a status field on the resource which is checked, if there is anything needed to be done.
 
 ### Deleting a Resource
 
 During deletion process we use [Kubernetes finalizers](https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/#finalizers 
 "Kubernetes docs") finalizers. This is required, since it can happen that the operator is not running while the delete 
 of resource is executed (think `oc delete`). In this case we would not catch the delete event. So we automatically add a
-finalizer first time we update the resource if its not there. 
+finalizer first time we update the resource if it's not there. 

spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/spingboot/starter/OperatorAutoConfiguration.java renamed to spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java

@@ -1,13 +1,15 @@
-package io.javaoperatorsdk.operator.spingboot.starter;
+package io.javaoperatorsdk.operator.springboot.starter;
+
+import java.util.List;
 
-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;
 import io.fabric8.openshift.client.DefaultOpenShiftClient;
+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 org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,8 +18,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.util.List;
-
 @Configuration
 @EnableConfigurationProperties({OperatorProperties.class, RetryProperties.class})
 public class OperatorAutoConfiguration {

spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/spingboot/starter/OperatorProperties.java renamed to spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorProperties.java

@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.operator.spingboot.starter;
+package io.javaoperatorsdk.operator.springboot.starter;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/spingboot/starter/RetryProperties.java renamed to spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/RetryProperties.java

@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.operator.spingboot.starter;
+package io.javaoperatorsdk.operator.springboot.starter;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

spring-boot-starter/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  io.javaoperatorsdk.operator.spingboot.starter.OperatorAutoConfiguration
+  io.javaoperatorsdk.operator.springboot.starter.OperatorAutoConfiguration

spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/AutoConfigurationTest.java renamed to spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationTest.java

@@ -1,18 +1,20 @@
-package io.javaoperatorsdk.operator.spingboot.starter;
+package io.javaoperatorsdk.operator.springboot.starter;
 
+import java.util.List;
+
+import io.fabric8.kubernetes.client.KubernetesClient;
 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;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest

spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/TestApplication.java renamed to spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/TestApplication.java

@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.operator.spingboot.starter;
+package io.javaoperatorsdk.operator.springboot.starter;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/TestController.java renamed to spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/TestController.java

@@ -1,10 +1,11 @@
-package io.javaoperatorsdk.operator.spingboot.starter;
+package io.javaoperatorsdk.operator.springboot.starter;
 
+import io.fabric8.kubernetes.client.CustomResource;
 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.client.CustomResource;
+import io.javaoperatorsdk.operator.springboot.starter.model.TestResource;
 import org.springframework.stereotype.Component;
 
 @Component

spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/model/TestResource.java renamed to spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/model/TestResource.java

@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.operator.spingboot.starter.model;
+package io.javaoperatorsdk.operator.springboot.starter.model;
 
 import io.fabric8.kubernetes.client.CustomResource;