From c67ff355792668e2992003136617016f917b45d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 2 Jun 2019 20:54:44 +0200 Subject: [PATCH] Stop updating /etc/rkt/net.d config files We have now removed rkt, should be enough with cni --- pkg/minikube/bootstrapper/kubeadm/default_cni.go | 2 +- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 3 +-- pkg/minikube/constants/constants.go | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/default_cni.go b/pkg/minikube/bootstrapper/kubeadm/default_cni.go index dfd6cf61c515..36e263f74a1e 100644 --- a/pkg/minikube/bootstrapper/kubeadm/default_cni.go +++ b/pkg/minikube/bootstrapper/kubeadm/default_cni.go @@ -19,7 +19,7 @@ package kubeadm // defaultCNIConfig is the CNI config which is provisioned when --enable-default-cni // has been passed to `minikube start`. // -// The config is being written to /etc/cni/net.d/k8s.conf and /etc/rkt/net.d/k8s.conf. +// The config is being written to /etc/cni/net.d/k8s.conf. const defaultCNIConfig = ` { "name": "rkt.kubernetes.io", diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 48453308b3d6..d3b1482595ec 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -634,8 +634,7 @@ func copyConfig(cfg config.KubernetesConfig, files []assets.CopyableFile, kubead // and minikube was started with "--extra-config=kubelet.network-plugin=cni". if cfg.EnableDefaultCNI { files = append(files, - assets.NewMemoryAssetTarget([]byte(defaultCNIConfig), constants.DefaultCNIConfigPath, "0644"), - assets.NewMemoryAssetTarget([]byte(defaultCNIConfig), constants.DefaultRktNetConfigPath, "0644")) + assets.NewMemoryAssetTarget([]byte(defaultCNIConfig), constants.DefaultCNIConfigPath, "0644")) } return files diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 2610e475d589..c084e454efe0 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -199,8 +199,6 @@ const ( KubeadmConfigFile = "/var/lib/kubeadm.yaml" // DefaultCNIConfigPath is the path to the CNI configuration DefaultCNIConfigPath = "/etc/cni/net.d/k8s.conf" - // DefaultRktNetConfigPath is the path to the rkt net configuration - DefaultRktNetConfigPath = "/etc/rkt/net.d/k8s.conf" ) const (