github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #28268 from cjcullen/expr

Browse Source 
Automatic merge from submit-queue

Make GKE detect-instance-groups work on Mac.

Make the fix from #27803 also work on mac.

The GNU `expr` command supports both the `expr match STRING REGEXP` and `expr STRING : REGEXP` command syntax.

The BSD `expr` command only has the `expr STRING : REGEXP` syntax.

@fabioy @a-robinson
This commit is contained in:
k8s-merge-robot 2016-07-01 21:41:11 -07:00 committed by GitHub
commit 85f75daf25
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gke/util.sh
View File

@ -318,7 +318,7 @@ function detect-node-instance-groups {
ALL_INSTANCE_GROUP_URLS=${urls[*]}
NODE_INSTANCE_GROUPS=()
for url in "${urls[@]:-}"; do
local igm_zone=$(expr match ${url} '.*/zones/\([a-z0-9-]*\)/')
local igm_zone=$(expr ${url} : '.*/zones/\([a-z0-9-]*\)/')
if [[ "${igm_zone}" == "${ZONE}" ]]; then
NODE_INSTANCE_GROUPS+=("${url##*/}")
fi