diff --git a/docs/guide/gitlab/app.yaml.md b/docs/guide/gitlab/app.yaml.md index 662b464..88074b9 100644 --- a/docs/guide/gitlab/app.yaml.md +++ b/docs/guide/gitlab/app.yaml.md @@ -36,7 +36,6 @@ spec: containers: - name: APP_NAME image: ProjectImage - imagePullPolicy: Always env: # 设置java的时区 - name: TZ diff --git a/docs/setup/00-planning_and_overall_intro.md b/docs/setup/00-planning_and_overall_intro.md index f64aa03..7d7eeab 100644 --- a/docs/setup/00-planning_and_overall_intro.md +++ b/docs/setup/00-planning_and_overall_intro.md @@ -63,10 +63,8 @@ apt-get install git python-pip -y # CentOS 7 yum install git python-pip -y # pip安装ansible(国内如果安装太慢可以直接用pip阿里云加速) -#pip install pip --upgrade -#pip install ansible==2.6.12 netaddr==0.7.19 pip install pip --upgrade -i https://mirrors.aliyun.com/pypi/simple/ -pip install ansible==2.6.12 netaddr==0.7.19 -i https://mirrors.aliyun.com/pypi/simple/ +pip install ansible==2.6.18 netaddr==0.7.19 -i https://mirrors.aliyun.com/pypi/simple/ ``` - 3.2 在ansible控制端配置免密码登录 diff --git a/manifests/dashboard/kubernetes-dashboard.yaml b/manifests/dashboard/kubernetes-dashboard.yaml index eb5bce0..ed74546 100644 --- a/manifests/dashboard/kubernetes-dashboard.yaml +++ b/manifests/dashboard/kubernetes-dashboard.yaml @@ -189,7 +189,6 @@ spec: containers: - name: kubernetes-dashboard image: kubernetesui/dashboard:v2.0.0-beta5 - imagePullPolicy: Always ports: - containerPort: 8443 protocol: TCP diff --git a/tools/easzup b/tools/easzup index 92e58d8..9c9c697 100755 --- a/tools/easzup +++ b/tools/easzup @@ -15,9 +15,9 @@ set -o errexit # default version, can be overridden by cmd line options export DOCKER_VER=18.09.9 -export KUBEASZ_VER=2.0.4 +export KUBEASZ_VER=2.1.0 export K8S_BIN_VER=v1.16.2 -export EXT_BIN_VER=0.3.1 +export EXT_BIN_VER=0.3.2 export SYS_PKG_VER=0.3.3 function install_docker() { @@ -207,8 +207,8 @@ function get_offline_image() { docker save -o ${imageDir}/coredns_${corednsVer}.tar coredns/coredns:${corednsVer} fi if [[ ! -f "$imageDir/dashboard_$dashboardVer.tar" ]];then - docker pull mirrorgooglecontainers/kubernetes-dashboard-amd64:${dashboardVer} && \ - docker save -o ${imageDir}/dashboard_${dashboardVer}.tar mirrorgooglecontainers/kubernetes-dashboard-amd64:${dashboardVer} + docker pull kubernetesui/dashboard:${dashboardVer} && \ + docker save -o ${imageDir}/dashboard_${dashboardVer}.tar kubernetesui/dashboard:${dashboardVer} fi if [[ ! -f "$imageDir/flannel_$flannelVer.tar" ]];then docker pull easzlab/flannel:${flannelVer} && \