Motofans
/
Charmed-Kubernetes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Merge branch 'bugfix/814' of http://100.64.20.230:5555/Motofans/charmed-kubernetes into bugfix/814

This commit is contained in:
AnonSaber 2023-06-28 14:07:38 +00:00
parent 103d9be2d8 1a778714ea
commit ee0ec69f2d
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ReadME.MD
View File

@ -90,31 +90,3 @@ done
需要手动做 Fix 需要手动做 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
charm pull cs:~containers/etcd-634
charm pull cs:~containers/kubernetes-master-1078
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