Auto-create openshift-node and given nodes read on node-config

Other config variants will be stored in this location. The new namespace
ensures clean security isolation.

Author: smarterclayton

pkg/cmd/server/bootstrappolicy/constants.go

@@ -4,6 +4,7 @@ package bootstrappolicy
 const (
 	DefaultOpenShiftSharedResourcesNamespace = "openshift"
 	DefaultOpenShiftInfraNamespace           = "openshift-infra"
+	DefaultOpenShiftNodeNamespace            = "openshift-node"
 )
 
 // users
@@ -98,7 +99,8 @@ const (
 
 	OpenshiftSharedResourceViewRoleName = "shared-resource-viewer"
 
-	NodeBootstrapRoleName = "system:node-bootstrapper"
+	NodeBootstrapRoleName    = "system:node-bootstrapper"
+	NodeConfigReaderRoleName = "system:node-config-reader"
 )
 
 // RoleBindings
@@ -120,6 +122,7 @@ const (
 	NodeProxierRoleBindingName        = NodeProxierRoleName + "s"
 	NodeAdminRoleBindingName          = NodeAdminRoleName + "s"
 	NodeReaderRoleBindingName         = NodeReaderRoleName + "s"
+	NodeConfigReaderRoleBindingName   = NodeConfigReaderRoleName + "s"
 	SDNReaderRoleBindingName          = SDNReaderRoleName + "s"
 	SDNManagerRoleBindingName         = SDNManagerRoleName + "s"
 	WebHooksRoleBindingName           = WebHooksRoleName + "s"

pkg/cmd/server/bootstrappolicy/policy.go

@@ -689,6 +689,15 @@ func GetOpenshiftBootstrapClusterRoles() []rbac.ClusterRole {
 				// TODO: expose other things like /healthz on the node once we figure out non-resource URL policy across systems
 			},
 		},
