Minikube changes for v1.6.0-beta.2

cmd/localkube/cmd/start.go

@@ -99,7 +99,8 @@ func SetupServer(s *localkube.LocalkubeServer) {
 	if err != nil {
 		panic(err)
 	}
-	s.AddServer(etcd)
+	// Start etcd first
+	etcd.Start()
 
 	// setup access to etcd
 	netIP, _ := s.GetHostIP()
@@ -107,7 +108,7 @@ func SetupServer(s *localkube.LocalkubeServer) {
 
 	// setup apiserver
 	apiserver := s.NewAPIServer()
-	s.AddServer(apiserver)
+	apiserver.Start()
 
 	// setup controller-manager
 	controllerManager := s.NewControllerManagerServer()

deploy/addons/storageclass/storageclass.yaml

@@ -1,5 +1,5 @@
 kind: StorageClass
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1
 metadata:
   namespace: kube-system
   name: standard

docs/minikube_start.md

@@ -31,7 +31,7 @@ minikube start
       --iso-url string                  Location of the minikube iso (default "https://storage.googleapis.com/minikube/iso/minikube-v1.0.7.iso")
       --keep-context                    This will keep the existing kubectl context and will create a minikube context.
       --kubernetes-version string       The kubernetes version that the minikube VM will use (ex: v1.2.3) 
- OR a URI which contains a localkube binary (ex: https://storage.googleapis.com/minikube/k8sReleases/v1.3.0/localkube-linux-amd64) (default "v1.6.0-alpha.1")
+ OR a URI which contains a localkube binary (ex: https://storage.googleapis.com/minikube/k8sReleases/v1.3.0/localkube-linux-amd64) (default "v1.6.0-beta.2")
       --kvm-network string              The KVM network name. (only supported with KVM driver) (default "default")
       --memory int                      Amount of RAM allocated to the minikube VM (default 2048)
       --network-plugin string           The name of the network plugin

pkg/localkube/apiserver.go

@@ -17,10 +17,11 @@ limitations under the License.
 package localkube
 
 import (
+	apiserveroptions "k8s.io/apiserver/pkg/server/options"
+	"k8s.io/apiserver/pkg/storage/storagebackend"
 	apiserver "k8s.io/kubernetes/cmd/kube-apiserver/app"
 	"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
-
-	"k8s.io/apiserver/pkg/storage/storagebackend"
+	kubeapioptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
 )
 
 func (lk LocalkubeServer) NewAPIServer() Server {
@@ -43,22 +44,26 @@ func StartAPIServer(lk LocalkubeServer) func() error {
 	config.GenericServerRunOptions.AdmissionControl = "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota"
 
 	// use localkube etcd
-	config.Etcd.StorageConfig = storagebackend.Config{
-		ServerList: KubeEtcdClientURLs,
-		Type:       storagebackend.StorageTypeETCD2,
-	}
+
+	config.Etcd.StorageConfig.ServerList = KubeEtcdClientURLs
+	config.Etcd.StorageConfig.Type = storagebackend.StorageTypeETCD2
 
 	// set Service IP range
 	config.ServiceClusterIPRange = lk.ServiceClusterIPRange
+	config.Etcd.EnableWatchCache = true
+
+	config.Features = &apiserveroptions.FeatureOptions{
+		EnableProfiling: true,
+	}
 
 	// defaults from apiserver command
-	config.GenericServerRunOptions.EnableProfiling = true
-	config.GenericServerRunOptions.EnableWatchCache = true
 	config.GenericServerRunOptions.MinRequestTimeout = 1800
 
 	config.AllowPrivileged = true
 
-	config.GenericServerRunOptions.RuntimeConfig = lk.RuntimeConfig
+	config.APIEnablement = &kubeapioptions.APIEnablementOptions{
+		RuntimeConfig: lk.RuntimeConfig,
+	}
 
 	lk.SetExtraConfigForComponent("apiserver", &config)
 

pkg/localkube/kubelet.go

@@ -39,7 +39,7 @@ func StartKubeletServer(lk LocalkubeServer) func() error {
 
 	// Networking
 	config.ClusterDomain = lk.DNSDomain
-	config.ClusterDNS = lk.DNSIP.String()
+	config.ClusterDNS = []string{lk.DNSIP.String()}
 	// For kubenet plugin.
 	config.PodCIDR = "10.180.1.0/24"