From 2029700bd81292a24e61732b6a761539141b375d Mon Sep 17 00:00:00 2001
From: yu lin <735122171@qq.com>
Date: Mon, 28 Aug 2023 17:41:23 +0800
Subject: [PATCH] Update install.sh to support new label. (#982)

Signed-off-by: Syulin7 <735122171@qq.com>
---
 arena-artifacts/templates/binary-install-job.yaml | 12 ++++++++++--
 install.sh                                        |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/arena-artifacts/templates/binary-install-job.yaml b/arena-artifacts/templates/binary-install-job.yaml
index 0b8308446..5ca44859b 100644
--- a/arena-artifacts/templates/binary-install-job.yaml
+++ b/arena-artifacts/templates/binary-install-job.yaml
@@ -31,8 +31,16 @@ spec:
       - key: node-role.alibabacloud.com/addon
         operator: Exists
         effect: NoSchedule
-      nodeSelector:
-         node-role.kubernetes.io/master: ""
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: node-role.kubernetes.io/control-plane
+                    operator: Exists
+              - matchExpressions:
+                  - key: node-role.kubernetes.io/master
+                    operator: Exists
       restartPolicy: Never
       containers:
       - name: installer
diff --git a/install.sh b/install.sh
index 4ab34a5cf..7350cc6d3 100755
--- a/install.sh
+++ b/install.sh
@@ -292,7 +292,7 @@ function install_binary_on_master() {
     if [[ $INSTALL_BINARY_ON_MASTER != "true" ]];then
         return
     fi
-    master_count=$(arena-kubectl get nodes -l node-role.kubernetes.io/master | grep -v NAME  | wc -l)
+    master_count=$(arena-kubectl get nodes --show-labels | grep -E 'node-role.kubernetes.io/master|node-role.kubernetes.io/control-plane' | wc -l)
     master_count=$(echo $master_count)
     export HELM_OPTIONS="$HELM_OPTIONS --set binary.enabled=true --set binary.masterCount=$master_count"
 }