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

fix pause-amd64:3.2 repos

pull/846/head
gjmzj 2020-05-03 19:59:31 +08:00
parent 7a8860ff0c
commit d69b9a15fc
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/setup/06-install_network_plugin.md
View File

@ -17,7 +17,7 @@
- IPAM Plugin负责给容器分配IP地址 - IPAM Plugin负责给容器分配IP地址
Kubernetes Pod的网络是这样创建的： Kubernetes Pod的网络是这样创建的：
- 0.每个Pod除了创建时指定的容器外，都有一个kubelet启动时指定的`基础容器`，比如：`mirrorgooglecontainers/pause-amd64` `registry.access.redhat.com/rhel7/pod-infrastructure` - 0.每个Pod除了创建时指定的容器外，都有一个kubelet启动时指定的`基础容器`，比如：`easzlab/pause-amd64` `registry.access.redhat.com/rhel7/pod-infrastructure`
- 1.首先 kubelet创建`基础容器`生成network namespace - 1.首先 kubelet创建`基础容器`生成network namespace
- 2.然后 kubelet调用网络CNI driver，由它根据配置调用具体的CNI 插件 - 2.然后 kubelet调用网络CNI driver，由它根据配置调用具体的CNI 插件
- 3.然后 CNI 插件给`基础容器`配置网络 - 3.然后 CNI 插件给`基础容器`配置网络

2
roles/containerd/defaults/main.yml
View File

@ -2,7 +2,7 @@
STORAGE_DIR: "/var/lib/containerd" STORAGE_DIR: "/var/lib/containerd"
# 基础容器镜像 # 基础容器镜像
SANDBOX_IMAGE: "mirrorgooglecontainers/pause-amd64:3.2" SANDBOX_IMAGE: "easzlab/pause-amd64:3.2"
# 启用容器仓库镜像 # 启用容器仓库镜像
ENABLE_MIRROR_REGISTRY: true ENABLE_MIRROR_REGISTRY: true

2
roles/kube-node/defaults/main.yml
View File

@ -2,7 +2,7 @@
CLUSTER_DNS_SVC_IP: "{{ SERVICE_CIDR | ipaddr('net') | ipaddr(2) | ipaddr('address') }}" CLUSTER_DNS_SVC_IP: "{{ SERVICE_CIDR | ipaddr('net') | ipaddr(2) | ipaddr('address') }}"
# 基础容器镜像 # 基础容器镜像
SANDBOX_IMAGE: "mirrorgooglecontainers/pause-amd64:3.2" SANDBOX_IMAGE: "easzlab/pause-amd64:3.2"
#SANDBOX_IMAGE: "registry.access.redhat.com/rhel7/pod-infrastructure:latest" #SANDBOX_IMAGE: "registry.access.redhat.com/rhel7/pod-infrastructure:latest"
# Kubelet 根目录 # Kubelet 根目录

4
tools/easzup
View File

@ -224,8 +224,8 @@ function get_offline_image() {
docker save -o ${imageDir}/metrics-server_${metricsVer}.tar mirrorgooglecontainers/metrics-server-amd64:${metricsVer} docker save -o ${imageDir}/metrics-server_${metricsVer}.tar mirrorgooglecontainers/metrics-server-amd64:${metricsVer}
fi fi
if [[ ! -f "$imageDir/pause_$pauseVer.tar" ]];then if [[ ! -f "$imageDir/pause_$pauseVer.tar" ]];then
docker pull mirrorgooglecontainers/pause-amd64:${pauseVer} && \ docker pull easzlab/pause-amd64:${pauseVer} && \
docker save -o ${imageDir}/pause_${pauseVer}.tar mirrorgooglecontainers/pause-amd64:${pauseVer} docker save -o ${imageDir}/pause_${pauseVer}.tar easzlab/pause-amd64:${pauseVer}
/bin/cp -u "${imageDir}/pause_${pauseVer}.tar" "${imageDir}/pause.tar" /bin/cp -u "${imageDir}/pause_${pauseVer}.tar" "${imageDir}/pause.tar"
fi fi
if [[ ! -f "$imageDir/traefik_$traefikVer.tar" ]];then if [[ ! -f "$imageDir/traefik_$traefikVer.tar" ]];then