diff --git a/ReadME.MD b/ReadME.MD index bf34d3d..548c021 100644 --- a/ReadME.MD +++ b/ReadME.MD @@ -91,6 +91,7 @@ done 需要手动做 Fix ```Bash +<<<<<<< HEAD https://raw.githubusercontent.com/charmed-kubernetes/bundle/main/releases/1.22/bundle.yaml charm pull cs:~containers/containerd-178 charm pull cs:~containers/easyrsa-420 @@ -100,3 +101,20 @@ charm pull cs:~containers/kubernetes-worker-816 charm pull cs:~containers/calico-838 charm pull cs:~containers/kubeapi-load-balancer-844 ``` +======= +charm pull cs:~containers/etcd-633 +charm pull cs:~containers/easyrsa-419 +charm pull cs:~containers/kubernetes-master-1077 +charm pull cs:~containers/kubernetes-worker-815 +charm pull cs:~containers/calico-838 +charm pull cs:~containers/containerd-177 +charm pull cs:~containers/kata-138 +# Extend +charm pull cs:~containers/kubeapi-load-balancer-843 +charm pull cs:~containers/keepalived-110 +charm pull cs:~containers/coredns-20 +# Other +charm pull cs:~containers/ubuntu-20 +charm pull cs:~containers/nrpe-75 +``` +>>>>>>> 0ba2a75b267453d9584def41868de085d111994f