Enable RBAC by default

Resolves kubernetes-retired#655
mumoshu · Aug 30, 2017 · cde5e3a · cde5e3a
1 parent c50663f
commit cde5e3a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/core/controlplane/config/config.go b/core/controlplane/config/config.go
@@ -93,7 +93,7 @@ func NewDefaultCluster() *Cluster {
 		},
 		Plugins: Plugins{
 			Rbac: Rbac{
-				Enabled: false,
+				Enabled: true,
 			},
 		},
 		Oidc: model.Oidc{

diff --git a/core/controlplane/config/config_test.go b/core/controlplane/config/config_test.go
@@ -830,6 +830,18 @@ experimental:
 		},
 		{
 			conf: `
+experimental:
+  nodeAuthorizer:
+    enabled: true
+  tlsBootstrap:
+    enabled: true
+`,
+			nodeAuthorizer: NodeAuthorizer{
+				Enabled: true,
+			},
+		},
+		{
+			conf: `
 experimental:
   nodeAuthorizer:
     enabled: true
@@ -862,14 +874,6 @@ experimental:
 `,
 		`
 # RBAC must be enabled as well
-experimental:
-  nodeAuthorizer:
-    enabled: true
-  tlsBootstrap:
-    enabled: true
-`,
-		`
-# RBAC must be enabled as well
 experimental:
   nodeAuthorizer:
     enabled: true

diff --git a/test/integration/maincluster_test.go b/test/integration/maincluster_test.go
@@ -131,6 +131,11 @@ func TestMainClusterConfig(t *testing.T) {
 				Enabled:      false,
 				DrainTimeout: 5,
 			},
+			Plugins: controlplane_config.Plugins{
+				Rbac: controlplane_config.Rbac{
+					Enabled: true,
+				},
+			},
 		}
 
 		actual := c.Experimental