Update godeps

vendor/k8s.io/kubernetes/pkg/apimachinery/registered/registered.go

@@ -35,7 +35,14 @@ var (
 	DefaultAPIRegistrationManager = NewOrDie(os.Getenv("KUBE_API_VERSIONS"))
 )
 
-// APIRegistrationManager
+// APIRegistrationManager provides the concept of what API groups are enabled.
+//
+// TODO: currently, it also provides a "registered" concept. But it's wrong to
+// have both concepts in the same object. Therefore the "announced" package is
+// going to take over the registered concept. After all the install packages
+// are switched to using the announce package instead of this package, then we
+// can combine the registered/enabled concepts in this object. Simplifying this
+// isn't easy right now because there are so many callers of this package.
 type APIRegistrationManager struct {
 	// registeredGroupVersions stores all API group versions for which RegisterGroup is called.
 	registeredVersions map[unversioned.GroupVersion]struct{}
@@ -111,6 +118,7 @@ var (
 	EnableVersions                = DefaultAPIRegistrationManager.EnableVersions
 	RegisterGroup                 = DefaultAPIRegistrationManager.RegisterGroup
 	RegisterVersions              = DefaultAPIRegistrationManager.RegisterVersions
+	InterfacesFor                 = DefaultAPIRegistrationManager.InterfacesFor
 )
 
 // RegisterVersions adds the given group versions to the list of registered group versions.
@@ -173,7 +181,11 @@ func (m *APIRegistrationManager) IsEnabledVersion(v unversioned.GroupVersion) bo
 func (m *APIRegistrationManager) EnabledVersions() []unversioned.GroupVersion {
 	ret := []unversioned.GroupVersion{}
 	for _, groupMeta := range m.groupMetaMap {
-		ret = append(ret, groupMeta.GroupVersions...)
+		for _, version := range groupMeta.GroupVersions {
+			if m.IsEnabledVersion(version) {
+				ret = append(ret, version)
+			}
+		}
 	}
 	return ret
 }
@@ -185,7 +197,13 @@ func (m *APIRegistrationManager) EnabledVersionsForGroup(group string) []unversi
 		return []unversioned.GroupVersion{}
 	}
 
-	return append([]unversioned.GroupVersion{}, groupMeta.GroupVersions...)
+	ret := []unversioned.GroupVersion{}
+	for _, version := range groupMeta.GroupVersions {
+		if m.IsEnabledVersion(version) {
+			ret = append(ret, version)
+		}
+	}
+	return ret
 }
 
 // Group returns the metadata of a group if the group is registered, otherwise
@@ -255,6 +273,15 @@ func (m *APIRegistrationManager) AddThirdPartyAPIGroupVersions(gvs ...unversione
 	return skippedGVs
 }
 
+// InterfacesFor is a union meta.VersionInterfacesFunc func for all registered types
+func (m *APIRegistrationManager) InterfacesFor(version unversioned.GroupVersion) (*meta.VersionInterfaces, error) {
+	groupMeta, err := m.Group(version.Group)
+	if err != nil {
+		return nil, err
+	}
+	return groupMeta.InterfacesFor(version)
+}
+
 // TODO: This is an expedient function, because we don't check if a Group is
 // supported throughout the code base. We will abandon this function and
 // checking the error returned by the Group() function.