diff --git a/calicoctl b/calicoctl new file mode 100644 index 0000000..55c13b2 Binary files /dev/null and b/calicoctl differ diff --git a/kubernetes/installation/readme.md b/kubernetes/installation/readme.md index d3ca040..f44f9f0 100644 --- a/kubernetes/installation/readme.md +++ b/kubernetes/installation/readme.md @@ -41,5 +41,7 @@ kubectl taint nodes --all node-role.kubernetes.io/control-plane- ### 安装calico ```bash -kubectl apply -f https://docs.projectcalico.org/manifests/calico.yaml +# kubectl apply -f https://docs.projectcalico.org/manifests/calico.yaml +kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.25.0/manifests/tigera-operator.yaml +kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.25.0/manifests/custom-resources.yaml ``` \ No newline at end of file diff --git a/kubernetes/installation/scripts/get_images.sh b/kubernetes/installation/scripts/get_images.sh index 4d8f49f..1cb2108 100644 --- a/kubernetes/installation/scripts/get_images.sh +++ b/kubernetes/installation/scripts/get_images.sh @@ -2,7 +2,7 @@ HTTPS_PROXY=$1 IMAGE_REGISTRY=$2 IMAGE_REGISTRY_USER=$3 -IMAGES=$(kubeadm config images list | grep k8s.gcr.io) +IMAGES=$(kubeadm config images list | grep registry.k8s.io) for IMAGE in ${IMAGES[@]} do echo "pull image ${IMAGE}" @@ -12,4 +12,4 @@ do ctr images push -k -u ${IMAGE_REGISTRY_USER} ${IMAGE_REGISTRY}/${IMAGE_NAME} # ctr images rm ${IMAGE} done -#192.168.0.144:1080 ccr.ccs.tencentyun.com/kgcrio 100004225373:Hello2022 \ No newline at end of file +#192.168.0.144:1080 ccr.ccs.tencentyun.com/kgcrio 100004225373 \ No newline at end of file