Merge branch 'master' into Reconciliation_Retry

csviri · csviri · commit d7abd568af68 · 2019-12-03T15:07:22.000+01:00
# Conflicts:
#	operator-framework/pom.xml
#	operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventDispatcher.java
#	pom.xml
#	samples/basic/common/pom.xml
#	samples/basic/pom.xml
#	samples/basic/pure-java/pom.xml
#	samples/basic/spring-boot/pom.xml
#	samples/pom.xml
#	samples/webserver/pom.xml
#	spring-boot-starter/pom.xml
diff --git a/operator-framework/pom.xml b/operator-framework/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.containersolutions</groupId>
         <artifactId>java-operator-sdk</artifactId>
-        <version>0.3.9-SNAPSHOT</version>
+        <version>0.3.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>operator-framework</artifactId>
diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventDispatcher.java b/operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventDispatcher.java
@@ -100,4 +100,14 @@ private void addFinalizerIfNotPresent(R resource) {
     private boolean markedForDeletion(R resource) {
         return resource.getMetadata().getDeletionTimestamp() != null && !resource.getMetadata().getDeletionTimestamp().isEmpty();
     }
+
+    @Override
+    public void onClose(KubernetesClientException e) {
+        if (e != null) {
+            log.error("Error: ", e);
+            // we will exit the application if there was a watching exception, because of the bug in fabric8 client
+            // see https://github.com/fabric8io/kubernetes-client/issues/1318
+            System.exit(1);
+        }
+    }
 }
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.github.containersolutions</groupId>
     <artifactId>java-operator-sdk</artifactId>
-    <version>0.3.9-SNAPSHOT</version>
+    <version>0.3.10-SNAPSHOT</version>
     <name>Operator SDK for Java</name>
     <description>Java SDK for implementing Kubernetes operators</description>
     <packaging>pom</packaging>
diff --git a/samples/basic/common/pom.xml b/samples/basic/common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.containersolutions</groupId>
         <artifactId>java-operator-sdk-basic-sample</artifactId>
-        <version>0.3.9-SNAPSHOT</version>
+        <version>0.3.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>operator-framework-samples-common</artifactId>
diff --git a/samples/basic/pom.xml b/samples/basic/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.containersolutions</groupId>
         <artifactId>java-operator-sdk-samples</artifactId>
-        <version>0.3.9-SNAPSHOT</version>
+        <version>0.3.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>java-operator-sdk-basic-sample</artifactId>
diff --git a/samples/basic/pure-java/pom.xml b/samples/basic/pure-java/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.containersolutions</groupId>
         <artifactId>java-operator-sdk-basic-sample</artifactId>
-        <version>0.3.9-SNAPSHOT</version>
+        <version>0.3.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>operator-framework-samples-pure-java</artifactId>
diff --git a/samples/basic/spring-boot/pom.xml b/samples/basic/spring-boot/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.containersolutions</groupId>
         <artifactId>java-operator-sdk-basic-sample</artifactId>
-        <version>0.3.9-SNAPSHOT</version>
+        <version>0.3.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>operator-framework-samples-spring-boot</artifactId>
diff --git a/samples/pom.xml b/samples/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.containersolutions</groupId>
         <artifactId>java-operator-sdk</artifactId>
-        <version>0.3.9-SNAPSHOT</version>
+        <version>0.3.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>java-operator-sdk-samples</artifactId>
diff --git a/samples/webserver/pom.xml b/samples/webserver/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.containersolutions</groupId>
         <artifactId>java-operator-sdk-samples</artifactId>
-        <version>0.3.9-SNAPSHOT</version>
+        <version>0.3.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>webserver-sample</artifactId>
diff --git a/spring-boot-starter/pom.xml b/spring-boot-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.containersolutions</groupId>
         <artifactId>java-operator-sdk</artifactId>
-        <version>0.3.9-SNAPSHOT</version>
+        <version>0.3.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-boot-operator-framework-starter</artifactId>
