From 6860757a3fe97c103321ec656ffc5ed5bc07177e Mon Sep 17 00:00:00 2001
From: Max Shaposhnik <mshaposh@redhat.com>
Date: Fri, 22 Nov 2019 09:41:09 +0200
Subject: [PATCH 1/2] Align JGroups labels property name and add one preventing
 to connect to unready pods;

---
 .../src/main/webapp/WEB-INF/classes/jgroups/che-tcp.xml        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/jgroups/che-tcp.xml b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/jgroups/che-tcp.xml
index c065418e97f..58737223395 100644
--- a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/jgroups/che-tcp.xml
+++ b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/jgroups/che-tcp.xml
@@ -31,7 +31,8 @@
   <org.jgroups.protocols.kubernetes.KUBE_PING
     port_range="3"
     namespace="${KUBERNETES_NAMESPACE:che}"
-    labels="${KUBERNETES_LABEL:app=che,component=che}"
+    labels="${KUBERNETES_LABELS:app=che,component=che}"
+    useNotReadyAddresses="false"
   />
 
   <MERGE3 min_interval="10000"

From 7badf6ffa14d08abbc6ce86b117c3c9b96281790 Mon Sep 17 00:00:00 2001
From: Max Shaposhnik <mshaposh@redhat.com>
Date: Fri, 22 Nov 2019 09:46:41 +0200
Subject: [PATCH 2/2] fixup! Align JGroups labels property name and add one
 preventing to connect to unready pods;

---
 .../src/main/webapp/WEB-INF/classes/jgroups/che-tcp.xml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/jgroups/che-tcp.xml b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/jgroups/che-tcp.xml
index 58737223395..713da9ccba7 100644
--- a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/jgroups/che-tcp.xml
+++ b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/jgroups/che-tcp.xml
@@ -32,7 +32,7 @@
     port_range="3"
     namespace="${KUBERNETES_NAMESPACE:che}"
     labels="${KUBERNETES_LABELS:app=che,component=che}"
-    useNotReadyAddresses="false"
+    useNotReadyAddresses="${KUBERNETES_USE_NOT_READY_ADDRESSES:false}"
   />
 
   <MERGE3 min_interval="10000"