+		{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: NodeConfigReaderRoleName,
+			},
+			Rules: []rbac.PolicyRule{
+				// Allow the reader to read config maps in a given namespace with a given name.
+				rbac.NewRule("get").Groups(kapiGroup).Resources("configmaps").Names("node-config").RuleOrDie(),
+			},
+		},
 		{
 			ObjectMeta: metav1.ObjectMeta{
 				Name: NodeRoleName,
@@ -1083,3 +1092,11 @@ var rolesToShow = sets.NewString(
 	"system:image-pusher",
 	"view",
 )
+
+func GetBootstrapNodeConfigProvisioningRoleBindings(namespace string) []rbac.RoleBinding {
+	return []rbac.RoleBinding{
+		newOriginRoleBindingForClusterRole(NodeConfigReaderRoleBindingName, NodeConfigReaderRoleName, namespace).
+			Groups(NodesGroup).
+			BindingOrDie(),
+	}
+}

pkg/cmd/server/origin/ensure.go

@@ -2,10 +2,38 @@ package origin
 
 import (
 	genericapiserver "k8s.io/apiserver/pkg/server"
+	"k8s.io/kubernetes/pkg/apis/rbac"
+	rbacrest "k8s.io/kubernetes/pkg/registry/rbac/rest"
+
+	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 )
 
 // ensureOpenShiftSharedResourcesNamespace is called as part of global policy initialization to ensure shared namespace exists
 func (c *MasterConfig) ensureOpenShiftSharedResourcesNamespace(context genericapiserver.PostStartHookContext) error {
-	ensureNamespaceServiceAccountRoleBindings(context, c.Options.PolicyConfig.OpenShiftSharedResourcesNamespace)
+	ns := c.Options.PolicyConfig.OpenShiftSharedResourcesNamespace
+	ensureNamespaceServiceAccountRoleBindings(
+		context,
+		ns,
+		&rbacrest.PolicyData{
+			RoleBindings: map[string][]rbac.RoleBinding{
+				ns: bootstrappolicy.GetBootstrapServiceAccountProjectRoleBindings(ns),
+			},
+		},
+	)
+	return nil
+}
+
+// ensureOpenShiftNodeNamespace is called as part of global policy initialization to ensure a node namespace exists
+func (c *MasterConfig) ensureOpenShiftNodeNamespace(context genericapiserver.PostStartHookContext) error {
+	ns := bootstrappolicy.DefaultOpenShiftNodeNamespace
+	ensureNamespaceServiceAccountRoleBindings(
+		context,
+		ns,
+		&rbacrest.PolicyData{
+			RoleBindings: map[string][]rbac.RoleBinding{
+				ns: bootstrappolicy.GetBootstrapNodeConfigProvisioningRoleBindings(ns),
+			},
+		},
+	)
 	return nil
 }

pkg/cmd/server/origin/master.go

@@ -247,6 +247,7 @@ func (c *MasterConfig) Run(kubeAPIServerConfig *kubeapiserver.Config, controller
 	}
 
 	// add post-start hooks
+	aggregatedAPIServer.GenericAPIServer.AddPostStartHookOrDie("node.openshift.io-sharednamespace", c.ensureOpenShiftNodeNamespace)
 	aggregatedAPIServer.GenericAPIServer.AddPostStartHookOrDie("template.openshift.io-sharednamespace", c.ensureOpenShiftSharedResourcesNamespace)
 	aggregatedAPIServer.GenericAPIServer.AddPostStartHookOrDie("authorization.openshift.io-bootstrapclusterroles", bootstrappolicy.Policy().EnsureRBACPolicy())
 	aggregatedAPIServer.GenericAPIServer.AddPostStartHookOrDie("admission.openshift.io-RefreshRESTMapper", func(context apiserver.PostStartHookContext) error {

pkg/cmd/server/origin/openshift_apiserver.go

@@ -672,7 +672,15 @@ func (c *OpenshiftAPIConfig) bootstrapSCC(context genericapiserver.PostStartHook
 func (c *OpenshiftAPIConfig) ensureOpenShiftInfraNamespace(context genericapiserver.PostStartHookContext) error {
 	ns := bootstrappolicy.DefaultOpenShiftInfraNamespace
 
-	ensureNamespaceServiceAccountRoleBindings(context, ns)
+	ensureNamespaceServiceAccountRoleBindings(
+		context,
+		ns,
+		&rbacrest.PolicyData{
+			RoleBindings: map[string][]rbac.RoleBinding{
+				ns: bootstrappolicy.GetBootstrapServiceAccountProjectRoleBindings(ns),
+			},
+		},
+	)
 
 	var coreClient coreclient.CoreInterface
 	err := wait.Poll(1*time.Second, 30*time.Second, func() (bool, error) {
@@ -692,20 +700,29 @@ func (c *OpenshiftAPIConfig) ensureOpenShiftInfraNamespace(context genericapiser
 	// Ensure we have the bootstrap SA for Nodes
 	_, err = coreClient.ServiceAccounts(ns).Create(&kapi.ServiceAccount{ObjectMeta: metav1.ObjectMeta{Name: bootstrappolicy.InfraNodeBootstrapServiceAccountName}})
 	if err != nil && !kapierror.IsAlreadyExists(err) {
-		glog.Errorf("Error creating service account %s/%s: %v", ns, bootstrappolicy.InfraNodeBootstrapServiceAccountName, err)
+		utilruntime.HandleError(fmt.Errorf("Error creating service account %s/%s: %v", ns, bootstrappolicy.InfraNodeBootstrapServiceAccountName, err))
+		return err
 	}
 
 	return nil
 }
 
 // ensureDefaultNamespaceServiceAccountRoles initializes roles for service accounts in the default namespace
 func (c *OpenshiftAPIConfig) ensureDefaultNamespaceServiceAccountRoles(context genericapiserver.PostStartHookContext) error {
-	ensureNamespaceServiceAccountRoleBindings(context, metav1.NamespaceDefault)
+	ensureNamespaceServiceAccountRoleBindings(
+		context,
+		metav1.NamespaceDefault,
+		&rbacrest.PolicyData{
+			RoleBindings: map[string][]rbac.RoleBinding{
+				metav1.NamespaceDefault: bootstrappolicy.GetBootstrapServiceAccountProjectRoleBindings(metav1.NamespaceDefault),
+			},
+		},
+	)
 	return nil
 }
 
 // ensureNamespaceServiceAccountRoleBindings initializes roles for service accounts in the namespace
-func ensureNamespaceServiceAccountRoleBindings(context genericapiserver.PostStartHookContext, namespaceName string) {
+func ensureNamespaceServiceAccountRoleBindings(context genericapiserver.PostStartHookContext, namespaceName string, policyData *rbacrest.PolicyData) {
 	const ServiceAccountRolesInitializedAnnotation = "openshift.io/sa.initialized-roles"
 
 	var coreClient coreclient.CoreInterface
@@ -742,11 +759,6 @@ func ensureNamespaceServiceAccountRoleBindings(context genericapiserver.PostStar
 		return
 	}
 
-	policyData := &rbacrest.PolicyData{
-		RoleBindings: map[string][]rbac.RoleBinding{
-			namespace.Name: bootstrappolicy.GetBootstrapServiceAccountProjectRoleBindings(namespace.Name),
-		},
-	}
 	if err := policyData.EnsureRBACPolicy()(context); err != nil {
 		utilruntime.HandleError(err)
 		return

test/integration/master_routes_test.go

@@ -100,6 +100,7 @@ var expectedIndex = []string{
 	// "/healthz/poststarthook/extensions/third-party-resources",  // Do not enable this controller, we do not support it
 	"/healthz/poststarthook/generic-apiserver-start-informers",
 	"/healthz/poststarthook/kube-apiserver-autoregistration",
+	"/healthz/poststarthook/node.openshift.io-sharednamespace",
 	"/healthz/poststarthook/oauth.openshift.io-EnsureBootstrapOAuthClients",
 	"/healthz/poststarthook/project.openshift.io-projectauthorizationcache",
 	"/healthz/poststarthook/project.openshift.io-projectcache",