easzlab
/
kubeasz
mirror of https://github.com/easzlab/kubeasz.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor fix

pull/741/head
gjmzj 2019-11-07 11:24:53 +00:00
parent 2ff5d55d6d
commit 0b7c1d98e8
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/guide/gitlab/app.yaml.md
View File

@ -36,7 +36,6 @@ spec:
containers: containers:
- name: APP_NAME - name: APP_NAME
image: ProjectImage image: ProjectImage
imagePullPolicy: Always
env: env:
# 设置java的时区 # 设置java的时区
- name: TZ - name: TZ

4
docs/setup/00-planning_and_overall_intro.md
View File

@ -63,10 +63,8 @@ apt-get install git python-pip -y
# CentOS 7 # CentOS 7
yum install git python-pip -y yum install git python-pip -y
# pip安装ansible(国内如果安装太慢可以直接用pip阿里云加速) # 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 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控制端配置免密码登录 - 3.2 在ansible控制端配置免密码登录

1
manifests/dashboard/kubernetes-dashboard.yaml
View File

@ -189,7 +189,6 @@ spec:
containers: containers:
- name: kubernetes-dashboard - name: kubernetes-dashboard
image: kubernetesui/dashboard:v2.0.0-beta5 image: kubernetesui/dashboard:v2.0.0-beta5
imagePullPolicy: Always
ports: ports:
- containerPort: 8443 - containerPort: 8443
protocol: TCP protocol: TCP

8
tools/easzup
View File

@ -15,9 +15,9 @@ set -o errexit
# default version, can be overridden by cmd line options # default version, can be overridden by cmd line options
export DOCKER_VER=18.09.9 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 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 export SYS_PKG_VER=0.3.3
function install_docker() { function install_docker() {
@ -207,8 +207,8 @@ function get_offline_image() {
docker save -o ${imageDir}/coredns_${corednsVer}.tar coredns/coredns:${corednsVer} docker save -o ${imageDir}/coredns_${corednsVer}.tar coredns/coredns:${corednsVer}
fi fi
if [[ ! -f "$imageDir/dashboard_$dashboardVer.tar" ]];then if [[ ! -f "$imageDir/dashboard_$dashboardVer.tar" ]];then
docker pull mirrorgooglecontainers/kubernetes-dashboard-amd64:${dashboardVer} && \ docker pull kubernetesui/dashboard:${dashboardVer} && \
docker save -o ${imageDir}/dashboard_${dashboardVer}.tar mirrorgooglecontainers/kubernetes-dashboard-amd64:${dashboardVer} docker save -o ${imageDir}/dashboard_${dashboardVer}.tar kubernetesui/dashboard:${dashboardVer}
fi fi
if [[ ! -f "$imageDir/flannel_$flannelVer.tar" ]];then if [[ ! -f "$imageDir/flannel_$flannelVer.tar" ]];then
docker pull easzlab/flannel:${flannelVer} && \ docker pull easzlab/flannel:${flannelVer} && \