filter enabled versions by enablement

This commit is contained in:
deads2k
2016-09-09 13:51:21 -04:00
parent f535aea7fd
commit 242ed50474

View File

@@ -173,7 +173,11 @@ func (m *APIRegistrationManager) IsEnabledVersion(v unversioned.GroupVersion) bo
func (m *APIRegistrationManager) EnabledVersions() []unversioned.GroupVersion { func (m *APIRegistrationManager) EnabledVersions() []unversioned.GroupVersion {
ret := []unversioned.GroupVersion{} ret := []unversioned.GroupVersion{}
for _, groupMeta := range m.groupMetaMap { 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 return ret
} }
@@ -185,7 +189,13 @@ func (m *APIRegistrationManager) EnabledVersionsForGroup(group string) []unversi
return []unversioned.GroupVersion{} 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 // Group returns the metadata of a group if the group is registered, otherwise