release 1.1.1-B8

Author: vbradnitski

gradle.properties

@@ -1 +1 @@
-version = 1.1.1-B7
+version = 1.1.1-B8

java-operator/src/main/java/com/enonic/kubernetes/common/TaskRunner.java

@@ -35,7 +35,8 @@ public TaskRunner()
             Executors.newScheduledThreadPool( 4, new ThreadFactoryBuilder().setNameFormat( "task-scheduler-%d" ).build() );
 
         executor = new ThreadPoolExecutor( 1, cfgInt( "operator.tasks.threads" ), 60L, TimeUnit.SECONDS, new SynchronousQueue<>(),
-                                           new ThreadFactoryBuilder().setNameFormat( "task-runner-%d" ).build() );
+                                           new ThreadFactoryBuilder().setNameFormat( "task-runner-%d" ).build(),
+                                           new ThreadPoolExecutor.CallerRunsPolicy() );
     }
 
     public void scheduleAtFixedRate( final Runnable command, final long initialDelay, final long period, final TimeUnit unit )

java-operator/src/main/java/com/enonic/kubernetes/operator/ingress/OperatorIngressLabel.java

@@ -22,9 +22,9 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
-import static com.enonic.kubernetes.operator.xp7deployment.Predicates.running;
 import static com.enonic.kubernetes.common.Configuration.cfgStr;
 import static com.enonic.kubernetes.kubernetes.Predicates.inSameNamespaceAs;
 import static com.enonic.kubernetes.kubernetes.Predicates.isDeleted;
@@ -65,11 +65,15 @@ protected void onNewAdd( final Xp7Config newR )
     @Override
     public void onUpdate( final Xp7Config oldR, final Xp7Config newR )
     {
+        if ( Objects.equals( oldR, newR ) )
+        {
+            return;
+        }
         // Only handle if this is a vhost config and it is loaded
         onCondition( newR, c -> {
             log.debug( "onUpdate Xp7Config: {} in {}", newR.getMetadata().getNamespace(), newR.getMetadata().getName() );
             this.handle( c );
-        }, this::isVHostConfig, ( c ) -> c.getStatus().getState() == Xp7ConfigStatus.State.READY, this::isDeploymentRunning );
+        }, this::isVHostConfig, ( c ) -> c.getStatus().getState() == Xp7ConfigStatus.State.READY );
     }
 
     @Override
@@ -162,12 +166,4 @@ private boolean isVHostConfig( final Xp7Config c )
     {
         return c.getSpec().getFile().equals( cfgStr( "operator.charts.values.files.vhosts" ) );
     }
-
-    boolean isDeploymentRunning( Xp7Config config )
-    {
-        return searchers.xp7Deployment()
-            .find( deployment -> deployment.getMetadata().getNamespace().equals( config.getMetadata().getNamespace() ) )
-            .map( deployment -> running().test( deployment ) )
-            .orElse( false );
-    }
 }

java-operator/src/main/java/com/enonic/kubernetes/operator/xp7config/OperatorConfigMapSync.java

@@ -1,14 +1,15 @@
 package com.enonic.kubernetes.operator.xp7config;
 
 import com.enonic.kubernetes.client.v1.xp7config.Xp7Config;
-import com.enonic.kubernetes.client.v1.xp7deployment.Xp7Deployment;
 import com.enonic.kubernetes.client.v1.xp7deployment.Xp7DeploymentStatus;
 import com.enonic.kubernetes.common.TaskRunner;
 import com.enonic.kubernetes.kubernetes.ActionLimiter;
 import com.enonic.kubernetes.kubernetes.Clients;
 import com.enonic.kubernetes.kubernetes.Searchers;
 import com.enonic.kubernetes.kubernetes.commands.K8sLogHelper;
 import com.enonic.kubernetes.operator.Operator;
+import com.enonic.kubernetes.operator.xp7deployment.Predicates;
+
 import com.google.common.hash.Hashing;
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.quarkus.runtime.StartupEvent;
@@ -71,7 +72,7 @@ public void run()
     {
         final Set<String> activeNamespaces = searchers.xp7Deployment()
             .stream()
-            .filter( deployment -> deployment.getStatus().getState() == Xp7DeploymentStatus.State.RUNNING )
+            .filter( Predicates.running() )
             .map( deployment -> deployment.getMetadata().getNamespace() )
             .collect( Collectors.toSet() );