github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #67450 from oomichi/cleanup 

Automatic merge from submit-queue (batch tested with PRs 65561, 67109, 67450, 67456, 67402). 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>.

Remove duplicated detect-master for local

**What this PR does / why we need it**:

cluster/local/util.sh contains duplicated detect-master() and the
first one is unused at all. This removes the first one for the code
cleanup.

**Release note**: NONE
pull/8/head
Kubernetes Submit Queue 2018-08-15 18:15:13 -07:00 committed by GitHub
parent b904a3dc48 2bdae8f3d0
commit e7afbef807
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/local/util.sh
View File

@ -18,13 +18,7 @@ function prepare-e2e() {
echo "Local doesn't need special preparations for e2e tests" 1>&2
}
# Must ensure that the following ENV vars are set
function detect-master {
export KUBE_MASTER_IP="127.0.0.1"
export KUBE_MASTER="localhost"
}
detect-master() {
KUBE_MASTER=localhost
KUBE_MASTER_IP=127.0.0.1
KUBE_MASTER_URL="http://${KUBE_MASTER_IP}:8080"