refactoring latest.go GroupVersion;
clean up latest.go GroupVersions; remove latest.GroupMeta.Group; remove latest.GroupMeta.Version.
This commit is contained in:
@@ -140,11 +140,8 @@ func setExtensionsDefaults(config *Config) error {
|
||||
}
|
||||
// TODO: Unconditionally set the config.Version, until we fix the config.
|
||||
//if config.Version == "" {
|
||||
gv, err := unversioned.ParseGroupVersion(g.GroupVersion)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
config.GroupVersion = &gv
|
||||
copyGroupVersion := g.GroupVersion
|
||||
config.GroupVersion = ©GroupVersion
|
||||
//}
|
||||
|
||||
versionInterfaces, err := g.InterfacesFor(config.GroupVersion.String())
|
||||
|
@@ -544,11 +544,8 @@ func defaultVersionFor(config *Config) *unversioned.GroupVersion {
|
||||
// Clients default to the preferred code API version
|
||||
// TODO: implement version negotiation (highest version supported by server)
|
||||
// TODO this drops out when groupmeta is refactored
|
||||
gv, err := unversioned.ParseGroupVersion(latest.GroupOrDie("").GroupVersion)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return &gv
|
||||
copyGroupVersion := latest.GroupOrDie("").GroupVersion
|
||||
return ©GroupVersion
|
||||
}
|
||||
|
||||
return config.GroupVersion
|
||||
|
@@ -90,7 +90,7 @@ func (c *jobs) Delete(name string, options *api.DeleteOptions) (err error) {
|
||||
return c.r.Delete().Namespace(c.ns).Resource("jobs").Name(name).Do().Error()
|
||||
}
|
||||
|
||||
body, err := api.Scheme.EncodeToVersion(options, latest.GroupOrDie("").GroupVersion)
|
||||
body, err := api.Scheme.EncodeToVersion(options, latest.GroupOrDie("").GroupVersion.String())
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
Reference in New Issue
Block a user