cleanup package registered and install
#18925
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,10 +25,10 @@ import ( | |
|
|
||
| "k8s.io/kubernetes/pkg/api" | ||
| "k8s.io/kubernetes/pkg/api/latest" | ||
| "k8s.io/kubernetes/pkg/api/registered" | ||
| "k8s.io/kubernetes/pkg/util/sets" | ||
|
|
||
| "k8s.io/kubernetes/pkg/api/meta" | ||
| "k8s.io/kubernetes/pkg/api/unversioned" | ||
| "k8s.io/kubernetes/pkg/api/v1" | ||
| "k8s.io/kubernetes/pkg/runtime" | ||
|
|
@@ -42,20 +42,32 @@ var accessor = meta.NewAccessor() | |
| var availableVersions = []unversioned.GroupVersion{v1.SchemeGroupVersion} | ||
|
|
||
| func init() { | ||
| registered.RegisterVersions(availableVersions...) | ||
|
|
||
| externalVersions := []unversioned.GroupVersion{} | ||
| for _, v := range availableVersions { | ||
| if registered.IsAllowedVersion(v) { | ||
| externalVersions = append(externalVersions, v) | ||
| } | ||
| } | ||
| if len(externalVersions) == 0 { | ||
| glog.V(4).Infof("No version is registered for group %v", api.GroupName) | ||
| return | ||
| } | ||
| if err := registered.EnableVersions(externalVersions...); err != nil { | ||
|
There was a problem hiding this comment. @nikhiljindal, per our offline discussion, the order is still marking those versions as enabled first, and then actually enable the versions, because we want to check we only add the enabled versions to scheme. |
||
| glog.V(4).Infof("%v", err) | ||
| return | ||
| } | ||
| if err := enableVersions(externalVersions); err != nil { | ||
| glog.V(4).Infof("%v", err) | ||
| return | ||
| } | ||
| } | ||
|
|
||
| // TODO: enableVersions should be centralized rather than spread in each API | ||
| // group. | ||
| func enableVersions(externalVersions []unversioned.GroupVersion) error { | ||
| addVersionsToScheme(externalVersions...) | ||
| preferredExternalVersion := externalVersions[0] | ||
|
|
||
| groupMeta := latest.GroupMeta{ | ||
|
|
@@ -68,11 +80,10 @@ func init() { | |
| } | ||
|
|
||
| if err := latest.RegisterGroup(groupMeta); err != nil { | ||
| return err | ||
| } | ||
| api.RegisterRESTMapper(groupMeta.RESTMapper) | ||
| return nil | ||
| } | ||
|
|
||
| // userResources is a group of resources mostly used by a kubectl user | ||
|
|
@@ -128,3 +139,19 @@ func interfacesFor(version unversioned.GroupVersion) (*meta.VersionInterfaces, e | |
| return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, g.GroupVersions) | ||
| } | ||
| } | ||
|
|
||
| func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) { | ||
| // add the internal version to Scheme | ||
| api.AddToScheme(api.Scheme) | ||
| // add the enabled external versions to Scheme | ||
| for _, v := range externalVersions { | ||
| if !registered.IsEnabledVersion(v) { | ||
| glog.Errorf("Version %s is not enabled, so it will not be added to the Scheme.", v) | ||
| continue | ||
| } | ||
| switch v { | ||
| case v1.SchemeGroupVersion: | ||
| v1.AddToScheme(api.Scheme) | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This addition is caused by the apiserver's dependency on the client, so it will install all the versions listed in
pkg/client/unversioned/import_known_versions.sh.I'm not sure why the
metricsgroup isn't there before. Having it in the list looks correct anyway.