Skip to content

Commit c67ff35

Browse files
committed
Stop updating /etc/rkt/net.d config files
We have now removed rkt, should be enough with cni
1 parent 27d56c1 commit c67ff35

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

pkg/minikube/bootstrapper/kubeadm/default_cni.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package kubeadm
1919
// defaultCNIConfig is the CNI config which is provisioned when --enable-default-cni
2020
// has been passed to `minikube start`.
2121
//
22-
// The config is being written to /etc/cni/net.d/k8s.conf and /etc/rkt/net.d/k8s.conf.
22+
// The config is being written to /etc/cni/net.d/k8s.conf.
2323
const defaultCNIConfig = `
2424
{
2525
"name": "rkt.kubernetes.io",

pkg/minikube/bootstrapper/kubeadm/kubeadm.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -634,8 +634,7 @@ func copyConfig(cfg config.KubernetesConfig, files []assets.CopyableFile, kubead
634634
// and minikube was started with "--extra-config=kubelet.network-plugin=cni".
635635
if cfg.EnableDefaultCNI {
636636
files = append(files,
637-
assets.NewMemoryAssetTarget([]byte(defaultCNIConfig), constants.DefaultCNIConfigPath, "0644"),
638-
assets.NewMemoryAssetTarget([]byte(defaultCNIConfig), constants.DefaultRktNetConfigPath, "0644"))
637+
assets.NewMemoryAssetTarget([]byte(defaultCNIConfig), constants.DefaultCNIConfigPath, "0644"))
639638
}
640639

641640
return files

pkg/minikube/constants/constants.go

-2
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,6 @@ const (
199199
KubeadmConfigFile = "/var/lib/kubeadm.yaml"
200200
// DefaultCNIConfigPath is the path to the CNI configuration
201201
DefaultCNIConfigPath = "/etc/cni/net.d/k8s.conf"
202-
// DefaultRktNetConfigPath is the path to the rkt net configuration
203-
DefaultRktNetConfigPath = "/etc/rkt/net.d/k8s.conf"
204202
)
205203

206204
const (

0 commit comments

Comments
 (0)