kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use /opt/cni/bin on all distros 

We used to remap the cni-bin to /home/kubernetes/bin on COS, but that
then requires us to change the CNI manifests also to write to the new
location.

Instead we can use /opt/cni/bin on all distros, now that we are making
it writeable everywhere with a bind mount.
This commit is contained in:
Justin SB 2019-10-27 23:25:39 -04:00 committed by Justin Santa Barbara
parent 2711ed3f11
commit a0c16c9abe
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nodeup/pkg/model/context.go
View File

@ -173,12 +173,8 @@ func (c *NodeupModelContext) PathSrvSshproxy() string {
// CNIBinDir returns the path for the CNI binaries // CNIBinDir returns the path for the CNI binaries
func (c *NodeupModelContext) CNIBinDir() string { func (c *NodeupModelContext) CNIBinDir() string {
switch c.Distribution { // We used to map this on a per-distro basis, but this can require CNI manifests to be distro aware
case distros.DistributionContainerOS: return "/opt/cni/bin/"
return "/home/kubernetes/bin/"
default:
return "/opt/cni/bin/"
}
} }
// KubeletBootstrapKubeconfig is the path the bootstrap config file // KubeletBootstrapKubeconfig is the path the bootstrap config file