• Kubernetes Submit Queue's avatar
    Merge pull request #58561 from jesseshieh/patch-1 · 6e65c235
    Kubernetes Submit Queue authored
    Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.
    
    Fix master regex when running multiple clusters
    
    **What this PR does / why we need it**:
    I'm running two Kubernetes clusters on GCE. One for production and one for staging. The instance prefix I use for production is `kubernetes` and for staging it's `staging-kubernetes`. This caused a problem when running `kube-up.sh` for production because when it tries to find all instances which match `kubernetes(-...)?` it finds both the production and staging instances. This probably results in multiple problems, but the most noticeable one for me was that `INITIAL_ETCD_CLUSTER` was incorrect and so etcd wouldn't start up correctly so the api server doesn't start up correctly so nothing else starts up. I tested this manually and it seems to work for me, but I didn't write an automated test.
    
    **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
    Fixes #
    
    **Special notes for your reviewer**:
    
    **Release note**:
    
    ```release-note
    Fixes bug finding master replicas in GCE when running multiple Kubernetes clusters
    ```
    6e65c235
Name
Last commit
Last update
..
addons Loading commit data...
centos Loading commit data...
gce Loading commit data...
images Loading commit data...
juju Loading commit data...
kubemark Loading commit data...
kubernetes-anywhere Loading commit data...
local Loading commit data...
log-dump Loading commit data...
pre-existing Loading commit data...
skeleton Loading commit data...
BUILD Loading commit data...
OWNERS Loading commit data...
README.md Loading commit data...
clientbin.sh Loading commit data...
common.sh Loading commit data...
get-kube-binaries.sh Loading commit data...
get-kube-local.sh Loading commit data...
get-kube.sh Loading commit data...
kube-down.sh Loading commit data...
kube-up.sh Loading commit data...
kube-util.sh Loading commit data...
kubeadm.sh Loading commit data...
kubectl.sh Loading commit data...
restore-from-backup.sh Loading commit data...
test-e2e.sh Loading commit data...
test-network.sh Loading commit data...
test-smoke.sh Loading commit data...
update-storage-objects.sh Loading commit data...
validate-cluster.sh Loading commit data...