github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-02 09:47:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #67125 from isaacdong/patch-1

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 66602, 67178, 67207, 67125, 66332). 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 get-kube-local.sh 2 wrong parameters.

**bug fix**
1. run ./get-kube-local.sh, and get this error.
>  ./get-kube-local.sh: line 60: 2: unbound variable
2. remove duplicate filename in docker run command: `--kubeconfig=${KUBELET_KUBECONFIG}`

**Special notes for your reviewer**:
code detail:
line 88: create-kubelet-kubeconfig "${KUBELET_KUBECONFIG}" 
line 59: function create-kubelet-kubeconfig() {
line 60:  local destination="${1}"

**Release note**:

```release-note
      NONE
```
This commit is contained in:
Kubernetes Submit Queue
2018-08-10 14:13:15 -07:00
committed by GitHub
parent 94a754c794 ece7c52bc3
commit 1b4f2e1f4e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/get-kube-local.sh
View File

@@ -55,8 +55,9 @@ function run {
} }
# Creates a kubeconfig file for the kubelet. # Creates a kubeconfig file for the kubelet.
# Args: destination file path # Args: the IP address of the API server (e.g. "http://localhost:8080"), destination file path
function create-kubelet-kubeconfig() { function create-kubelet-kubeconfig() {
#local api_addr="${1}"
local destination="${2}" local destination="${2}"
if [[ -z "${destination}" ]]; then if [[ -z "${destination}" ]]; then
echo "Must provide destination path to create Kubelet kubeconfig file!" echo "Must provide destination path to create Kubelet kubeconfig file!"
@@ -85,7 +86,7 @@ EOF
function create_cluster { function create_cluster {
echo "Creating a local cluster:" echo "Creating a local cluster:"
echo -e -n "\tStarting kubelet..." echo -e -n "\tStarting kubelet..."
create-kubelet-kubeconfig "${KUBELET_KUBECONFIG}" create-kubelet-kubeconfig "http://localhost:8080" "${KUBELET_KUBECONFIG}"
run "docker run \ run "docker run \
--volume=/:/rootfs:ro \ --volume=/:/rootfs:ro \
--volume=/sys:/sys:ro \ --volume=/sys:/sys:ro \
@@ -103,7 +104,7 @@ function create_cluster {
--containerized \ --containerized \
--hostname-override="127.0.0.1" \ --hostname-override="127.0.0.1" \
--address="0.0.0.0" \ --address="0.0.0.0" \
--kubeconfig=${KUBELET_KUBECONFIG}/kubelet.kubeconfig \ --kubeconfig=${KUBELET_KUBECONFIG} \
--pod-manifest-path=/etc/kubernetes/manifests \ --pod-manifest-path=/etc/kubernetes/manifests \
--allow-privileged=true \ --allow-privileged=true \
--cluster-dns=10.0.0.10 \ --cluster-dns=10.0.0.10 \