github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18195 from kevin-wangzefeng/centos_fix

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-04 23:01:05 -08:00
commit 0d5f127342
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/centos/config-build.sh
View File

@ -26,7 +26,7 @@ FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.3"}
ETCD_VERSION=${ETCD_VERSION:-"2.2.1"}
# Define k8s version to use.
K8S_VERSION=${K8S_VERSION:-"1.0.4"}
K8S_VERSION=${K8S_VERSION:-"1.1.1"}
FLANNEL_DOWNLOAD_URL=\
"https://github.com/coreos/flannel/releases/download/v${FLANNEL_VERSION}/flannel-${FLANNEL_VERSION}-linux-amd64.tar.gz"

2
cluster/centos/util.sh
View File

@ -293,7 +293,7 @@ function kube-scp() {
# KUBE_USER
# KUBE_PASSWORD
function get-password {
get-kubeconfig-basicauth
load-or-gen-kube-basicauth
if [[ -z "${KUBE_USER}" || -z "${KUBE_PASSWORD}" ]]; then
KUBE_USER=admin
KUBE_PASSWORD=$(python -c 'import string,random; \