Update install.sh to support new label. (#982)

Signed-off-by: Syulin7 <[email protected]>

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

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"
 }