Skip to content

K
k3s
Commit 0d5f1273 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #18195 from kevin-wangzefeng/centos_fix

Auto commit by PR queue bot
parents c55b136a 4136219d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cluster/centos/config-build.sh
View file @ 0d5f1273
......@@ -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"
......
cluster/centos/util.sh
View file @ 0d5f1273
......@@ -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; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment