Skip to content

Commit

Permalink
fix(main): fix rootfs struct spilt clean shell (#441)
Browse files Browse the repository at this point in the history
* fix(main): fix rootfs struct spilt clean shell
  • Loading branch information
cuisongliu committed Jul 24, 2021
1 parent ec7f30a commit c7bb943
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 34 deletions.
16 changes: 16 additions & 0 deletions filesystem/rootfs/docker/scripts/clean-docker.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash

systemctl stop docker
rm -rf /etc/docker/daemon.json
rm -rf /lib/systemd/system/docker.service
rm -rf /usr/lib/systemd/system/docker.service
systemctl daemon-reload

rm -f /usr/bin/containerd
rm -f /usr/bin/containerd-shim
rm -f /usr/bin/ctr
rm -f /usr/bin/docker
rm -f /usr/bin/docker-init
rm -f /usr/bin/docker-proxy
rm -f /usr/bin/dockerd
rm -f /usr/bin/runc
36 changes: 4 additions & 32 deletions filesystem/rootfs/docker/scripts/clean.sh
Original file line number Diff line number Diff line change
@@ -1,35 +1,7 @@
#!/bin/bash

systemctl stop docker
rm -rf /etc/docker/daemon.json
rm -rf /lib/systemd/system/docker.service
rm -rf /usr/lib/systemd/system/docker.service
systemctl daemon-reload
chmod a+x clean-kube.sh
chmod a+x clean-docker.sh

rm -f /usr/bin/conntrack
rm -f /usr/bin/kubelet-pre-start.sh
rm -f /usr/bin/containerd
rm -f /usr/bin/containerd-shim
rm -f /usr/bin/containerd-shim-runc-v2
rm -f /usr/bin/crictl
rm -f /usr/bin/ctr
rm -f /usr/bin/docker
rm -f /usr/bin/docker-init
rm -f /usr/bin/docker-proxy
rm -f /usr/bin/dockerd
rm -f /usr/bin/kubeadm
rm -f /usr/bin/kubetcl
rm -f /usr/bin/kubelet
rm -f /usr/bin/rootlesskit
rm -f /usr/bin/rootlesskit-docker-proxy
rm -f /usr/bin/runc
rm -f /usr/bin/vpnkit
rm -f /usr/bin/containerd-rootless-setuptool.sh
rm -f /usr/bin/containerd-rootless.sh
rm -f /usr/bin/nerdctl

rm -f /etc/sysctl.d/k8s.conf
rm -f /etc/systemd/system/kubelet.service
rm -rf /etc/systemd/system/kubelet.service.d
rm -rf /var/lib/kubelet/
rm -f /var/lib/kubelet/config.yaml
sh clean-kube.sh
sh clean-docker.sh
3 changes: 1 addition & 2 deletions filesystem/rootfs/docker/scripts/docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ fi
systemctl daemon-reload
systemctl restart docker.service

cgroupDriver=$(docker info|grep Cg)
driver=${cgroupDriver##*: }
driver=$(docker info -f "{{.CgroupDriver}}")
echo "driver is ${driver}"
export criDriver=${driver}
35 changes: 35 additions & 0 deletions filesystem/rootfs/rootfs/etc/Clusterfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
apiVersion: zlink.aliyun.com/v1alpha1
kind: Cluster
metadata:
name: my-cluster
spec:
image: kubernetes:v1.19.9
provider: ALI_CLOUD
ssh:
passwd: Seadent123
pk: xxx
pkPasswd: xxx
user: root
network:
interface: eth0
cniName: calico
podCIDR: 100.64.0.0/10
svcCIDR: 10.96.0.0/22
withoutCNI: false
certSANS:
- aliyun-inc.com
- 10.0.0.2
masters:
cpu: 4
memory: 4
count: 1
systemDisk: 100
dataDisks:
- 100
nodes:
cpu: 4
memory: 4
count: 0
systemDisk: 100
dataDisks:
- 100
18 changes: 18 additions & 0 deletions filesystem/rootfs/rootfs/scripts/clean-kube.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash

rm -f /usr/bin/conntrack
rm -f /usr/bin/kubelet-pre-start.sh
rm -f /usr/bin/crictl
rm -f /usr/bin/kubeadm
rm -f /usr/bin/kubetcl
rm -f /usr/bin/kubelet
rm -f /usr/bin/containerd-rootless-setuptool.sh
rm -f /usr/bin/containerd-rootless.sh
rm -f /usr/bin/nerdctl
rm -f /usr/bin/seautil

rm -f /etc/sysctl.d/k8s.conf
rm -f /etc/systemd/system/kubelet.service
rm -rf /etc/systemd/system/kubelet.service.d
rm -rf /var/lib/kubelet/
rm -f /var/lib/kubelet/config.yaml

0 comments on commit c7bb943

Please sign in to comment.