* Make Codec separate from Scheme * Move EncodeOrDie off Scheme to take a Codec * Make Copy work without a Codec * Create a "latest" package that imports all versions and sets global defaults for "most recent encoding" * v1beta1 is the current "latest", v1beta2 exists * Kill DefaultCodec, replace it with "latest.Codec" * This updates the client and etcd to store the latest known version * EmbeddedObject is per schema and per package now * Move runtime.DefaultScheme to api.Scheme * Split out WatchEvent since it's not an API object today, treat it like a special object in api * Kill DefaultResourceVersioner, instead place it on "latest" (as the package that understands all packages) * Move objDiff to runtime.ObjectDiff
113 lines
3.1 KiB
Go
113 lines
3.1 KiB
Go
/*
|
|
Copyright 2014 Google Inc. All rights reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package v1beta1
|
|
|
|
import (
|
|
newer "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
|
|
)
|
|
|
|
func init() {
|
|
newer.Scheme.AddConversionFuncs(
|
|
// EnvVar's Key is deprecated in favor of Name.
|
|
func(in *newer.EnvVar, out *EnvVar, s conversion.Scope) error {
|
|
out.Value = in.Value
|
|
out.Key = in.Name
|
|
out.Name = in.Name
|
|
return nil
|
|
},
|
|
func(in *EnvVar, out *newer.EnvVar, s conversion.Scope) error {
|
|
out.Value = in.Value
|
|
if in.Name != "" {
|
|
out.Name = in.Name
|
|
} else {
|
|
out.Name = in.Key
|
|
}
|
|
return nil
|
|
},
|
|
|
|
// Path & MountType are deprecated.
|
|
func(in *newer.VolumeMount, out *VolumeMount, s conversion.Scope) error {
|
|
out.Name = in.Name
|
|
out.ReadOnly = in.ReadOnly
|
|
out.MountPath = in.MountPath
|
|
out.Path = in.MountPath
|
|
out.MountType = "" // MountType is ignored.
|
|
return nil
|
|
},
|
|
func(in *VolumeMount, out *newer.VolumeMount, s conversion.Scope) error {
|
|
out.Name = in.Name
|
|
out.ReadOnly = in.ReadOnly
|
|
if in.MountPath == "" {
|
|
out.MountPath = in.Path
|
|
} else {
|
|
out.MountPath = in.MountPath
|
|
}
|
|
return nil
|
|
},
|
|
|
|
// MinionList.Items had a wrong name in v1beta1
|
|
func(in *newer.MinionList, out *MinionList, s conversion.Scope) error {
|
|
s.Convert(&in.JSONBase, &out.JSONBase, 0)
|
|
s.Convert(&in.Items, &out.Items, 0)
|
|
out.Minions = out.Items
|
|
return nil
|
|
},
|
|
func(in *MinionList, out *newer.MinionList, s conversion.Scope) error {
|
|
s.Convert(&in.JSONBase, &out.JSONBase, 0)
|
|
if len(in.Items) == 0 {
|
|
s.Convert(&in.Minions, &out.Items, 0)
|
|
} else {
|
|
s.Convert(&in.Items, &out.Items, 0)
|
|
}
|
|
return nil
|
|
},
|
|
)
|
|
|
|
}
|
|
|
|
// EmbeddedObject implements a Codec specific version of an
|
|
// embedded object.
|
|
type EmbeddedObject struct {
|
|
runtime.Object
|
|
}
|
|
|
|
// UnmarshalJSON implements the json.Unmarshaler interface.
|
|
func (a *EmbeddedObject) UnmarshalJSON(b []byte) error {
|
|
obj, err := runtime.CodecUnmarshalJSON(Codec, b)
|
|
a.Object = obj
|
|
return err
|
|
}
|
|
|
|
// MarshalJSON implements the json.Marshaler interface.
|
|
func (a EmbeddedObject) MarshalJSON() ([]byte, error) {
|
|
return runtime.CodecMarshalJSON(Codec, a.Object)
|
|
}
|
|
|
|
// SetYAML implements the yaml.Setter interface.
|
|
func (a *EmbeddedObject) SetYAML(tag string, value interface{}) bool {
|
|
obj, ok := runtime.CodecSetYAML(Codec, tag, value)
|
|
a.Object = obj
|
|
return ok
|
|
}
|
|
|
|
// GetYAML implements the yaml.Getter interface.
|
|
func (a EmbeddedObject) GetYAML() (tag string, value interface{}) {
|
|
return runtime.CodecGetYAML(Codec, a.Object)
|
|
}
|