diff --git a/pkg/master/master.go b/pkg/master/master.go index a6c4b323661..5e53a1b4eae 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -255,9 +255,6 @@ func (m *Master) InstallAPIs(c *Config) { m.MuxHelper.HandleFunc("/metrics", defaultMetricsHandler) } - // allGroups records all supported groups at /apis - allGroups := []unversioned.APIGroup{} - // Install extensions unless disabled. if c.APIResourceConfigSource.AnyResourcesForVersionEnabled(extensionsapiv1beta1.SchemeGroupVersion) { var err error @@ -281,17 +278,6 @@ func (m *Master) InstallAPIs(c *Config) { NegotiatedSerializer: api.Codecs, } apiGroupsInfo = append(apiGroupsInfo, apiGroupInfo) - - extensionsGVForDiscovery := unversioned.GroupVersionForDiscovery{ - GroupVersion: extensionsGroupMeta.GroupVersion.String(), - Version: extensionsGroupMeta.GroupVersion.Version, - } - group := unversioned.APIGroup{ - Name: extensionsGroupMeta.GroupVersion.Group, - Versions: []unversioned.GroupVersionForDiscovery{extensionsGVForDiscovery}, - PreferredVersion: extensionsGVForDiscovery, - } - allGroups = append(allGroups, group) } // Install autoscaling unless disabled. @@ -313,17 +299,6 @@ func (m *Master) InstallAPIs(c *Config) { NegotiatedSerializer: api.Codecs, } apiGroupsInfo = append(apiGroupsInfo, apiGroupInfo) - - autoscalingGVForDiscovery := unversioned.GroupVersionForDiscovery{ - GroupVersion: autoscalingGroupMeta.GroupVersion.String(), - Version: autoscalingGroupMeta.GroupVersion.Version, - } - group := unversioned.APIGroup{ - Name: autoscalingGroupMeta.GroupVersion.Group, - Versions: []unversioned.GroupVersionForDiscovery{autoscalingGVForDiscovery}, - PreferredVersion: autoscalingGVForDiscovery, - } - allGroups = append(allGroups, group) } // Install batch unless disabled. @@ -349,19 +324,7 @@ func (m *Master) InstallAPIs(c *Config) { batchv2alpha1Resources := m.getBatchResources(c, batchapiv2alpha1.SchemeGroupVersion) apiGroupInfo.VersionedResourcesStorageMap["v2alpha1"] = batchv2alpha1Resources } - apiGroupsInfo = append(apiGroupsInfo, apiGroupInfo) - - batchGVForDiscovery := unversioned.GroupVersionForDiscovery{ - GroupVersion: batchGroupMeta.GroupVersion.String(), - Version: batchGroupMeta.GroupVersion.Version, - } - group := unversioned.APIGroup{ - Name: batchGroupMeta.GroupVersion.Group, - Versions: []unversioned.GroupVersionForDiscovery{batchGVForDiscovery}, - PreferredVersion: batchGVForDiscovery, - } - allGroups = append(allGroups, group) } if c.APIResourceConfigSource.AnyResourcesForVersionEnabled(policyapiv1alpha1.SchemeGroupVersion) { @@ -382,18 +345,6 @@ func (m *Master) InstallAPIs(c *Config) { NegotiatedSerializer: api.Codecs, } apiGroupsInfo = append(apiGroupsInfo, apiGroupInfo) - - policyGVForDiscovery := unversioned.GroupVersionForDiscovery{ - GroupVersion: policyGroupMeta.GroupVersion.String(), - Version: policyGroupMeta.GroupVersion.Version, - } - group := unversioned.APIGroup{ - Name: policyGroupMeta.GroupVersion.Group, - Versions: []unversioned.GroupVersionForDiscovery{policyGVForDiscovery}, - PreferredVersion: policyGVForDiscovery, - } - allGroups = append(allGroups, group) - } if c.APIResourceConfigSource.AnyResourcesForVersionEnabled(appsapi.SchemeGroupVersion) { @@ -414,18 +365,6 @@ func (m *Master) InstallAPIs(c *Config) { NegotiatedSerializer: api.Codecs, } apiGroupsInfo = append(apiGroupsInfo, apiGroupInfo) - - appsGVForDiscovery := unversioned.GroupVersionForDiscovery{ - GroupVersion: appsGroupMeta.GroupVersion.String(), - Version: appsGroupMeta.GroupVersion.Version, - } - group := unversioned.APIGroup{ - Name: appsGroupMeta.GroupVersion.Group, - Versions: []unversioned.GroupVersionForDiscovery{appsGVForDiscovery}, - PreferredVersion: appsGVForDiscovery, - } - allGroups = append(allGroups, group) - } if c.APIResourceConfigSource.AnyResourcesForVersionEnabled(rbacapi.SchemeGroupVersion) { @@ -446,18 +385,6 @@ func (m *Master) InstallAPIs(c *Config) { NegotiatedSerializer: api.Codecs, } apiGroupsInfo = append(apiGroupsInfo, apiGroupInfo) - - rbacGVForDiscovery := unversioned.GroupVersionForDiscovery{ - GroupVersion: rbacGroupMeta.GroupVersion.String(), - Version: rbacGroupMeta.GroupVersion.Version, - } - group := unversioned.APIGroup{ - Name: rbacGroupMeta.GroupVersion.Group, - Versions: []unversioned.GroupVersionForDiscovery{rbacGVForDiscovery}, - PreferredVersion: rbacGVForDiscovery, - } - allGroups = append(allGroups, group) - } if err := m.InstallAPIGroups(apiGroupsInfo); err != nil {