Make the admission controllers shared between localkube and kubeadm.

kubernetes · Feb 14, 2018 · b46c3b9 · b46c3b9
1 parent 0f16813
commit b46c3b9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/pkg/localkube/apiserver.go b/pkg/localkube/apiserver.go
@@ -48,14 +48,7 @@ func StartAPIServer(lk LocalkubeServer) func() error {
 
 	config.SecureServing.ServerCert.CertKey.CertFile = lk.GetPublicKeyCertPath()
 	config.SecureServing.ServerCert.CertKey.KeyFile = lk.GetPrivateKeyCertPath()
-	config.Admission.PluginNames = []string{
-		"NamespaceLifecycle",
-		"LimitRanger",
-		"ServiceAccount",
-		"DefaultStorageClass",
-		"ResourceQuota",
-		"MutatingAdmissionWebhook",
-	}
+	config.Admission.PluginNames = util.DefaultAdmissionControllers
 	// use localkube etcd
 
 	config.Etcd.StorageConfig.ServerList = []string{embed.DefaultListenClientURLs}

diff --git a/pkg/minikube/bootstrapper/kubeadm/templates.go b/pkg/minikube/bootstrapper/kubeadm/templates.go
@@ -29,6 +29,7 @@ kind: MasterConfiguration
 api:
   advertiseAddress: {{.AdvertiseAddress}}
   bindPort: {{.APIServerPort}}
+
 kubernetesVersion: {{.KubernetesVersion}}
 certificatesDir: {{.CertDir}}
 networking:

diff --git a/pkg/minikube/bootstrapper/kubeadm/versions.go b/pkg/minikube/bootstrapper/kubeadm/versions.go
@@ -191,6 +191,14 @@ var versionSpecificOpts = []VersionedExtraOption{
 	// Cgroup args
 	NewUnversionedOption(Kubelet, "cadvisor-port", "0"),
 	NewUnversionedOption(Kubelet, "cgroup-driver", "cgroupfs"),
+	{
+		Option: util.ExtraOption{
+			Component: Apiserver,
+			Key:       "admission-control",
+			Value:     strings.Join(util.DefaultAdmissionControllers, ","),
+		},
+		GreaterThanOrEqual: semver.MustParse("1.9.0-alpha.0"),
+	},
 }
 
 func VersionIsBetween(version, gte, lte semver.Version) bool {

diff --git a/pkg/util/constants.go b/pkg/util/constants.go
@@ -32,6 +32,18 @@ const (
 	DefaultServiceCIDR        = "10.96.0.0/12"
 )
 
+var DefaultAdmissionControllers = []string{
+	"Initializers",
+	"NamespaceLifecycle",
+	"LimitRanger",
+	"ServiceAccount",
+	"DefaultStorageClass",
+	"DefaultTolerationSeconds",
+	"NodeRestriction",
+	"ResourceQuota",
+	"MutatingAdmissionWebhook",
+}
+
 // GetServiceClusterIP returns the first IP of the ServiceCIDR
 func GetServiceClusterIP(serviceCIDR string) (net.IP, error) {
 	ip, _, err := net.ParseCIDR(serviceCIDR)