rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-13 20:46:51 +00:00
Code Issues Releases Wiki Activity

add /var/lib/cni to kubelet mounts

Browse Source
This commit is contained in:
galal-hussein 2018-02-09 22:18:58 +02:00
parent 9585ec5780
commit 289c3d5d20
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/plan.go
View File

@ -193,6 +193,7 @@ func (c *Cluster) BuildKubeletProcess(host *hosts.Host) v3.Process {
"/etc/kubernetes:/etc/kubernetes:z", "/etc/kubernetes:/etc/kubernetes:z",
"/etc/cni:/etc/cni:ro,z", "/etc/cni:/etc/cni:ro,z",
"/opt/cni:/opt/cni:ro,z", "/opt/cni:/opt/cni:ro,z",
"/var/lib/cni:/var/lib/cni:z",
"/etc/resolv.conf:/etc/resolv.conf", "/etc/resolv.conf:/etc/resolv.conf",
"/sys:/sys", "/sys:/sys",
"/var/lib/docker:/var/lib/docker:rw,z", "/var/lib/docker:/var/lib/docker:rw,z",

4
hosts/hosts.go
View File

@ -36,6 +36,7 @@ const (
ToCleanSSLDir = "/etc/kubernetes/ssl" ToCleanSSLDir = "/etc/kubernetes/ssl"
ToCleanCNIConf = "/etc/cni" ToCleanCNIConf = "/etc/cni"
ToCleanCNIBin = "/opt/cni" ToCleanCNIBin = "/opt/cni"
ToCleanCNILib = "/var/lib/cni"
ToCleanCalicoRun = "/var/run/calico" ToCleanCalicoRun = "/var/run/calico"
ToCleanTempCertPath = "/etc/kubernetes/.tmp/" ToCleanTempCertPath = "/etc/kubernetes/.tmp/"
CleanerContainerName = "kube-cleaner" CleanerContainerName = "kube-cleaner"
@ -50,6 +51,7 @@ func (h *Host) CleanUpAll(ctx context.Context, cleanerImage string, prsMap map[s
ToCleanCNIBin, ToCleanCNIBin,
ToCleanCalicoRun, ToCleanCalicoRun,
ToCleanTempCertPath, ToCleanTempCertPath,
ToCleanCNILib,
} }
return h.CleanUp(ctx, toCleanPaths, cleanerImage, prsMap) return h.CleanUp(ctx, toCleanPaths, cleanerImage, prsMap)
} }
@ -64,6 +66,7 @@ func (h *Host) CleanUpWorkerHost(ctx context.Context, cleanerImage string, prsMa
ToCleanCNIConf, ToCleanCNIConf,
ToCleanCNIBin, ToCleanCNIBin,
ToCleanCalicoRun, ToCleanCalicoRun,
ToCleanCNILib,
} }
return h.CleanUp(ctx, toCleanPaths, cleanerImage, prsMap) return h.CleanUp(ctx, toCleanPaths, cleanerImage, prsMap)
} }
@ -78,6 +81,7 @@ func (h *Host) CleanUpControlHost(ctx context.Context, cleanerImage string, prsM
ToCleanCNIConf, ToCleanCNIConf,
ToCleanCNIBin, ToCleanCNIBin,
ToCleanCalicoRun, ToCleanCalicoRun,
ToCleanCNILib,
} }
return h.CleanUp(ctx, toCleanPaths, cleanerImage, prsMap) return h.CleanUp(ctx, toCleanPaths, cleanerImage, prsMap)
} }