@@ -199,7 +199,7 @@ func (o *DebugOptions) Complete(cmd *cobra.Command, f *clientcmd.Factory, args [

 		ResourceTypeOrNameArgs(true, resources...).

 		Flatten()

 	if len(o.Filename) > 0 {

-		b.FilenameParam(explicit, o.Filename)

+		b.FilenameParam(explicit, false, o.Filename)

 	}

 	o.AddEnv, o.RemoveEnv, err = cmdutil.ParseEnv(envArgs, nil)

@@ -106,7 +106,7 @@ func RunExport(f *clientcmd.Factory, exporter Exporter, in io.Reader, out io.Wri

 	mapper, typer := f.Object(false)

 	b := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), kapi.Codecs.UniversalDecoder()).

 		NamespaceParam(cmdNamespace).DefaultNamespace().AllNamespaces(allNamespaces).

-		FilenameParam(explicit, filenames...).

+		FilenameParam(explicit, false, filenames...).

 		SelectorParam(selector).

 		ResourceTypeOrNameArgs(true, args...).

 		Flatten()

@@ -82,7 +82,7 @@ func validate(cmd *cobra.Command, f *clientcmd.Factory, args []string) error {

 	r := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), kapi.Codecs.UniversalDecoder()).

 		ContinueOnError().

 		NamespaceParam(namespace).DefaultNamespace().

-		FilenameParam(enforceNamespace, kcmdutil.GetFlagStringSlice(cmd, "filename")...).

+		FilenameParam(enforceNamespace, false, kcmdutil.GetFlagStringSlice(cmd, "filename")...).

 		ResourceTypeOrNameArgs(false, args...).

 		Flatten().

 		Do()

@@ -161,7 +161,7 @@ func RunProcess(f *clientcmd.Factory, out io.Writer, cmd *cobra.Command, args []

 	} else {

 		infos, err = resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), kapi.Codecs.UniversalDecoder()).

 			NamespaceParam(namespace).RequireNamespace().

-			FilenameParam(explicit, filename).

+			FilenameParam(explicit, false, filename).

 			Do().

 			Infos()

 		if err != nil {

@@ -143,7 +143,7 @@ func RunEnv(f *clientcmd.Factory, in io.Reader, out io.Writer, cmd *cobra.Comman

 	b := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), kapi.Codecs.UniversalDecoder()).

 		ContinueOnError().

 		NamespaceParam(cmdNamespace).DefaultNamespace().

-		FilenameParam(explicit, filenames...).

+		FilenameParam(explicit, false, filenames...).

 		SelectorParam(selector).

 		ResourceTypeOrNameArgs(all, resources...).

 		Flatten()

@@ -174,7 +174,7 @@ func (o *ProbeOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, args [

 	o.Builder = resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), kapi.Codecs.UniversalDecoder()).

 		ContinueOnError().

 		NamespaceParam(cmdNamespace).DefaultNamespace().

-		FilenameParam(explicit, o.Filenames...).

+		FilenameParam(explicit, false, o.Filenames...).

 		SelectorParam(o.Selector).

 		ResourceTypeOrNameArgs(o.All, resources...).

 		Flatten()

@@ -185,7 +185,7 @@ func (o *TriggersOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, arg

 	o.Builder = resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), kapi.Codecs.UniversalDecoder()).

 		ContinueOnError().

 		NamespaceParam(cmdNamespace).DefaultNamespace().

-		FilenameParam(explicit, o.Filenames...).

+		FilenameParam(explicit, false, o.Filenames...).

 		SelectorParam(o.Selector).

 		ResourceTypeOrNameArgs(o.All, args...).

 		Flatten()

