Skip to content

Commit

Permalink
Merge pull request #7875 from medyagh/containerd_mystrie
Browse files Browse the repository at this point in the history
contained cni: rename default cni file to have higher priority
  • Loading branch information
medyagh authored Apr 23, 2020
2 parents 6bed90c + 7aad057 commit d845c5d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/minikube/bootstrapper/bsutil/files.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var KubeadmYamlPath = path.Join(vmpath.GuestEphemeralDir, "kubeadm.yaml")

const (
//DefaultCNIConfigPath is the configuration file for CNI networks
DefaultCNIConfigPath = "/etc/cni/net.d/k8s.conf"
DefaultCNIConfigPath = "/etc/cni/net.d/1-k8s.conf"
// KubeletServiceFile is the file for the systemd kubelet.service
KubeletServiceFile = "/lib/systemd/system/kubelet.service"
// KubeletSystemdConfFile is config for the systemd kubelet.service
Expand Down

0 comments on commit d845c5d

Please sign in to comment.