github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32399 from deads2k/api-04-check-enable

Browse Source 
Automatic merge from submit-queue

filter enabled versions by enablement

fixes https://github.com/kubernetes/kubernetes/issues/32224

@krousey ptal
This commit is contained in:
Kubernetes Submit Queue
2016-09-12 02:39:51 -07:00
committed by GitHub
parent a062d9fe3b 242ed50474
commit 6f875bb97e
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/apimachinery/registered/registered.go
View File

@@ -173,7 +173,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 +189,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