@@ -360,7 +360,7 @@ func (v *VolumeOptions) RunVolume(args []string) error {

 	b := resource.NewBuilder(v.Mapper, v.Typer, mapper, kapi.Codecs.UniversalDecoder()).

 		ContinueOnError().

 		NamespaceParam(v.DefaultNamespace).DefaultNamespace().

-		FilenameParam(v.ExplicitNamespace, v.Filenames...).

+		FilenameParam(v.ExplicitNamespace, false, v.Filenames...).

 		SelectorParam(v.Selector).

 		ResourceTypeOrNameArgs(v.All, args...).

 		Flatten()

@@ -135,7 +135,7 @@ func OverwriteBootstrapPolicy(storage storage.Interface, policyFile, createBoots

 	})

 	r := resource.NewBuilder(mapper, typer, clientMapper, kapi.Codecs.UniversalDecoder()).

-		FilenameParam(false, policyFile).

+		FilenameParam(false, false, policyFile).

 		Flatten().

 		Do()

@@ -268,9 +268,9 @@ func BuildKubernetesMasterConfig(options configapi.MasterConfig, requestContextM

 			RequestContextMapper: requestContextMapper,

-			APIGroupVersionOverrides: getAPIGroupVersionOverrides(options),

-			APIPrefix:                server.APIPrefix,

-			APIGroupPrefix:           server.APIGroupPrefix,

+			APIResourceConfigSource: getAPIResourceConfig(options),

+			APIPrefix:               server.APIPrefix,

+			APIGroupPrefix:          server.APIGroupPrefix,

 			MasterCount: server.MasterCount,

@@ -337,21 +337,25 @@ func BuildKubernetesMasterConfig(options configapi.MasterConfig, requestContextM

 	return kmaster, nil

 }

-// getAPIGroupVersionOverrides builds the overrides in the format expected by master.Config.APIGroupVersionOverrides

-func getAPIGroupVersionOverrides(options configapi.MasterConfig) map[string]genericapiserver.APIGroupVersionOverride {

-	apiGroupVersionOverrides := map[string]genericapiserver.APIGroupVersionOverride{}

+// getAPIResourceConfig builds the config for enabling resources

+func getAPIResourceConfig(options configapi.MasterConfig) genericapiserver.APIResourceConfigSource {

+	resourceConfig := genericapiserver.NewResourceConfig()

+

+	for group := range configapi.KnownKubeAPIGroups {

+		for _, version := range configapi.GetEnabledAPIVersionsForGroup(*options.KubernetesMasterConfig, group) {

+			gv := unversioned.GroupVersion{Group: group, Version: version}

+			resourceConfig.EnableVersions(gv)

+		}

+	}

+

 	for group := range options.KubernetesMasterConfig.DisabledAPIGroupVersions {

 		for _, version := range configapi.GetDisabledAPIVersionsForGroup(*options.KubernetesMasterConfig, group) {

 			gv := unversioned.GroupVersion{Group: group, Version: version}

-			if group == "" {

-				// TODO: when rebasing, check the parseRuntimeConfig impl to make sure we're still building the right magic container

-				// Create "disabled" key for v1 identically to k8s.io/kubernetes/cmd/kube-apiserver/app/server.go#parseRuntimeConfig

-				gv.Group = "api"

-			}

-			apiGroupVersionOverrides[gv.String()] = genericapiserver.APIGroupVersionOverride{Disable: true}

+			resourceConfig.DisableVersions(gv)

 		}

 	}

-	return apiGroupVersionOverrides

+

+	return resourceConfig

 }

 // NewEtcdStorage returns a storage interface for the provided storage version.

@@ -134,36 +134,51 @@ func TestCMServerDefaults(t *testing.T) {

 func TestGetAPIGroupVersionOverrides(t *testing.T) {

 	testcases := map[string]struct {

-		DisabledVersions  map[string][]string

-		ExpectedOverrides map[string]genericapiserver.APIGroupVersionOverride

+		DisabledVersions         map[string][]string

+		ExpectedDisabledVersions []unversioned.GroupVersion

+		ExpectedEnabledVersions  []unversioned.GroupVersion

 	}{

 		"empty": {

-			DisabledVersions:  nil,

-			ExpectedOverrides: map[string]genericapiserver.APIGroupVersionOverride{},

+			DisabledVersions:         nil,

+			ExpectedDisabledVersions: []unversioned.GroupVersion{},

+			ExpectedEnabledVersions:  []unversioned.GroupVersion{apiv1.SchemeGroupVersion, extensionsapiv1beta1.SchemeGroupVersion},

 		},

 		"* -> v1": {

-			DisabledVersions:  map[string][]string{"": {"*"}},

-			ExpectedOverrides: map[string]genericapiserver.APIGroupVersionOverride{"api/v1": {Disable: true}},

+			DisabledVersions:         map[string][]string{"": {"*"}},

+			ExpectedDisabledVersions: []unversioned.GroupVersion{apiv1.SchemeGroupVersion},

+			ExpectedEnabledVersions:  []unversioned.GroupVersion{extensionsapiv1beta1.SchemeGroupVersion},

 		},

 		"v1": {

-			DisabledVersions:  map[string][]string{"": {"v1"}},

-			ExpectedOverrides: map[string]genericapiserver.APIGroupVersionOverride{"api/v1": {Disable: true}},

+			DisabledVersions:         map[string][]string{"": {"v1"}},

+			ExpectedDisabledVersions: []unversioned.GroupVersion{apiv1.SchemeGroupVersion},

+			ExpectedEnabledVersions:  []unversioned.GroupVersion{extensionsapiv1beta1.SchemeGroupVersion},

 		},

 		"* -> v1beta1": {

-			DisabledVersions:  map[string][]string{"extensions": {"*"}},

-			ExpectedOverrides: map[string]genericapiserver.APIGroupVersionOverride{"extensions/v1beta1": {Disable: true}},

+			DisabledVersions:         map[string][]string{"extensions": {"*"}},

+			ExpectedDisabledVersions: []unversioned.GroupVersion{extensionsapiv1beta1.SchemeGroupVersion},

+			ExpectedEnabledVersions:  []unversioned.GroupVersion{apiv1.SchemeGroupVersion},

 		},

 		"extensions/v1beta1": {

-			DisabledVersions:  map[string][]string{"extensions": {"v1beta1"}},

-			ExpectedOverrides: map[string]genericapiserver.APIGroupVersionOverride{"extensions/v1beta1": {Disable: true}},

+			DisabledVersions:         map[string][]string{"extensions": {"v1beta1"}},

+			ExpectedDisabledVersions: []unversioned.GroupVersion{extensionsapiv1beta1.SchemeGroupVersion},

+			ExpectedEnabledVersions:  []unversioned.GroupVersion{apiv1.SchemeGroupVersion},

 		},

 	}

 	for k, tc := range testcases {

 		config := configapi.MasterConfig{KubernetesMasterConfig: &configapi.KubernetesMasterConfig{DisabledAPIGroupVersions: tc.DisabledVersions}}

-		overrides := getAPIGroupVersionOverrides(config)

-		if !reflect.DeepEqual(overrides, tc.ExpectedOverrides) {

-			t.Errorf("%s: Expected\n%#v\ngot\n%#v", k, tc.ExpectedOverrides, overrides)

+		overrides := getAPIResourceConfig(config)

+

+		for _, expected := range tc.ExpectedDisabledVersions {

+			if overrides.AnyResourcesForVersionEnabled(expected) {

+				t.Errorf("%s: Expected %v", k, expected)

+			}

+		}

+

+		for _, expected := range tc.ExpectedEnabledVersions {

+			if !overrides.AllResourcesForVersionEnabled(expected) {

+				t.Errorf("%s: Expected %v", k, expected)

+			}

 		}

 	}

 }

@@ -108,7 +108,7 @@ func (r *TemplateFileSearcher) Search(precise bool, terms ...string) (ComponentM

 		var isSingular bool

 		obj, err := resource.NewBuilder(r.Mapper, r.Typer, r.ClientMapper, kapi.Codecs.UniversalDecoder()).

 			NamespaceParam(r.Namespace).RequireNamespace().

-			FilenameParam(false, term).

+			FilenameParam(false, false, term).

 			Do().

 			IntoSingular(&isSingular).

 			Object()