Commit c9ad3e20 authored by Chao Xu's avatar Chao Xu

_experimental_ -> _extenstions_

parent f3caff2a
...@@ -31,12 +31,12 @@ func addConversionFuncs() { ...@@ -31,12 +31,12 @@ func addConversionFuncs() {
err := api.Scheme.AddConversionFuncs( err := api.Scheme.AddConversionFuncs(
convert_api_PodSpec_To_v1_PodSpec, convert_api_PodSpec_To_v1_PodSpec,
convert_v1_PodSpec_To_api_PodSpec, convert_v1_PodSpec_To_api_PodSpec,
convert_experimental_DeploymentSpec_To_v1beta1_DeploymentSpec, convert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec,
convert_v1beta1_DeploymentSpec_To_experimental_DeploymentSpec, convert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec,
convert_experimental_DeploymentStrategy_To_v1beta1_DeploymentStrategy, convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy,
convert_v1beta1_DeploymentStrategy_To_experimental_DeploymentStrategy, convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy,
convert_experimental_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment, convert_extensions_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment,
convert_v1beta1_RollingUpdateDeployment_To_experimental_RollingUpdateDeployment, convert_v1beta1_RollingUpdateDeployment_To_extensions_RollingUpdateDeployment,
) )
if err != nil { if err != nil {
// If one of the conversion functions is malformed, detect it immediately. // If one of the conversion functions is malformed, detect it immediately.
...@@ -199,7 +199,7 @@ func convert_v1_PodSpec_To_api_PodSpec(in *v1.PodSpec, out *api.PodSpec, s conve ...@@ -199,7 +199,7 @@ func convert_v1_PodSpec_To_api_PodSpec(in *v1.PodSpec, out *api.PodSpec, s conve
return nil return nil
} }
func convert_experimental_DeploymentSpec_To_v1beta1_DeploymentSpec(in *experimental.DeploymentSpec, out *DeploymentSpec, s conversion.Scope) error { func convert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec(in *experimental.DeploymentSpec, out *DeploymentSpec, s conversion.Scope) error {
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
defaulting.(func(*experimental.DeploymentSpec))(in) defaulting.(func(*experimental.DeploymentSpec))(in)
} }
...@@ -221,7 +221,7 @@ func convert_experimental_DeploymentSpec_To_v1beta1_DeploymentSpec(in *experimen ...@@ -221,7 +221,7 @@ func convert_experimental_DeploymentSpec_To_v1beta1_DeploymentSpec(in *experimen
} else { } else {
out.Template = nil out.Template = nil
} }
if err := convert_experimental_DeploymentStrategy_To_v1beta1_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { if err := convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
return err return err
} }
out.UniqueLabelKey = new(string) out.UniqueLabelKey = new(string)
...@@ -229,7 +229,7 @@ func convert_experimental_DeploymentSpec_To_v1beta1_DeploymentSpec(in *experimen ...@@ -229,7 +229,7 @@ func convert_experimental_DeploymentSpec_To_v1beta1_DeploymentSpec(in *experimen
return nil return nil
} }
func convert_v1beta1_DeploymentSpec_To_experimental_DeploymentSpec(in *DeploymentSpec, out *experimental.DeploymentSpec, s conversion.Scope) error { func convert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec(in *DeploymentSpec, out *experimental.DeploymentSpec, s conversion.Scope) error {
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
defaulting.(func(*DeploymentSpec))(in) defaulting.(func(*DeploymentSpec))(in)
} }
...@@ -252,7 +252,7 @@ func convert_v1beta1_DeploymentSpec_To_experimental_DeploymentSpec(in *Deploymen ...@@ -252,7 +252,7 @@ func convert_v1beta1_DeploymentSpec_To_experimental_DeploymentSpec(in *Deploymen
} else { } else {
out.Template = nil out.Template = nil
} }
if err := convert_v1beta1_DeploymentStrategy_To_experimental_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { if err := convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
return err return err
} }
if in.UniqueLabelKey != nil { if in.UniqueLabelKey != nil {
...@@ -261,14 +261,14 @@ func convert_v1beta1_DeploymentSpec_To_experimental_DeploymentSpec(in *Deploymen ...@@ -261,14 +261,14 @@ func convert_v1beta1_DeploymentSpec_To_experimental_DeploymentSpec(in *Deploymen
return nil return nil
} }
func convert_experimental_DeploymentStrategy_To_v1beta1_DeploymentStrategy(in *experimental.DeploymentStrategy, out *DeploymentStrategy, s conversion.Scope) error { func convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy(in *experimental.DeploymentStrategy, out *DeploymentStrategy, s conversion.Scope) error {
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
defaulting.(func(*experimental.DeploymentStrategy))(in) defaulting.(func(*experimental.DeploymentStrategy))(in)
} }
out.Type = DeploymentStrategyType(in.Type) out.Type = DeploymentStrategyType(in.Type)
if in.RollingUpdate != nil { if in.RollingUpdate != nil {
out.RollingUpdate = new(RollingUpdateDeployment) out.RollingUpdate = new(RollingUpdateDeployment)
if err := convert_experimental_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment(in.RollingUpdate, out.RollingUpdate, s); err != nil { if err := convert_extensions_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment(in.RollingUpdate, out.RollingUpdate, s); err != nil {
return err return err
} }
} else { } else {
...@@ -277,14 +277,14 @@ func convert_experimental_DeploymentStrategy_To_v1beta1_DeploymentStrategy(in *e ...@@ -277,14 +277,14 @@ func convert_experimental_DeploymentStrategy_To_v1beta1_DeploymentStrategy(in *e
return nil return nil
} }
func convert_v1beta1_DeploymentStrategy_To_experimental_DeploymentStrategy(in *DeploymentStrategy, out *experimental.DeploymentStrategy, s conversion.Scope) error { func convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy(in *DeploymentStrategy, out *experimental.DeploymentStrategy, s conversion.Scope) error {
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
defaulting.(func(*DeploymentStrategy))(in) defaulting.(func(*DeploymentStrategy))(in)
} }
out.Type = experimental.DeploymentStrategyType(in.Type) out.Type = experimental.DeploymentStrategyType(in.Type)
if in.RollingUpdate != nil { if in.RollingUpdate != nil {
out.RollingUpdate = new(experimental.RollingUpdateDeployment) out.RollingUpdate = new(experimental.RollingUpdateDeployment)
if err := convert_v1beta1_RollingUpdateDeployment_To_experimental_RollingUpdateDeployment(in.RollingUpdate, out.RollingUpdate, s); err != nil { if err := convert_v1beta1_RollingUpdateDeployment_To_extensions_RollingUpdateDeployment(in.RollingUpdate, out.RollingUpdate, s); err != nil {
return err return err
} }
} else { } else {
...@@ -293,7 +293,7 @@ func convert_v1beta1_DeploymentStrategy_To_experimental_DeploymentStrategy(in *D ...@@ -293,7 +293,7 @@ func convert_v1beta1_DeploymentStrategy_To_experimental_DeploymentStrategy(in *D
return nil return nil
} }
func convert_experimental_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment(in *experimental.RollingUpdateDeployment, out *RollingUpdateDeployment, s conversion.Scope) error { func convert_extensions_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment(in *experimental.RollingUpdateDeployment, out *RollingUpdateDeployment, s conversion.Scope) error {
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
defaulting.(func(*experimental.RollingUpdateDeployment))(in) defaulting.(func(*experimental.RollingUpdateDeployment))(in)
} }
...@@ -313,7 +313,7 @@ func convert_experimental_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeploy ...@@ -313,7 +313,7 @@ func convert_experimental_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeploy
return nil return nil
} }
func convert_v1beta1_RollingUpdateDeployment_To_experimental_RollingUpdateDeployment(in *RollingUpdateDeployment, out *experimental.RollingUpdateDeployment, s conversion.Scope) error { func convert_v1beta1_RollingUpdateDeployment_To_extensions_RollingUpdateDeployment(in *RollingUpdateDeployment, out *experimental.RollingUpdateDeployment, s conversion.Scope) error {
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
defaulting.(func(*RollingUpdateDeployment))(in) defaulting.(func(*RollingUpdateDeployment))(in)
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment