Skip to content

Commit 9b43a0f

Browse files
committed
release 1.1.1-B2
1 parent 13d4d46 commit 9b43a0f

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version = 1.1.0
1+
version = 1.1.1-B1

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.enonic.kubernetes.operator.xp7config;
22

33
import com.enonic.kubernetes.client.v1.xp7config.Xp7Config;
4+
import com.enonic.kubernetes.client.v1.xp7deployment.Xp7Deployment;
5+
import com.enonic.kubernetes.client.v1.xp7deployment.Xp7DeploymentStatus;
46
import com.enonic.kubernetes.common.TaskRunner;
57
import com.enonic.kubernetes.kubernetes.ActionLimiter;
68
import com.enonic.kubernetes.kubernetes.Clients;
@@ -21,6 +23,7 @@
2123
import java.util.List;
2224
import java.util.Map;
2325
import java.util.Objects;
26+
import java.util.Set;
2427
import java.util.function.Function;
2528
import java.util.stream.Collectors;
2629

@@ -66,9 +69,18 @@ void onStart( @Observes StartupEvent ev )
6669
@Override
6770
public void run()
6871
{
69-
searchers.xp7Config().stream().collect( groupingBy( r -> r.getMetadata().getNamespace() ) ).
70-
keySet().
71-
forEach( this::handle );
72+
final Set<String> activeNamespaces = searchers.xp7Deployment()
73+
.stream()
74+
.filter( deployment -> deployment.getStatus().getState() == Xp7DeploymentStatus.State.RUNNING )
75+
.map( deployment -> deployment.getMetadata().getNamespace() )
76+
.collect( Collectors.toSet() );
77+
78+
searchers.xp7Config()
79+
.stream()
80+
.filter( config -> activeNamespaces.contains( config.getMetadata().getNamespace() ) )
81+
.collect( groupingBy( config -> config.getMetadata().getNamespace() ) )
82+
.keySet()
83+
.forEach( this::handle );
7284
}
7385

7486
protected void handle( final String namespace )

0 commit comments

Comments
 (0)