diff --git a/docs/setup/06-install_network_plugin.md b/docs/setup/06-install_network_plugin.md index 0e0d3a2..0c4cc2d 100644 --- a/docs/setup/06-install_network_plugin.md +++ b/docs/setup/06-install_network_plugin.md @@ -17,7 +17,7 @@ - IPAM Plugin负责给容器分配IP地址 Kubernetes Pod的网络是这样创建的: -- 0.每个Pod除了创建时指定的容器外,都有一个kubelet启动时指定的`基础容器`,比如:`easzlab/pause-amd64` `registry.access.redhat.com/rhel7/pod-infrastructure` +- 0.每个Pod除了创建时指定的容器外,都有一个kubelet启动时指定的`基础容器`,比如:`easzlab/pause` `registry.access.redhat.com/rhel7/pod-infrastructure` - 1.首先 kubelet创建`基础容器`生成network namespace - 2.然后 kubelet调用网络CNI driver,由它根据配置调用具体的CNI 插件 - 3.然后 CNI 插件给`基础容器`配置网络 diff --git a/example/config.yml b/example/config.yml index 97bbe9b..a17b38d 100644 --- a/example/config.yml +++ b/example/config.yml @@ -48,7 +48,7 @@ ETCD_WAL_DIR: "" ENABLE_MIRROR_REGISTRY: true # [containerd]基础容器镜像 -SANDBOX_IMAGE: "easzlab/pause-amd64:__pause__" +SANDBOX_IMAGE: "easzlab/pause:__pause__" # [containerd]容器持久化存储目录 CONTAINERD_STORAGE_DIR: "/var/lib/containerd" diff --git a/ezdown b/ezdown index d935498..0e4f97c 100755 --- a/ezdown +++ b/ezdown @@ -29,7 +29,7 @@ corednsVer=1.8.6 dashboardVer=v2.4.0 dashboardMetricsScraperVer=v1.0.7 metricsVer=v0.5.2 -pauseVer=3.5 +pauseVer=3.6 nfsProvisionerVer=v4.0.1 export ciliumVer=v1.4.1 export kubeRouterVer=v0.3.1 @@ -318,8 +318,8 @@ function get_offline_image() { docker save -o "$imageDir/metrics-server_$metricsVer.tar" "easzlab/metrics-server:$metricsVer" fi if [[ ! -f "$imageDir/pause_$pauseVer.tar" ]];then - docker pull "easzlab/pause-amd64:$pauseVer" && \ - docker save -o "$imageDir/pause_$pauseVer.tar" "easzlab/pause-amd64:$pauseVer" + docker pull "easzlab/pause:$pauseVer" && \ + docker save -o "$imageDir/pause_$pauseVer.tar" "easzlab/pause:$pauseVer" /bin/cp -u "$imageDir/pause_$pauseVer.tar" "$imageDir/pause.tar" fi if [[ ! -f "$imageDir/nfs-provisioner_$nfsProvisionerVer.tar" ]];then