diff --git a/api/swagger-spec/oapi-v1.json b/api/swagger-spec/oapi-v1.json index 4b24fde0a760..e2b03c7ed0ef 100644 --- a/api/swagger-spec/oapi-v1.json +++ b/api/swagger-spec/oapi-v1.json @@ -16076,7 +16076,7 @@ }, "from": { "$ref": "v1.ObjectReference", - "description": "a reference to an ImageRepository, ImageStream, or ImageStreamTag to watch for changes" + "description": "a reference to an ImageStreamTag to watch for changes" }, "lastTriggeredImage": { "type": "string", diff --git a/pkg/api/deep_copy_generated.go b/pkg/api/deep_copy_generated.go index e069ab18b083..18d212d77ea8 100644 --- a/pkg/api/deep_copy_generated.go +++ b/pkg/api/deep_copy_generated.go @@ -1324,8 +1324,11 @@ func deepCopy_api_DeploymentCause(in deployapi.DeploymentCause, out *deployapi.D } func deepCopy_api_DeploymentCauseImageTrigger(in deployapi.DeploymentCauseImageTrigger, out *deployapi.DeploymentCauseImageTrigger, c *conversion.Cloner) error { - out.RepositoryName = in.RepositoryName - out.Tag = in.Tag + if newVal, err := c.DeepCopy(in.From); err != nil { + return err + } else { + out.From = newVal.(pkgapi.ObjectReference) + } return nil } @@ -1340,27 +1343,11 @@ func deepCopy_api_DeploymentConfig(in deployapi.DeploymentConfig, out *deployapi } else { out.ObjectMeta = newVal.(pkgapi.ObjectMeta) } - if in.Triggers != nil { - out.Triggers = make([]deployapi.DeploymentTriggerPolicy, len(in.Triggers)) - for i := range in.Triggers { - if err := deepCopy_api_DeploymentTriggerPolicy(in.Triggers[i], &out.Triggers[i], c); err != nil { - return err - } - } - } else { - out.Triggers = nil - } - if err := deepCopy_api_DeploymentTemplate(in.Template, &out.Template, c); err != nil { + if err := deepCopy_api_DeploymentConfigSpec(in.Spec, &out.Spec, c); err != nil { return err } - out.LatestVersion = in.LatestVersion - if in.Details != nil { - out.Details = new(deployapi.DeploymentDetails) - if err := deepCopy_api_DeploymentDetails(*in.Details, out.Details, c); err != nil { - return err - } - } else { - out.Details = nil + if err := deepCopy_api_DeploymentConfigStatus(in.Status, &out.Status, c); err != nil { + return err } return nil } @@ -1414,6 +1401,54 @@ func deepCopy_api_DeploymentConfigRollbackSpec(in deployapi.DeploymentConfigRoll return nil } +func deepCopy_api_DeploymentConfigSpec(in deployapi.DeploymentConfigSpec, out *deployapi.DeploymentConfigSpec, c *conversion.Cloner) error { + if err := deepCopy_api_DeploymentStrategy(in.Strategy, &out.Strategy, c); err != nil { + return err + } + if in.Triggers != nil { + out.Triggers = make([]deployapi.DeploymentTriggerPolicy, len(in.Triggers)) + for i := range in.Triggers { + if err := deepCopy_api_DeploymentTriggerPolicy(in.Triggers[i], &out.Triggers[i], c); err != nil { + return err + } + } + } else { + out.Triggers = nil + } + out.Replicas = in.Replicas + if in.Selector != nil { + out.Selector = make(map[string]string) + for key, val := range in.Selector { + out.Selector[key] = val + } + } else { + out.Selector = nil + } + if in.Template != nil { + if newVal, err := c.DeepCopy(in.Template); err != nil { + return err + } else { + out.Template = newVal.(*pkgapi.PodTemplateSpec) + } + } else { + out.Template = nil + } + return nil +} + +func deepCopy_api_DeploymentConfigStatus(in deployapi.DeploymentConfigStatus, out *deployapi.DeploymentConfigStatus, c *conversion.Cloner) error { + out.LatestVersion = in.LatestVersion + if in.Details != nil { + out.Details = new(deployapi.DeploymentDetails) + if err := deepCopy_api_DeploymentDetails(*in.Details, out.Details, c); err != nil { + return err + } + } else { + out.Details = nil + } + return nil +} + func deepCopy_api_DeploymentDetails(in deployapi.DeploymentDetails, out *deployapi.DeploymentDetails, c *conversion.Cloner) error { out.Message = in.Message if in.Causes != nil { @@ -1539,18 +1574,6 @@ func deepCopy_api_DeploymentStrategy(in deployapi.DeploymentStrategy, out *deplo return nil } -func deepCopy_api_DeploymentTemplate(in deployapi.DeploymentTemplate, out *deployapi.DeploymentTemplate, c *conversion.Cloner) error { - if err := deepCopy_api_DeploymentStrategy(in.Strategy, &out.Strategy, c); err != nil { - return err - } - if newVal, err := c.DeepCopy(in.ControllerTemplate); err != nil { - return err - } else { - out.ControllerTemplate = newVal.(pkgapi.ReplicationControllerSpec) - } - return nil -} - func deepCopy_api_DeploymentTriggerImageChangeParams(in deployapi.DeploymentTriggerImageChangeParams, out *deployapi.DeploymentTriggerImageChangeParams, c *conversion.Cloner) error { out.Automatic = in.Automatic if in.ContainerNames != nil { @@ -1561,13 +1584,11 @@ func deepCopy_api_DeploymentTriggerImageChangeParams(in deployapi.DeploymentTrig } else { out.ContainerNames = nil } - out.RepositoryName = in.RepositoryName if newVal, err := c.DeepCopy(in.From); err != nil { return err } else { out.From = newVal.(pkgapi.ObjectReference) } - out.Tag = in.Tag out.LastTriggeredImage = in.LastTriggeredImage return nil } @@ -2908,11 +2929,12 @@ func init() { deepCopy_api_DeploymentConfigList, deepCopy_api_DeploymentConfigRollback, deepCopy_api_DeploymentConfigRollbackSpec, + deepCopy_api_DeploymentConfigSpec, + deepCopy_api_DeploymentConfigStatus, deepCopy_api_DeploymentDetails, deepCopy_api_DeploymentLog, deepCopy_api_DeploymentLogOptions, deepCopy_api_DeploymentStrategy, - deepCopy_api_DeploymentTemplate, deepCopy_api_DeploymentTriggerImageChangeParams, deepCopy_api_DeploymentTriggerPolicy, deepCopy_api_ExecNewPodHook, diff --git a/pkg/api/graph/graphview/veneering_test.go b/pkg/api/graph/graphview/veneering_test.go index 9de574e9806a..b517307fb500 100644 --- a/pkg/api/graph/graphview/veneering_test.go +++ b/pkg/api/graph/graphview/veneering_test.go @@ -145,13 +145,13 @@ func TestBareBCGroup(t *testing.T) { coveredNodes.Insert(coveredByBCs.List()...) if e, a := 0, len(serviceGroups); e != a { - t.Errorf("expected %v, got %v", e, a) + t.Errorf("expected %v services, got %v", e, a) } if e, a := 0, len(bareDCPipelines); e != a { - t.Errorf("expected %v, got %v", e, a) + t.Errorf("expected %v deploymentConfigs, got %v", e, a) } if e, a := 1, len(bareBCPipelines); e != a { - t.Errorf("expected %v, got %v", e, a) + t.Errorf("expected %v buildConfigs, got %v", e, a) } } @@ -259,38 +259,35 @@ func TestGraph(t *testing.T) { }) deploygraph.EnsureDeploymentConfigNode(g, &deployapi.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Namespace: "other", Name: "deploy1"}, - Triggers: []deployapi.DeploymentTriggerPolicy{ - { - ImageChangeParams: &deployapi.DeploymentTriggerImageChangeParams{ - From: kapi.ObjectReference{Namespace: "default", Name: "other"}, - ContainerNames: []string{"1", "2"}, - Tag: "tag1", + Spec: deployapi.DeploymentConfigSpec{ + Triggers: []deployapi.DeploymentTriggerPolicy{ + { + ImageChangeParams: &deployapi.DeploymentTriggerImageChangeParams{ + From: kapi.ObjectReference{Kind: "ImageStreamTag", Namespace: "default", Name: "other:tag1"}, + ContainerNames: []string{"1", "2"}, + }, }, }, - }, - Template: deployapi.DeploymentTemplate{ - ControllerTemplate: kapi.ReplicationControllerSpec{ - Template: &kapi.PodTemplateSpec{ - ObjectMeta: kapi.ObjectMeta{ - Labels: map[string]string{ - "deploymentconfig": "deploy1", - "env": "prod", - }, + Template: &kapi.PodTemplateSpec{ + ObjectMeta: kapi.ObjectMeta{ + Labels: map[string]string{ + "deploymentconfig": "deploy1", + "env": "prod", }, - Spec: kapi.PodSpec{ - Containers: []kapi.Container{ - { - Name: "1", - Image: "mycustom/repo/image", - }, - { - Name: "2", - Image: "mycustom/repo/image2", - }, - { - Name: "3", - Image: "mycustom/repo/image3", - }, + }, + Spec: kapi.PodSpec{ + Containers: []kapi.Container{ + { + Name: "1", + Image: "mycustom/repo/image", + }, + { + Name: "2", + Image: "mycustom/repo/image2", + }, + { + Name: "3", + Image: "mycustom/repo/image3", }, }, }, @@ -299,21 +296,19 @@ func TestGraph(t *testing.T) { }) deploygraph.EnsureDeploymentConfigNode(g, &deployapi.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Namespace: "default", Name: "deploy2"}, - Template: deployapi.DeploymentTemplate{ - ControllerTemplate: kapi.ReplicationControllerSpec{ - Template: &kapi.PodTemplateSpec{ - ObjectMeta: kapi.ObjectMeta{ - Labels: map[string]string{ - "deploymentconfig": "deploy2", - "env": "dev", - }, + Spec: deployapi.DeploymentConfigSpec{ + Template: &kapi.PodTemplateSpec{ + ObjectMeta: kapi.ObjectMeta{ + Labels: map[string]string{ + "deploymentconfig": "deploy2", + "env": "dev", }, - Spec: kapi.PodSpec{ - Containers: []kapi.Container{ - { - Name: "1", - Image: "someother/image:v1", - }, + }, + Spec: kapi.PodSpec{ + Containers: []kapi.Container{ + { + Name: "1", + Image: "someother/image:v1", }, }, }, diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go index ca252e80053d..eb6c3e59a250 100644 --- a/pkg/api/serialization_test.go +++ b/pkg/api/serialization_test.go @@ -220,16 +220,16 @@ func fuzzInternalObject(t *testing.T, forVersion string, item runtime.Object, se }, func(j *deploy.DeploymentConfig, c fuzz.Continue) { c.FuzzNoCustom(j) - j.Triggers = []deploy.DeploymentTriggerPolicy{{Type: deploy.DeploymentTriggerOnConfigChange}} + j.Spec.Triggers = []deploy.DeploymentTriggerPolicy{{Type: deploy.DeploymentTriggerOnConfigChange}} if forVersion == "v1beta3" { // v1beta3 does not contain the PodSecurityContext type. For this API version, only fuzz // the host namespace fields. The fields set to nil here are the other fields of the // PodSecurityContext that will not roundtrip correctly from internal->v1beta3->internal. - j.Template.ControllerTemplate.Template.Spec.SecurityContext.SELinuxOptions = nil - j.Template.ControllerTemplate.Template.Spec.SecurityContext.RunAsUser = nil - j.Template.ControllerTemplate.Template.Spec.SecurityContext.RunAsNonRoot = nil - j.Template.ControllerTemplate.Template.Spec.SecurityContext.SupplementalGroups = nil - j.Template.ControllerTemplate.Template.Spec.SecurityContext.FSGroup = nil + j.Spec.Template.Spec.SecurityContext.SELinuxOptions = nil + j.Spec.Template.Spec.SecurityContext.RunAsUser = nil + j.Spec.Template.Spec.SecurityContext.RunAsNonRoot = nil + j.Spec.Template.Spec.SecurityContext.SupplementalGroups = nil + j.Spec.Template.Spec.SecurityContext.FSGroup = nil } }, func(j *deploy.DeploymentStrategy, c fuzz.Continue) { @@ -283,12 +283,10 @@ func fuzzInternalObject(t *testing.T, forVersion string, item runtime.Object, se func(j *deploy.DeploymentCauseImageTrigger, c fuzz.Continue) { c.FuzzNoCustom(j) specs := []string{"", "a/b", "a/b/c", "a:5000/b/c", "a/b", "a/b"} - tags := []string{"", "stuff", "other"} - j.RepositoryName = specs[c.Intn(len(specs))] - if len(j.RepositoryName) > 0 { - j.Tag = tags[c.Intn(len(tags))] - } else { - j.Tag = "" + tags := []string{"stuff", "other"} + j.From.Name = specs[c.Intn(len(specs))] + if len(j.From.Name) > 0 { + j.From.Name = image.JoinImageStreamTag(j.From.Name, tags[c.Intn(len(tags))]) } }, func(j *deploy.DeploymentTriggerImageChangeParams, c fuzz.Continue) { @@ -296,11 +294,6 @@ func fuzzInternalObject(t *testing.T, forVersion string, item runtime.Object, se specs := []string{"a/b", "a/b/c", "a:5000/b/c", "a/b:latest", "a/b@test"} j.From.Kind = "DockerImage" j.From.Name = specs[c.Intn(len(specs))] - if ref, err := image.ParseDockerImageReference(j.From.Name); err == nil { - j.Tag = ref.Tag - ref.Tag, ref.ID = "", "" - j.RepositoryName = ref.String() - } }, func(j *runtime.EmbeddedObject, c fuzz.Continue) { // runtime.EmbeddedObject causes a panic inside of fuzz because runtime.Object isn't handled. diff --git a/pkg/api/v1/conversion_generated.go b/pkg/api/v1/conversion_generated.go index 12a36ad31e81..87078cde78ca 100644 --- a/pkg/api/v1/conversion_generated.go +++ b/pkg/api/v1/conversion_generated.go @@ -2498,6 +2498,70 @@ func convert_v1_WebHookTrigger_To_api_WebHookTrigger(in *apiv1.WebHookTrigger, o return autoconvert_v1_WebHookTrigger_To_api_WebHookTrigger(in, out, s) } +func autoconvert_api_CustomDeploymentStrategyParams_To_v1_CustomDeploymentStrategyParams(in *deployapi.CustomDeploymentStrategyParams, out *deployapiv1.CustomDeploymentStrategyParams, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*deployapi.CustomDeploymentStrategyParams))(in) + } + out.Image = in.Image + if in.Environment != nil { + out.Environment = make([]pkgapiv1.EnvVar, len(in.Environment)) + for i := range in.Environment { + if err := convert_api_EnvVar_To_v1_EnvVar(&in.Environment[i], &out.Environment[i], s); err != nil { + return err + } + } + } else { + out.Environment = nil + } + if in.Command != nil { + out.Command = make([]string, len(in.Command)) + for i := range in.Command { + out.Command[i] = in.Command[i] + } + } else { + out.Command = nil + } + return nil +} + +func convert_api_CustomDeploymentStrategyParams_To_v1_CustomDeploymentStrategyParams(in *deployapi.CustomDeploymentStrategyParams, out *deployapiv1.CustomDeploymentStrategyParams, s conversion.Scope) error { + return autoconvert_api_CustomDeploymentStrategyParams_To_v1_CustomDeploymentStrategyParams(in, out, s) +} + +func autoconvert_api_DeploymentCause_To_v1_DeploymentCause(in *deployapi.DeploymentCause, out *deployapiv1.DeploymentCause, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*deployapi.DeploymentCause))(in) + } + out.Type = deployapiv1.DeploymentTriggerType(in.Type) + if in.ImageTrigger != nil { + out.ImageTrigger = new(deployapiv1.DeploymentCauseImageTrigger) + if err := convert_api_DeploymentCauseImageTrigger_To_v1_DeploymentCauseImageTrigger(in.ImageTrigger, out.ImageTrigger, s); err != nil { + return err + } + } else { + out.ImageTrigger = nil + } + return nil +} + +func convert_api_DeploymentCause_To_v1_DeploymentCause(in *deployapi.DeploymentCause, out *deployapiv1.DeploymentCause, s conversion.Scope) error { + return autoconvert_api_DeploymentCause_To_v1_DeploymentCause(in, out, s) +} + +func autoconvert_api_DeploymentCauseImageTrigger_To_v1_DeploymentCauseImageTrigger(in *deployapi.DeploymentCauseImageTrigger, out *deployapiv1.DeploymentCauseImageTrigger, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*deployapi.DeploymentCauseImageTrigger))(in) + } + if err := convert_api_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil { + return err + } + return nil +} + +func convert_api_DeploymentCauseImageTrigger_To_v1_DeploymentCauseImageTrigger(in *deployapi.DeploymentCauseImageTrigger, out *deployapiv1.DeploymentCauseImageTrigger, s conversion.Scope) error { + return autoconvert_api_DeploymentCauseImageTrigger_To_v1_DeploymentCauseImageTrigger(in, out, s) +} + func autoconvert_api_DeploymentConfig_To_v1_DeploymentConfig(in *deployapi.DeploymentConfig, out *deployapiv1.DeploymentConfig, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*deployapi.DeploymentConfig))(in) @@ -2508,13 +2572,19 @@ func autoconvert_api_DeploymentConfig_To_v1_DeploymentConfig(in *deployapi.Deplo if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - // in.Triggers has no peer in out - // in.Template has no peer in out - // in.LatestVersion has no peer in out - // in.Details has no peer in out + if err := convert_api_DeploymentConfigSpec_To_v1_DeploymentConfigSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := convert_api_DeploymentConfigStatus_To_v1_DeploymentConfigStatus(&in.Status, &out.Status, s); err != nil { + return err + } return nil } +func convert_api_DeploymentConfig_To_v1_DeploymentConfig(in *deployapi.DeploymentConfig, out *deployapiv1.DeploymentConfig, s conversion.Scope) error { + return autoconvert_api_DeploymentConfig_To_v1_DeploymentConfig(in, out, s) +} + func autoconvert_api_DeploymentConfigList_To_v1_DeploymentConfigList(in *deployapi.DeploymentConfigList, out *deployapiv1.DeploymentConfigList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*deployapi.DeploymentConfigList))(in) @@ -2528,7 +2598,7 @@ func autoconvert_api_DeploymentConfigList_To_v1_DeploymentConfigList(in *deploya if in.Items != nil { out.Items = make([]deployapiv1.DeploymentConfig, len(in.Items)) for i := range in.Items { - if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { + if err := convert_api_DeploymentConfig_To_v1_DeploymentConfig(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -2577,6 +2647,89 @@ func convert_api_DeploymentConfigRollbackSpec_To_v1_DeploymentConfigRollbackSpec return autoconvert_api_DeploymentConfigRollbackSpec_To_v1_DeploymentConfigRollbackSpec(in, out, s) } +func autoconvert_api_DeploymentConfigSpec_To_v1_DeploymentConfigSpec(in *deployapi.DeploymentConfigSpec, out *deployapiv1.DeploymentConfigSpec, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*deployapi.DeploymentConfigSpec))(in) + } + if err := convert_api_DeploymentStrategy_To_v1_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { + return err + } + if in.Triggers != nil { + out.Triggers = make([]deployapiv1.DeploymentTriggerPolicy, len(in.Triggers)) + for i := range in.Triggers { + if err := convert_api_DeploymentTriggerPolicy_To_v1_DeploymentTriggerPolicy(&in.Triggers[i], &out.Triggers[i], s); err != nil { + return err + } + } + } else { + out.Triggers = nil + } + out.Replicas = in.Replicas + if in.Selector != nil { + out.Selector = make(map[string]string) + for key, val := range in.Selector { + out.Selector[key] = val + } + } else { + out.Selector = nil + } + if in.Template != nil { + out.Template = new(pkgapiv1.PodTemplateSpec) + if err := convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(in.Template, out.Template, s); err != nil { + return err + } + } else { + out.Template = nil + } + return nil +} + +func convert_api_DeploymentConfigSpec_To_v1_DeploymentConfigSpec(in *deployapi.DeploymentConfigSpec, out *deployapiv1.DeploymentConfigSpec, s conversion.Scope) error { + return autoconvert_api_DeploymentConfigSpec_To_v1_DeploymentConfigSpec(in, out, s) +} + +func autoconvert_api_DeploymentConfigStatus_To_v1_DeploymentConfigStatus(in *deployapi.DeploymentConfigStatus, out *deployapiv1.DeploymentConfigStatus, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*deployapi.DeploymentConfigStatus))(in) + } + out.LatestVersion = in.LatestVersion + if in.Details != nil { + out.Details = new(deployapiv1.DeploymentDetails) + if err := convert_api_DeploymentDetails_To_v1_DeploymentDetails(in.Details, out.Details, s); err != nil { + return err + } + } else { + out.Details = nil + } + return nil +} + +func convert_api_DeploymentConfigStatus_To_v1_DeploymentConfigStatus(in *deployapi.DeploymentConfigStatus, out *deployapiv1.DeploymentConfigStatus, s conversion.Scope) error { + return autoconvert_api_DeploymentConfigStatus_To_v1_DeploymentConfigStatus(in, out, s) +} + +func autoconvert_api_DeploymentDetails_To_v1_DeploymentDetails(in *deployapi.DeploymentDetails, out *deployapiv1.DeploymentDetails, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*deployapi.DeploymentDetails))(in) + } + out.Message = in.Message + if in.Causes != nil { + out.Causes = make([]*deployapiv1.DeploymentCause, len(in.Causes)) + for i := range in.Causes { + if err := s.Convert(&in.Causes[i], &out.Causes[i], 0); err != nil { + return err + } + } + } else { + out.Causes = nil + } + return nil +} + +func convert_api_DeploymentDetails_To_v1_DeploymentDetails(in *deployapi.DeploymentDetails, out *deployapiv1.DeploymentDetails, s conversion.Scope) error { + return autoconvert_api_DeploymentDetails_To_v1_DeploymentDetails(in, out, s) +} + func autoconvert_api_DeploymentLog_To_v1_DeploymentLog(in *deployapi.DeploymentLog, out *deployapiv1.DeploymentLog, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*deployapi.DeploymentLog))(in) @@ -2641,239 +2794,327 @@ func convert_api_DeploymentLogOptions_To_v1_DeploymentLogOptions(in *deployapi.D return autoconvert_api_DeploymentLogOptions_To_v1_DeploymentLogOptions(in, out, s) } -func autoconvert_v1_DeploymentConfig_To_api_DeploymentConfig(in *deployapiv1.DeploymentConfig, out *deployapi.DeploymentConfig, s conversion.Scope) error { +func autoconvert_api_DeploymentStrategy_To_v1_DeploymentStrategy(in *deployapi.DeploymentStrategy, out *deployapiv1.DeploymentStrategy, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*deployapiv1.DeploymentConfig))(in) + defaulting.(func(*deployapi.DeploymentStrategy))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + out.Type = deployapiv1.DeploymentStrategyType(in.Type) + if in.CustomParams != nil { + out.CustomParams = new(deployapiv1.CustomDeploymentStrategyParams) + if err := convert_api_CustomDeploymentStrategyParams_To_v1_CustomDeploymentStrategyParams(in.CustomParams, out.CustomParams, s); err != nil { + return err + } + } else { + out.CustomParams = nil } - if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if in.RecreateParams != nil { + out.RecreateParams = new(deployapiv1.RecreateDeploymentStrategyParams) + if err := convert_api_RecreateDeploymentStrategyParams_To_v1_RecreateDeploymentStrategyParams(in.RecreateParams, out.RecreateParams, s); err != nil { + return err + } + } else { + out.RecreateParams = nil + } + if in.RollingParams != nil { + if err := s.Convert(&in.RollingParams, &out.RollingParams, 0); err != nil { + return err + } + } else { + out.RollingParams = nil + } + if err := convert_api_ResourceRequirements_To_v1_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { return err } - // in.Spec has no peer in out - // in.Status has no peer in out + if in.Labels != nil { + out.Labels = make(map[string]string) + for key, val := range in.Labels { + out.Labels[key] = val + } + } else { + out.Labels = nil + } + if in.Annotations != nil { + out.Annotations = make(map[string]string) + for key, val := range in.Annotations { + out.Annotations[key] = val + } + } else { + out.Annotations = nil + } return nil } -func autoconvert_v1_DeploymentConfigList_To_api_DeploymentConfigList(in *deployapiv1.DeploymentConfigList, out *deployapi.DeploymentConfigList, s conversion.Scope) error { +func convert_api_DeploymentStrategy_To_v1_DeploymentStrategy(in *deployapi.DeploymentStrategy, out *deployapiv1.DeploymentStrategy, s conversion.Scope) error { + return autoconvert_api_DeploymentStrategy_To_v1_DeploymentStrategy(in, out, s) +} + +func autoconvert_api_DeploymentTriggerImageChangeParams_To_v1_DeploymentTriggerImageChangeParams(in *deployapi.DeploymentTriggerImageChangeParams, out *deployapiv1.DeploymentTriggerImageChangeParams, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*deployapiv1.DeploymentConfigList))(in) + defaulting.(func(*deployapi.DeploymentTriggerImageChangeParams))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + out.Automatic = in.Automatic + if in.ContainerNames != nil { + out.ContainerNames = make([]string, len(in.ContainerNames)) + for i := range in.ContainerNames { + out.ContainerNames[i] = in.ContainerNames[i] + } + } else { + out.ContainerNames = nil } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + if err := convert_api_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil { return err } - if in.Items != nil { - out.Items = make([]deployapi.DeploymentConfig, len(in.Items)) - for i := range in.Items { - if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { - return err - } + out.LastTriggeredImage = in.LastTriggeredImage + return nil +} + +func autoconvert_api_DeploymentTriggerPolicy_To_v1_DeploymentTriggerPolicy(in *deployapi.DeploymentTriggerPolicy, out *deployapiv1.DeploymentTriggerPolicy, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*deployapi.DeploymentTriggerPolicy))(in) + } + out.Type = deployapiv1.DeploymentTriggerType(in.Type) + if in.ImageChangeParams != nil { + if err := s.Convert(&in.ImageChangeParams, &out.ImageChangeParams, 0); err != nil { + return err } } else { - out.Items = nil + out.ImageChangeParams = nil } return nil } -func convert_v1_DeploymentConfigList_To_api_DeploymentConfigList(in *deployapiv1.DeploymentConfigList, out *deployapi.DeploymentConfigList, s conversion.Scope) error { - return autoconvert_v1_DeploymentConfigList_To_api_DeploymentConfigList(in, out, s) +func convert_api_DeploymentTriggerPolicy_To_v1_DeploymentTriggerPolicy(in *deployapi.DeploymentTriggerPolicy, out *deployapiv1.DeploymentTriggerPolicy, s conversion.Scope) error { + return autoconvert_api_DeploymentTriggerPolicy_To_v1_DeploymentTriggerPolicy(in, out, s) } -func autoconvert_v1_DeploymentConfigRollback_To_api_DeploymentConfigRollback(in *deployapiv1.DeploymentConfigRollback, out *deployapi.DeploymentConfigRollback, s conversion.Scope) error { +func autoconvert_api_ExecNewPodHook_To_v1_ExecNewPodHook(in *deployapi.ExecNewPodHook, out *deployapiv1.ExecNewPodHook, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*deployapiv1.DeploymentConfigRollback))(in) + defaulting.(func(*deployapi.ExecNewPodHook))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + if in.Command != nil { + out.Command = make([]string, len(in.Command)) + for i := range in.Command { + out.Command[i] = in.Command[i] + } + } else { + out.Command = nil } - if err := convert_v1_DeploymentConfigRollbackSpec_To_api_DeploymentConfigRollbackSpec(&in.Spec, &out.Spec, s); err != nil { - return err + if in.Env != nil { + out.Env = make([]pkgapiv1.EnvVar, len(in.Env)) + for i := range in.Env { + if err := convert_api_EnvVar_To_v1_EnvVar(&in.Env[i], &out.Env[i], s); err != nil { + return err + } + } + } else { + out.Env = nil + } + out.ContainerName = in.ContainerName + if in.Volumes != nil { + out.Volumes = make([]string, len(in.Volumes)) + for i := range in.Volumes { + out.Volumes[i] = in.Volumes[i] + } + } else { + out.Volumes = nil } return nil } -func convert_v1_DeploymentConfigRollback_To_api_DeploymentConfigRollback(in *deployapiv1.DeploymentConfigRollback, out *deployapi.DeploymentConfigRollback, s conversion.Scope) error { - return autoconvert_v1_DeploymentConfigRollback_To_api_DeploymentConfigRollback(in, out, s) +func convert_api_ExecNewPodHook_To_v1_ExecNewPodHook(in *deployapi.ExecNewPodHook, out *deployapiv1.ExecNewPodHook, s conversion.Scope) error { + return autoconvert_api_ExecNewPodHook_To_v1_ExecNewPodHook(in, out, s) } -func autoconvert_v1_DeploymentConfigRollbackSpec_To_api_DeploymentConfigRollbackSpec(in *deployapiv1.DeploymentConfigRollbackSpec, out *deployapi.DeploymentConfigRollbackSpec, s conversion.Scope) error { +func autoconvert_api_LifecycleHook_To_v1_LifecycleHook(in *deployapi.LifecycleHook, out *deployapiv1.LifecycleHook, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*deployapiv1.DeploymentConfigRollbackSpec))(in) + defaulting.(func(*deployapi.LifecycleHook))(in) } - if err := convert_v1_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil { - return err + out.FailurePolicy = deployapiv1.LifecycleHookFailurePolicy(in.FailurePolicy) + if in.ExecNewPod != nil { + out.ExecNewPod = new(deployapiv1.ExecNewPodHook) + if err := convert_api_ExecNewPodHook_To_v1_ExecNewPodHook(in.ExecNewPod, out.ExecNewPod, s); err != nil { + return err + } + } else { + out.ExecNewPod = nil } - out.IncludeTriggers = in.IncludeTriggers - out.IncludeTemplate = in.IncludeTemplate - out.IncludeReplicationMeta = in.IncludeReplicationMeta - out.IncludeStrategy = in.IncludeStrategy return nil } -func convert_v1_DeploymentConfigRollbackSpec_To_api_DeploymentConfigRollbackSpec(in *deployapiv1.DeploymentConfigRollbackSpec, out *deployapi.DeploymentConfigRollbackSpec, s conversion.Scope) error { - return autoconvert_v1_DeploymentConfigRollbackSpec_To_api_DeploymentConfigRollbackSpec(in, out, s) +func convert_api_LifecycleHook_To_v1_LifecycleHook(in *deployapi.LifecycleHook, out *deployapiv1.LifecycleHook, s conversion.Scope) error { + return autoconvert_api_LifecycleHook_To_v1_LifecycleHook(in, out, s) } -func autoconvert_v1_DeploymentLog_To_api_DeploymentLog(in *deployapiv1.DeploymentLog, out *deployapi.DeploymentLog, s conversion.Scope) error { +func autoconvert_api_RecreateDeploymentStrategyParams_To_v1_RecreateDeploymentStrategyParams(in *deployapi.RecreateDeploymentStrategyParams, out *deployapiv1.RecreateDeploymentStrategyParams, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*deployapiv1.DeploymentLog))(in) + defaulting.(func(*deployapi.RecreateDeploymentStrategyParams))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + if in.Pre != nil { + out.Pre = new(deployapiv1.LifecycleHook) + if err := convert_api_LifecycleHook_To_v1_LifecycleHook(in.Pre, out.Pre, s); err != nil { + return err + } + } else { + out.Pre = nil + } + if in.Post != nil { + out.Post = new(deployapiv1.LifecycleHook) + if err := convert_api_LifecycleHook_To_v1_LifecycleHook(in.Post, out.Post, s); err != nil { + return err + } + } else { + out.Post = nil } return nil } -func convert_v1_DeploymentLog_To_api_DeploymentLog(in *deployapiv1.DeploymentLog, out *deployapi.DeploymentLog, s conversion.Scope) error { - return autoconvert_v1_DeploymentLog_To_api_DeploymentLog(in, out, s) +func convert_api_RecreateDeploymentStrategyParams_To_v1_RecreateDeploymentStrategyParams(in *deployapi.RecreateDeploymentStrategyParams, out *deployapiv1.RecreateDeploymentStrategyParams, s conversion.Scope) error { + return autoconvert_api_RecreateDeploymentStrategyParams_To_v1_RecreateDeploymentStrategyParams(in, out, s) } -func autoconvert_v1_DeploymentLogOptions_To_api_DeploymentLogOptions(in *deployapiv1.DeploymentLogOptions, out *deployapi.DeploymentLogOptions, s conversion.Scope) error { +func autoconvert_api_RollingDeploymentStrategyParams_To_v1_RollingDeploymentStrategyParams(in *deployapi.RollingDeploymentStrategyParams, out *deployapiv1.RollingDeploymentStrategyParams, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*deployapiv1.DeploymentLogOptions))(in) + defaulting.(func(*deployapi.RollingDeploymentStrategyParams))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + if in.UpdatePeriodSeconds != nil { + out.UpdatePeriodSeconds = new(int64) + *out.UpdatePeriodSeconds = *in.UpdatePeriodSeconds + } else { + out.UpdatePeriodSeconds = nil + } + if in.IntervalSeconds != nil { + out.IntervalSeconds = new(int64) + *out.IntervalSeconds = *in.IntervalSeconds + } else { + out.IntervalSeconds = nil + } + if in.TimeoutSeconds != nil { + out.TimeoutSeconds = new(int64) + *out.TimeoutSeconds = *in.TimeoutSeconds + } else { + out.TimeoutSeconds = nil + } + if err := s.Convert(&in.MaxUnavailable, &out.MaxUnavailable, 0); err != nil { return err } - out.Container = in.Container - out.Follow = in.Follow - out.Previous = in.Previous - if in.SinceSeconds != nil { - out.SinceSeconds = new(int64) - *out.SinceSeconds = *in.SinceSeconds + if err := s.Convert(&in.MaxSurge, &out.MaxSurge, 0); err != nil { + return err + } + if in.UpdatePercent != nil { + out.UpdatePercent = new(int) + *out.UpdatePercent = *in.UpdatePercent } else { - out.SinceSeconds = nil + out.UpdatePercent = nil } - if in.SinceTime != nil { - if err := s.Convert(&in.SinceTime, &out.SinceTime, 0); err != nil { + if in.Pre != nil { + out.Pre = new(deployapiv1.LifecycleHook) + if err := convert_api_LifecycleHook_To_v1_LifecycleHook(in.Pre, out.Pre, s); err != nil { return err } } else { - out.SinceTime = nil + out.Pre = nil } - out.Timestamps = in.Timestamps - if in.TailLines != nil { - out.TailLines = new(int64) - *out.TailLines = *in.TailLines + if in.Post != nil { + out.Post = new(deployapiv1.LifecycleHook) + if err := convert_api_LifecycleHook_To_v1_LifecycleHook(in.Post, out.Post, s); err != nil { + return err + } } else { - out.TailLines = nil + out.Post = nil } - if in.LimitBytes != nil { - out.LimitBytes = new(int64) - *out.LimitBytes = *in.LimitBytes + return nil +} + +func autoconvert_v1_CustomDeploymentStrategyParams_To_api_CustomDeploymentStrategyParams(in *deployapiv1.CustomDeploymentStrategyParams, out *deployapi.CustomDeploymentStrategyParams, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*deployapiv1.CustomDeploymentStrategyParams))(in) + } + out.Image = in.Image + if in.Environment != nil { + out.Environment = make([]pkgapi.EnvVar, len(in.Environment)) + for i := range in.Environment { + if err := convert_v1_EnvVar_To_api_EnvVar(&in.Environment[i], &out.Environment[i], s); err != nil { + return err + } + } } else { - out.LimitBytes = nil + out.Environment = nil } - out.NoWait = in.NoWait - if in.Version != nil { - out.Version = new(int64) - *out.Version = *in.Version + if in.Command != nil { + out.Command = make([]string, len(in.Command)) + for i := range in.Command { + out.Command[i] = in.Command[i] + } } else { - out.Version = nil + out.Command = nil } return nil } -func convert_v1_DeploymentLogOptions_To_api_DeploymentLogOptions(in *deployapiv1.DeploymentLogOptions, out *deployapi.DeploymentLogOptions, s conversion.Scope) error { - return autoconvert_v1_DeploymentLogOptions_To_api_DeploymentLogOptions(in, out, s) +func convert_v1_CustomDeploymentStrategyParams_To_api_CustomDeploymentStrategyParams(in *deployapiv1.CustomDeploymentStrategyParams, out *deployapi.CustomDeploymentStrategyParams, s conversion.Scope) error { + return autoconvert_v1_CustomDeploymentStrategyParams_To_api_CustomDeploymentStrategyParams(in, out, s) } -func autoconvert_api_Image_To_v1_Image(in *imageapi.Image, out *imageapiv1.Image, s conversion.Scope) error { +func autoconvert_v1_DeploymentCause_To_api_DeploymentCause(in *deployapiv1.DeploymentCause, out *deployapi.DeploymentCause, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.Image))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + defaulting.(func(*deployapiv1.DeploymentCause))(in) } - if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - out.DockerImageReference = in.DockerImageReference - if err := s.Convert(&in.DockerImageMetadata, &out.DockerImageMetadata, 0); err != nil { - return err - } - out.DockerImageMetadataVersion = in.DockerImageMetadataVersion - out.DockerImageManifest = in.DockerImageManifest - return nil -} - -func autoconvert_api_ImageList_To_v1_ImageList(in *imageapi.ImageList, out *imageapiv1.ImageList, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.ImageList))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err - } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { - return err - } - if in.Items != nil { - out.Items = make([]imageapiv1.Image, len(in.Items)) - for i := range in.Items { - if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { - return err - } - } - } else { - out.Items = nil + out.Type = deployapi.DeploymentTriggerType(in.Type) + if in.ImageTrigger != nil { + out.ImageTrigger = new(deployapi.DeploymentCauseImageTrigger) + if err := convert_v1_DeploymentCauseImageTrigger_To_api_DeploymentCauseImageTrigger(in.ImageTrigger, out.ImageTrigger, s); err != nil { + return err + } + } else { + out.ImageTrigger = nil } return nil } -func convert_api_ImageList_To_v1_ImageList(in *imageapi.ImageList, out *imageapiv1.ImageList, s conversion.Scope) error { - return autoconvert_api_ImageList_To_v1_ImageList(in, out, s) +func convert_v1_DeploymentCause_To_api_DeploymentCause(in *deployapiv1.DeploymentCause, out *deployapi.DeploymentCause, s conversion.Scope) error { + return autoconvert_v1_DeploymentCause_To_api_DeploymentCause(in, out, s) } -func autoconvert_api_ImageStream_To_v1_ImageStream(in *imageapi.ImageStream, out *imageapiv1.ImageStream, s conversion.Scope) error { +func autoconvert_v1_DeploymentCauseImageTrigger_To_api_DeploymentCauseImageTrigger(in *deployapiv1.DeploymentCauseImageTrigger, out *deployapi.DeploymentCauseImageTrigger, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.ImageStream))(in) + defaulting.(func(*deployapiv1.DeploymentCauseImageTrigger))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err - } - if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil { - return err - } - if err := s.Convert(&in.Status, &out.Status, 0); err != nil { + if err := convert_v1_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil { return err } return nil } -func convert_api_ImageStream_To_v1_ImageStream(in *imageapi.ImageStream, out *imageapiv1.ImageStream, s conversion.Scope) error { - return autoconvert_api_ImageStream_To_v1_ImageStream(in, out, s) +func convert_v1_DeploymentCauseImageTrigger_To_api_DeploymentCauseImageTrigger(in *deployapiv1.DeploymentCauseImageTrigger, out *deployapi.DeploymentCauseImageTrigger, s conversion.Scope) error { + return autoconvert_v1_DeploymentCauseImageTrigger_To_api_DeploymentCauseImageTrigger(in, out, s) } -func autoconvert_api_ImageStreamImage_To_v1_ImageStreamImage(in *imageapi.ImageStreamImage, out *imageapiv1.ImageStreamImage, s conversion.Scope) error { +func autoconvert_v1_DeploymentConfig_To_api_DeploymentConfig(in *deployapiv1.DeploymentConfig, out *deployapi.DeploymentConfig, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.ImageStreamImage))(in) + defaulting.(func(*deployapiv1.DeploymentConfig))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := s.Convert(&in.Image, &out.Image, 0); err != nil { + if err := convert_v1_DeploymentConfigSpec_To_api_DeploymentConfigSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := convert_v1_DeploymentConfigStatus_To_api_DeploymentConfigStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -func convert_api_ImageStreamImage_To_v1_ImageStreamImage(in *imageapi.ImageStreamImage, out *imageapiv1.ImageStreamImage, s conversion.Scope) error { - return autoconvert_api_ImageStreamImage_To_v1_ImageStreamImage(in, out, s) +func convert_v1_DeploymentConfig_To_api_DeploymentConfig(in *deployapiv1.DeploymentConfig, out *deployapi.DeploymentConfig, s conversion.Scope) error { + return autoconvert_v1_DeploymentConfig_To_api_DeploymentConfig(in, out, s) } -func autoconvert_api_ImageStreamList_To_v1_ImageStreamList(in *imageapi.ImageStreamList, out *imageapiv1.ImageStreamList, s conversion.Scope) error { +func autoconvert_v1_DeploymentConfigList_To_api_DeploymentConfigList(in *deployapiv1.DeploymentConfigList, out *deployapi.DeploymentConfigList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.ImageStreamList))(in) + defaulting.(func(*deployapiv1.DeploymentConfigList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -2882,9 +3123,9 @@ func autoconvert_api_ImageStreamList_To_v1_ImageStreamList(in *imageapi.ImageStr return err } if in.Items != nil { - out.Items = make([]imageapiv1.ImageStream, len(in.Items)) + out.Items = make([]deployapi.DeploymentConfig, len(in.Items)) for i := range in.Items { - if err := convert_api_ImageStream_To_v1_ImageStream(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1_DeploymentConfig_To_api_DeploymentConfig(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -2894,361 +3135,422 @@ func autoconvert_api_ImageStreamList_To_v1_ImageStreamList(in *imageapi.ImageStr return nil } -func convert_api_ImageStreamList_To_v1_ImageStreamList(in *imageapi.ImageStreamList, out *imageapiv1.ImageStreamList, s conversion.Scope) error { - return autoconvert_api_ImageStreamList_To_v1_ImageStreamList(in, out, s) +func convert_v1_DeploymentConfigList_To_api_DeploymentConfigList(in *deployapiv1.DeploymentConfigList, out *deployapi.DeploymentConfigList, s conversion.Scope) error { + return autoconvert_v1_DeploymentConfigList_To_api_DeploymentConfigList(in, out, s) } -func autoconvert_api_ImageStreamMapping_To_v1_ImageStreamMapping(in *imageapi.ImageStreamMapping, out *imageapiv1.ImageStreamMapping, s conversion.Scope) error { +func autoconvert_v1_DeploymentConfigRollback_To_api_DeploymentConfigRollback(in *deployapiv1.DeploymentConfigRollback, out *deployapi.DeploymentConfigRollback, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.ImageStreamMapping))(in) + defaulting.(func(*deployapiv1.DeploymentConfigRollback))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - // in.DockerImageRepository has no peer in out - if err := s.Convert(&in.Image, &out.Image, 0); err != nil { - return err - } - out.Tag = in.Tag - return nil -} - -func autoconvert_api_ImageStreamSpec_To_v1_ImageStreamSpec(in *imageapi.ImageStreamSpec, out *imageapiv1.ImageStreamSpec, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.ImageStreamSpec))(in) - } - out.DockerImageRepository = in.DockerImageRepository - if err := s.Convert(&in.Tags, &out.Tags, 0); err != nil { + if err := convert_v1_DeploymentConfigRollbackSpec_To_api_DeploymentConfigRollbackSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -func autoconvert_api_ImageStreamStatus_To_v1_ImageStreamStatus(in *imageapi.ImageStreamStatus, out *imageapiv1.ImageStreamStatus, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.ImageStreamStatus))(in) - } - out.DockerImageRepository = in.DockerImageRepository - if err := s.Convert(&in.Tags, &out.Tags, 0); err != nil { - return err - } - return nil +func convert_v1_DeploymentConfigRollback_To_api_DeploymentConfigRollback(in *deployapiv1.DeploymentConfigRollback, out *deployapi.DeploymentConfigRollback, s conversion.Scope) error { + return autoconvert_v1_DeploymentConfigRollback_To_api_DeploymentConfigRollback(in, out, s) } -func autoconvert_api_ImageStreamTag_To_v1_ImageStreamTag(in *imageapi.ImageStreamTag, out *imageapiv1.ImageStreamTag, s conversion.Scope) error { +func autoconvert_v1_DeploymentConfigRollbackSpec_To_api_DeploymentConfigRollbackSpec(in *deployapiv1.DeploymentConfigRollbackSpec, out *deployapi.DeploymentConfigRollbackSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.ImageStreamTag))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err - } - if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err + defaulting.(func(*deployapiv1.DeploymentConfigRollbackSpec))(in) } - if err := s.Convert(&in.Image, &out.Image, 0); err != nil { + if err := convert_v1_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil { return err } + out.IncludeTriggers = in.IncludeTriggers + out.IncludeTemplate = in.IncludeTemplate + out.IncludeReplicationMeta = in.IncludeReplicationMeta + out.IncludeStrategy = in.IncludeStrategy return nil } -func convert_api_ImageStreamTag_To_v1_ImageStreamTag(in *imageapi.ImageStreamTag, out *imageapiv1.ImageStreamTag, s conversion.Scope) error { - return autoconvert_api_ImageStreamTag_To_v1_ImageStreamTag(in, out, s) +func convert_v1_DeploymentConfigRollbackSpec_To_api_DeploymentConfigRollbackSpec(in *deployapiv1.DeploymentConfigRollbackSpec, out *deployapi.DeploymentConfigRollbackSpec, s conversion.Scope) error { + return autoconvert_v1_DeploymentConfigRollbackSpec_To_api_DeploymentConfigRollbackSpec(in, out, s) } -func autoconvert_api_ImageStreamTagList_To_v1_ImageStreamTagList(in *imageapi.ImageStreamTagList, out *imageapiv1.ImageStreamTagList, s conversion.Scope) error { +func autoconvert_v1_DeploymentConfigSpec_To_api_DeploymentConfigSpec(in *deployapiv1.DeploymentConfigSpec, out *deployapi.DeploymentConfigSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.ImageStreamTagList))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + defaulting.(func(*deployapiv1.DeploymentConfigSpec))(in) } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + if err := convert_v1_DeploymentStrategy_To_api_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { return err } - if in.Items != nil { - out.Items = make([]imageapiv1.ImageStreamTag, len(in.Items)) - for i := range in.Items { - if err := convert_api_ImageStreamTag_To_v1_ImageStreamTag(&in.Items[i], &out.Items[i], s); err != nil { + if in.Triggers != nil { + out.Triggers = make([]deployapi.DeploymentTriggerPolicy, len(in.Triggers)) + for i := range in.Triggers { + if err := convert_v1_DeploymentTriggerPolicy_To_api_DeploymentTriggerPolicy(&in.Triggers[i], &out.Triggers[i], s); err != nil { return err } } } else { - out.Items = nil + out.Triggers = nil + } + out.Replicas = in.Replicas + if in.Selector != nil { + out.Selector = make(map[string]string) + for key, val := range in.Selector { + out.Selector[key] = val + } + } else { + out.Selector = nil + } + if in.Template != nil { + out.Template = new(pkgapi.PodTemplateSpec) + if err := convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in.Template, out.Template, s); err != nil { + return err + } + } else { + out.Template = nil } return nil } -func convert_api_ImageStreamTagList_To_v1_ImageStreamTagList(in *imageapi.ImageStreamTagList, out *imageapiv1.ImageStreamTagList, s conversion.Scope) error { - return autoconvert_api_ImageStreamTagList_To_v1_ImageStreamTagList(in, out, s) +func convert_v1_DeploymentConfigSpec_To_api_DeploymentConfigSpec(in *deployapiv1.DeploymentConfigSpec, out *deployapi.DeploymentConfigSpec, s conversion.Scope) error { + return autoconvert_v1_DeploymentConfigSpec_To_api_DeploymentConfigSpec(in, out, s) } -func autoconvert_v1_Image_To_api_Image(in *imageapiv1.Image, out *imageapi.Image, s conversion.Scope) error { +func autoconvert_v1_DeploymentConfigStatus_To_api_DeploymentConfigStatus(in *deployapiv1.DeploymentConfigStatus, out *deployapi.DeploymentConfigStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1.Image))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + defaulting.(func(*deployapiv1.DeploymentConfigStatus))(in) } - if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - out.DockerImageReference = in.DockerImageReference - if err := s.Convert(&in.DockerImageMetadata, &out.DockerImageMetadata, 0); err != nil { - return err + out.LatestVersion = in.LatestVersion + if in.Details != nil { + out.Details = new(deployapi.DeploymentDetails) + if err := convert_v1_DeploymentDetails_To_api_DeploymentDetails(in.Details, out.Details, s); err != nil { + return err + } + } else { + out.Details = nil } - out.DockerImageMetadataVersion = in.DockerImageMetadataVersion - out.DockerImageManifest = in.DockerImageManifest return nil } -func autoconvert_v1_ImageList_To_api_ImageList(in *imageapiv1.ImageList, out *imageapi.ImageList, s conversion.Scope) error { +func convert_v1_DeploymentConfigStatus_To_api_DeploymentConfigStatus(in *deployapiv1.DeploymentConfigStatus, out *deployapi.DeploymentConfigStatus, s conversion.Scope) error { + return autoconvert_v1_DeploymentConfigStatus_To_api_DeploymentConfigStatus(in, out, s) +} + +func autoconvert_v1_DeploymentDetails_To_api_DeploymentDetails(in *deployapiv1.DeploymentDetails, out *deployapi.DeploymentDetails, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1.ImageList))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err - } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { - return err + defaulting.(func(*deployapiv1.DeploymentDetails))(in) } - if in.Items != nil { - out.Items = make([]imageapi.Image, len(in.Items)) - for i := range in.Items { - if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { + out.Message = in.Message + if in.Causes != nil { + out.Causes = make([]*deployapi.DeploymentCause, len(in.Causes)) + for i := range in.Causes { + if err := s.Convert(&in.Causes[i], &out.Causes[i], 0); err != nil { return err } } } else { - out.Items = nil + out.Causes = nil } return nil } -func convert_v1_ImageList_To_api_ImageList(in *imageapiv1.ImageList, out *imageapi.ImageList, s conversion.Scope) error { - return autoconvert_v1_ImageList_To_api_ImageList(in, out, s) +func convert_v1_DeploymentDetails_To_api_DeploymentDetails(in *deployapiv1.DeploymentDetails, out *deployapi.DeploymentDetails, s conversion.Scope) error { + return autoconvert_v1_DeploymentDetails_To_api_DeploymentDetails(in, out, s) } -func autoconvert_v1_ImageStream_To_api_ImageStream(in *imageapiv1.ImageStream, out *imageapi.ImageStream, s conversion.Scope) error { +func autoconvert_v1_DeploymentLog_To_api_DeploymentLog(in *deployapiv1.DeploymentLog, out *deployapi.DeploymentLog, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1.ImageStream))(in) + defaulting.(func(*deployapiv1.DeploymentLog))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil { - return err - } - if err := s.Convert(&in.Status, &out.Status, 0); err != nil { - return err - } return nil } -func convert_v1_ImageStream_To_api_ImageStream(in *imageapiv1.ImageStream, out *imageapi.ImageStream, s conversion.Scope) error { - return autoconvert_v1_ImageStream_To_api_ImageStream(in, out, s) +func convert_v1_DeploymentLog_To_api_DeploymentLog(in *deployapiv1.DeploymentLog, out *deployapi.DeploymentLog, s conversion.Scope) error { + return autoconvert_v1_DeploymentLog_To_api_DeploymentLog(in, out, s) } -func autoconvert_v1_ImageStreamImage_To_api_ImageStreamImage(in *imageapiv1.ImageStreamImage, out *imageapi.ImageStreamImage, s conversion.Scope) error { +func autoconvert_v1_DeploymentLogOptions_To_api_DeploymentLogOptions(in *deployapiv1.DeploymentLogOptions, out *deployapi.DeploymentLogOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1.ImageStreamImage))(in) + defaulting.(func(*deployapiv1.DeploymentLogOptions))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err + out.Container = in.Container + out.Follow = in.Follow + out.Previous = in.Previous + if in.SinceSeconds != nil { + out.SinceSeconds = new(int64) + *out.SinceSeconds = *in.SinceSeconds + } else { + out.SinceSeconds = nil } - if err := s.Convert(&in.Image, &out.Image, 0); err != nil { - return err + if in.SinceTime != nil { + if err := s.Convert(&in.SinceTime, &out.SinceTime, 0); err != nil { + return err + } + } else { + out.SinceTime = nil + } + out.Timestamps = in.Timestamps + if in.TailLines != nil { + out.TailLines = new(int64) + *out.TailLines = *in.TailLines + } else { + out.TailLines = nil + } + if in.LimitBytes != nil { + out.LimitBytes = new(int64) + *out.LimitBytes = *in.LimitBytes + } else { + out.LimitBytes = nil + } + out.NoWait = in.NoWait + if in.Version != nil { + out.Version = new(int64) + *out.Version = *in.Version + } else { + out.Version = nil } return nil } -func convert_v1_ImageStreamImage_To_api_ImageStreamImage(in *imageapiv1.ImageStreamImage, out *imageapi.ImageStreamImage, s conversion.Scope) error { - return autoconvert_v1_ImageStreamImage_To_api_ImageStreamImage(in, out, s) +func convert_v1_DeploymentLogOptions_To_api_DeploymentLogOptions(in *deployapiv1.DeploymentLogOptions, out *deployapi.DeploymentLogOptions, s conversion.Scope) error { + return autoconvert_v1_DeploymentLogOptions_To_api_DeploymentLogOptions(in, out, s) } -func autoconvert_v1_ImageStreamList_To_api_ImageStreamList(in *imageapiv1.ImageStreamList, out *imageapi.ImageStreamList, s conversion.Scope) error { +func autoconvert_v1_DeploymentStrategy_To_api_DeploymentStrategy(in *deployapiv1.DeploymentStrategy, out *deployapi.DeploymentStrategy, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1.ImageStreamList))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err - } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { - return err + defaulting.(func(*deployapiv1.DeploymentStrategy))(in) } - if in.Items != nil { - out.Items = make([]imageapi.ImageStream, len(in.Items)) - for i := range in.Items { - if err := convert_v1_ImageStream_To_api_ImageStream(&in.Items[i], &out.Items[i], s); err != nil { - return err - } + out.Type = deployapi.DeploymentStrategyType(in.Type) + if in.CustomParams != nil { + out.CustomParams = new(deployapi.CustomDeploymentStrategyParams) + if err := convert_v1_CustomDeploymentStrategyParams_To_api_CustomDeploymentStrategyParams(in.CustomParams, out.CustomParams, s); err != nil { + return err } } else { - out.Items = nil + out.CustomParams = nil } - return nil -} - -func convert_v1_ImageStreamList_To_api_ImageStreamList(in *imageapiv1.ImageStreamList, out *imageapi.ImageStreamList, s conversion.Scope) error { - return autoconvert_v1_ImageStreamList_To_api_ImageStreamList(in, out, s) -} - -func autoconvert_v1_ImageStreamMapping_To_api_ImageStreamMapping(in *imageapiv1.ImageStreamMapping, out *imageapi.ImageStreamMapping, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1.ImageStreamMapping))(in) + if in.RecreateParams != nil { + out.RecreateParams = new(deployapi.RecreateDeploymentStrategyParams) + if err := convert_v1_RecreateDeploymentStrategyParams_To_api_RecreateDeploymentStrategyParams(in.RecreateParams, out.RecreateParams, s); err != nil { + return err + } + } else { + out.RecreateParams = nil } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + if in.RollingParams != nil { + if err := s.Convert(&in.RollingParams, &out.RollingParams, 0); err != nil { + return err + } + } else { + out.RollingParams = nil } - if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if err := convert_v1_ResourceRequirements_To_api_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { return err } - if err := s.Convert(&in.Image, &out.Image, 0); err != nil { - return err + if in.Labels != nil { + out.Labels = make(map[string]string) + for key, val := range in.Labels { + out.Labels[key] = val + } + } else { + out.Labels = nil + } + if in.Annotations != nil { + out.Annotations = make(map[string]string) + for key, val := range in.Annotations { + out.Annotations[key] = val + } + } else { + out.Annotations = nil } - out.Tag = in.Tag return nil } -func autoconvert_v1_ImageStreamSpec_To_api_ImageStreamSpec(in *imageapiv1.ImageStreamSpec, out *imageapi.ImageStreamSpec, s conversion.Scope) error { +func convert_v1_DeploymentStrategy_To_api_DeploymentStrategy(in *deployapiv1.DeploymentStrategy, out *deployapi.DeploymentStrategy, s conversion.Scope) error { + return autoconvert_v1_DeploymentStrategy_To_api_DeploymentStrategy(in, out, s) +} + +func autoconvert_v1_DeploymentTriggerImageChangeParams_To_api_DeploymentTriggerImageChangeParams(in *deployapiv1.DeploymentTriggerImageChangeParams, out *deployapi.DeploymentTriggerImageChangeParams, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1.ImageStreamSpec))(in) + defaulting.(func(*deployapiv1.DeploymentTriggerImageChangeParams))(in) } - out.DockerImageRepository = in.DockerImageRepository - if err := s.Convert(&in.Tags, &out.Tags, 0); err != nil { + out.Automatic = in.Automatic + if in.ContainerNames != nil { + out.ContainerNames = make([]string, len(in.ContainerNames)) + for i := range in.ContainerNames { + out.ContainerNames[i] = in.ContainerNames[i] + } + } else { + out.ContainerNames = nil + } + if err := convert_v1_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil { return err } + out.LastTriggeredImage = in.LastTriggeredImage return nil } -func autoconvert_v1_ImageStreamStatus_To_api_ImageStreamStatus(in *imageapiv1.ImageStreamStatus, out *imageapi.ImageStreamStatus, s conversion.Scope) error { +func autoconvert_v1_DeploymentTriggerPolicy_To_api_DeploymentTriggerPolicy(in *deployapiv1.DeploymentTriggerPolicy, out *deployapi.DeploymentTriggerPolicy, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1.ImageStreamStatus))(in) + defaulting.(func(*deployapiv1.DeploymentTriggerPolicy))(in) } - out.DockerImageRepository = in.DockerImageRepository - if err := s.Convert(&in.Tags, &out.Tags, 0); err != nil { - return err + out.Type = deployapi.DeploymentTriggerType(in.Type) + if in.ImageChangeParams != nil { + if err := s.Convert(&in.ImageChangeParams, &out.ImageChangeParams, 0); err != nil { + return err + } + } else { + out.ImageChangeParams = nil } return nil } -func autoconvert_v1_ImageStreamTag_To_api_ImageStreamTag(in *imageapiv1.ImageStreamTag, out *imageapi.ImageStreamTag, s conversion.Scope) error { +func convert_v1_DeploymentTriggerPolicy_To_api_DeploymentTriggerPolicy(in *deployapiv1.DeploymentTriggerPolicy, out *deployapi.DeploymentTriggerPolicy, s conversion.Scope) error { + return autoconvert_v1_DeploymentTriggerPolicy_To_api_DeploymentTriggerPolicy(in, out, s) +} + +func autoconvert_v1_ExecNewPodHook_To_api_ExecNewPodHook(in *deployapiv1.ExecNewPodHook, out *deployapi.ExecNewPodHook, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1.ImageStreamTag))(in) + defaulting.(func(*deployapiv1.ExecNewPodHook))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + if in.Command != nil { + out.Command = make([]string, len(in.Command)) + for i := range in.Command { + out.Command[i] = in.Command[i] + } + } else { + out.Command = nil } - if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err + if in.Env != nil { + out.Env = make([]pkgapi.EnvVar, len(in.Env)) + for i := range in.Env { + if err := convert_v1_EnvVar_To_api_EnvVar(&in.Env[i], &out.Env[i], s); err != nil { + return err + } + } + } else { + out.Env = nil } - if err := s.Convert(&in.Image, &out.Image, 0); err != nil { - return err + out.ContainerName = in.ContainerName + if in.Volumes != nil { + out.Volumes = make([]string, len(in.Volumes)) + for i := range in.Volumes { + out.Volumes[i] = in.Volumes[i] + } + } else { + out.Volumes = nil } return nil } -func convert_v1_ImageStreamTag_To_api_ImageStreamTag(in *imageapiv1.ImageStreamTag, out *imageapi.ImageStreamTag, s conversion.Scope) error { - return autoconvert_v1_ImageStreamTag_To_api_ImageStreamTag(in, out, s) +func convert_v1_ExecNewPodHook_To_api_ExecNewPodHook(in *deployapiv1.ExecNewPodHook, out *deployapi.ExecNewPodHook, s conversion.Scope) error { + return autoconvert_v1_ExecNewPodHook_To_api_ExecNewPodHook(in, out, s) } -func autoconvert_v1_ImageStreamTagList_To_api_ImageStreamTagList(in *imageapiv1.ImageStreamTagList, out *imageapi.ImageStreamTagList, s conversion.Scope) error { +func autoconvert_v1_LifecycleHook_To_api_LifecycleHook(in *deployapiv1.LifecycleHook, out *deployapi.LifecycleHook, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1.ImageStreamTagList))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err - } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { - return err + defaulting.(func(*deployapiv1.LifecycleHook))(in) } - if in.Items != nil { - out.Items = make([]imageapi.ImageStreamTag, len(in.Items)) - for i := range in.Items { - if err := convert_v1_ImageStreamTag_To_api_ImageStreamTag(&in.Items[i], &out.Items[i], s); err != nil { - return err - } + out.FailurePolicy = deployapi.LifecycleHookFailurePolicy(in.FailurePolicy) + if in.ExecNewPod != nil { + out.ExecNewPod = new(deployapi.ExecNewPodHook) + if err := convert_v1_ExecNewPodHook_To_api_ExecNewPodHook(in.ExecNewPod, out.ExecNewPod, s); err != nil { + return err } } else { - out.Items = nil + out.ExecNewPod = nil } return nil } -func convert_v1_ImageStreamTagList_To_api_ImageStreamTagList(in *imageapiv1.ImageStreamTagList, out *imageapi.ImageStreamTagList, s conversion.Scope) error { - return autoconvert_v1_ImageStreamTagList_To_api_ImageStreamTagList(in, out, s) +func convert_v1_LifecycleHook_To_api_LifecycleHook(in *deployapiv1.LifecycleHook, out *deployapi.LifecycleHook, s conversion.Scope) error { + return autoconvert_v1_LifecycleHook_To_api_LifecycleHook(in, out, s) } -func autoconvert_api_OAuthAccessToken_To_v1_OAuthAccessToken(in *oauthapi.OAuthAccessToken, out *oauthapiv1.OAuthAccessToken, s conversion.Scope) error { +func autoconvert_v1_RecreateDeploymentStrategyParams_To_api_RecreateDeploymentStrategyParams(in *deployapiv1.RecreateDeploymentStrategyParams, out *deployapi.RecreateDeploymentStrategyParams, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapi.OAuthAccessToken))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + defaulting.(func(*deployapiv1.RecreateDeploymentStrategyParams))(in) } - if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err + if in.Pre != nil { + out.Pre = new(deployapi.LifecycleHook) + if err := convert_v1_LifecycleHook_To_api_LifecycleHook(in.Pre, out.Pre, s); err != nil { + return err + } + } else { + out.Pre = nil } - out.ClientName = in.ClientName - out.ExpiresIn = in.ExpiresIn - if in.Scopes != nil { - out.Scopes = make([]string, len(in.Scopes)) - for i := range in.Scopes { - out.Scopes[i] = in.Scopes[i] + if in.Post != nil { + out.Post = new(deployapi.LifecycleHook) + if err := convert_v1_LifecycleHook_To_api_LifecycleHook(in.Post, out.Post, s); err != nil { + return err } } else { - out.Scopes = nil + out.Post = nil } - out.RedirectURI = in.RedirectURI - out.UserName = in.UserName - out.UserUID = in.UserUID - out.AuthorizeToken = in.AuthorizeToken - out.RefreshToken = in.RefreshToken return nil } -func convert_api_OAuthAccessToken_To_v1_OAuthAccessToken(in *oauthapi.OAuthAccessToken, out *oauthapiv1.OAuthAccessToken, s conversion.Scope) error { - return autoconvert_api_OAuthAccessToken_To_v1_OAuthAccessToken(in, out, s) +func convert_v1_RecreateDeploymentStrategyParams_To_api_RecreateDeploymentStrategyParams(in *deployapiv1.RecreateDeploymentStrategyParams, out *deployapi.RecreateDeploymentStrategyParams, s conversion.Scope) error { + return autoconvert_v1_RecreateDeploymentStrategyParams_To_api_RecreateDeploymentStrategyParams(in, out, s) } -func autoconvert_api_OAuthAccessTokenList_To_v1_OAuthAccessTokenList(in *oauthapi.OAuthAccessTokenList, out *oauthapiv1.OAuthAccessTokenList, s conversion.Scope) error { +func autoconvert_v1_RollingDeploymentStrategyParams_To_api_RollingDeploymentStrategyParams(in *deployapiv1.RollingDeploymentStrategyParams, out *deployapi.RollingDeploymentStrategyParams, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapi.OAuthAccessTokenList))(in) + defaulting.(func(*deployapiv1.RollingDeploymentStrategyParams))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + if in.UpdatePeriodSeconds != nil { + out.UpdatePeriodSeconds = new(int64) + *out.UpdatePeriodSeconds = *in.UpdatePeriodSeconds + } else { + out.UpdatePeriodSeconds = nil } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { - return err + if in.IntervalSeconds != nil { + out.IntervalSeconds = new(int64) + *out.IntervalSeconds = *in.IntervalSeconds + } else { + out.IntervalSeconds = nil } - if in.Items != nil { - out.Items = make([]oauthapiv1.OAuthAccessToken, len(in.Items)) - for i := range in.Items { - if err := convert_api_OAuthAccessToken_To_v1_OAuthAccessToken(&in.Items[i], &out.Items[i], s); err != nil { - return err - } + if in.TimeoutSeconds != nil { + out.TimeoutSeconds = new(int64) + *out.TimeoutSeconds = *in.TimeoutSeconds + } else { + out.TimeoutSeconds = nil + } + // in.MaxUnavailable has no peer in out + // in.MaxSurge has no peer in out + if in.UpdatePercent != nil { + out.UpdatePercent = new(int) + *out.UpdatePercent = *in.UpdatePercent + } else { + out.UpdatePercent = nil + } + if in.Pre != nil { + out.Pre = new(deployapi.LifecycleHook) + if err := convert_v1_LifecycleHook_To_api_LifecycleHook(in.Pre, out.Pre, s); err != nil { + return err } } else { - out.Items = nil + out.Pre = nil + } + if in.Post != nil { + out.Post = new(deployapi.LifecycleHook) + if err := convert_v1_LifecycleHook_To_api_LifecycleHook(in.Post, out.Post, s); err != nil { + return err + } + } else { + out.Post = nil } return nil } -func convert_api_OAuthAccessTokenList_To_v1_OAuthAccessTokenList(in *oauthapi.OAuthAccessTokenList, out *oauthapiv1.OAuthAccessTokenList, s conversion.Scope) error { - return autoconvert_api_OAuthAccessTokenList_To_v1_OAuthAccessTokenList(in, out, s) -} - -func autoconvert_api_OAuthAuthorizeToken_To_v1_OAuthAuthorizeToken(in *oauthapi.OAuthAuthorizeToken, out *oauthapiv1.OAuthAuthorizeToken, s conversion.Scope) error { +func autoconvert_api_Image_To_v1_Image(in *imageapi.Image, out *imageapiv1.Image, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapi.OAuthAuthorizeToken))(in) + defaulting.(func(*imageapi.Image))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3256,30 +3558,18 @@ func autoconvert_api_OAuthAuthorizeToken_To_v1_OAuthAuthorizeToken(in *oauthapi. if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.ClientName = in.ClientName - out.ExpiresIn = in.ExpiresIn - if in.Scopes != nil { - out.Scopes = make([]string, len(in.Scopes)) - for i := range in.Scopes { - out.Scopes[i] = in.Scopes[i] - } - } else { - out.Scopes = nil + out.DockerImageReference = in.DockerImageReference + if err := s.Convert(&in.DockerImageMetadata, &out.DockerImageMetadata, 0); err != nil { + return err } - out.RedirectURI = in.RedirectURI - out.State = in.State - out.UserName = in.UserName - out.UserUID = in.UserUID + out.DockerImageMetadataVersion = in.DockerImageMetadataVersion + out.DockerImageManifest = in.DockerImageManifest return nil } -func convert_api_OAuthAuthorizeToken_To_v1_OAuthAuthorizeToken(in *oauthapi.OAuthAuthorizeToken, out *oauthapiv1.OAuthAuthorizeToken, s conversion.Scope) error { - return autoconvert_api_OAuthAuthorizeToken_To_v1_OAuthAuthorizeToken(in, out, s) -} - -func autoconvert_api_OAuthAuthorizeTokenList_To_v1_OAuthAuthorizeTokenList(in *oauthapi.OAuthAuthorizeTokenList, out *oauthapiv1.OAuthAuthorizeTokenList, s conversion.Scope) error { +func autoconvert_api_ImageList_To_v1_ImageList(in *imageapi.ImageList, out *imageapiv1.ImageList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapi.OAuthAuthorizeTokenList))(in) + defaulting.(func(*imageapi.ImageList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3288,9 +3578,9 @@ func autoconvert_api_OAuthAuthorizeTokenList_To_v1_OAuthAuthorizeTokenList(in *o return err } if in.Items != nil { - out.Items = make([]oauthapiv1.OAuthAuthorizeToken, len(in.Items)) + out.Items = make([]imageapiv1.Image, len(in.Items)) for i := range in.Items { - if err := convert_api_OAuthAuthorizeToken_To_v1_OAuthAuthorizeToken(&in.Items[i], &out.Items[i], s); err != nil { + if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { return err } } @@ -3300,13 +3590,13 @@ func autoconvert_api_OAuthAuthorizeTokenList_To_v1_OAuthAuthorizeTokenList(in *o return nil } -func convert_api_OAuthAuthorizeTokenList_To_v1_OAuthAuthorizeTokenList(in *oauthapi.OAuthAuthorizeTokenList, out *oauthapiv1.OAuthAuthorizeTokenList, s conversion.Scope) error { - return autoconvert_api_OAuthAuthorizeTokenList_To_v1_OAuthAuthorizeTokenList(in, out, s) +func convert_api_ImageList_To_v1_ImageList(in *imageapi.ImageList, out *imageapiv1.ImageList, s conversion.Scope) error { + return autoconvert_api_ImageList_To_v1_ImageList(in, out, s) } -func autoconvert_api_OAuthClient_To_v1_OAuthClient(in *oauthapi.OAuthClient, out *oauthapiv1.OAuthClient, s conversion.Scope) error { +func autoconvert_api_ImageStream_To_v1_ImageStream(in *imageapi.ImageStream, out *imageapiv1.ImageStream, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapi.OAuthClient))(in) + defaulting.(func(*imageapi.ImageStream))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3314,26 +3604,22 @@ func autoconvert_api_OAuthClient_To_v1_OAuthClient(in *oauthapi.OAuthClient, out if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.Secret = in.Secret - out.RespondWithChallenges = in.RespondWithChallenges - if in.RedirectURIs != nil { - out.RedirectURIs = make([]string, len(in.RedirectURIs)) - for i := range in.RedirectURIs { - out.RedirectURIs[i] = in.RedirectURIs[i] - } - } else { - out.RedirectURIs = nil + if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil { + return err + } + if err := s.Convert(&in.Status, &out.Status, 0); err != nil { + return err } return nil } -func convert_api_OAuthClient_To_v1_OAuthClient(in *oauthapi.OAuthClient, out *oauthapiv1.OAuthClient, s conversion.Scope) error { - return autoconvert_api_OAuthClient_To_v1_OAuthClient(in, out, s) +func convert_api_ImageStream_To_v1_ImageStream(in *imageapi.ImageStream, out *imageapiv1.ImageStream, s conversion.Scope) error { + return autoconvert_api_ImageStream_To_v1_ImageStream(in, out, s) } -func autoconvert_api_OAuthClientAuthorization_To_v1_OAuthClientAuthorization(in *oauthapi.OAuthClientAuthorization, out *oauthapiv1.OAuthClientAuthorization, s conversion.Scope) error { +func autoconvert_api_ImageStreamImage_To_v1_ImageStreamImage(in *imageapi.ImageStreamImage, out *imageapiv1.ImageStreamImage, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapi.OAuthClientAuthorization))(in) + defaulting.(func(*imageapi.ImageStreamImage))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3341,27 +3627,19 @@ func autoconvert_api_OAuthClientAuthorization_To_v1_OAuthClientAuthorization(in if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.ClientName = in.ClientName - out.UserName = in.UserName - out.UserUID = in.UserUID - if in.Scopes != nil { - out.Scopes = make([]string, len(in.Scopes)) - for i := range in.Scopes { - out.Scopes[i] = in.Scopes[i] - } - } else { - out.Scopes = nil + if err := s.Convert(&in.Image, &out.Image, 0); err != nil { + return err } return nil } -func convert_api_OAuthClientAuthorization_To_v1_OAuthClientAuthorization(in *oauthapi.OAuthClientAuthorization, out *oauthapiv1.OAuthClientAuthorization, s conversion.Scope) error { - return autoconvert_api_OAuthClientAuthorization_To_v1_OAuthClientAuthorization(in, out, s) +func convert_api_ImageStreamImage_To_v1_ImageStreamImage(in *imageapi.ImageStreamImage, out *imageapiv1.ImageStreamImage, s conversion.Scope) error { + return autoconvert_api_ImageStreamImage_To_v1_ImageStreamImage(in, out, s) } -func autoconvert_api_OAuthClientAuthorizationList_To_v1_OAuthClientAuthorizationList(in *oauthapi.OAuthClientAuthorizationList, out *oauthapiv1.OAuthClientAuthorizationList, s conversion.Scope) error { +func autoconvert_api_ImageStreamList_To_v1_ImageStreamList(in *imageapi.ImageStreamList, out *imageapiv1.ImageStreamList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapi.OAuthClientAuthorizationList))(in) + defaulting.(func(*imageapi.ImageStreamList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3370,9 +3648,9 @@ func autoconvert_api_OAuthClientAuthorizationList_To_v1_OAuthClientAuthorization return err } if in.Items != nil { - out.Items = make([]oauthapiv1.OAuthClientAuthorization, len(in.Items)) + out.Items = make([]imageapiv1.ImageStream, len(in.Items)) for i := range in.Items { - if err := convert_api_OAuthClientAuthorization_To_v1_OAuthClientAuthorization(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_api_ImageStream_To_v1_ImageStream(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3382,72 +3660,73 @@ func autoconvert_api_OAuthClientAuthorizationList_To_v1_OAuthClientAuthorization return nil } -func convert_api_OAuthClientAuthorizationList_To_v1_OAuthClientAuthorizationList(in *oauthapi.OAuthClientAuthorizationList, out *oauthapiv1.OAuthClientAuthorizationList, s conversion.Scope) error { - return autoconvert_api_OAuthClientAuthorizationList_To_v1_OAuthClientAuthorizationList(in, out, s) +func convert_api_ImageStreamList_To_v1_ImageStreamList(in *imageapi.ImageStreamList, out *imageapiv1.ImageStreamList, s conversion.Scope) error { + return autoconvert_api_ImageStreamList_To_v1_ImageStreamList(in, out, s) } -func autoconvert_api_OAuthClientList_To_v1_OAuthClientList(in *oauthapi.OAuthClientList, out *oauthapiv1.OAuthClientList, s conversion.Scope) error { +func autoconvert_api_ImageStreamMapping_To_v1_ImageStreamMapping(in *imageapi.ImageStreamMapping, out *imageapiv1.ImageStreamMapping, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapi.OAuthClientList))(in) + defaulting.(func(*imageapi.ImageStreamMapping))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if in.Items != nil { - out.Items = make([]oauthapiv1.OAuthClient, len(in.Items)) - for i := range in.Items { - if err := convert_api_OAuthClient_To_v1_OAuthClient(&in.Items[i], &out.Items[i], s); err != nil { - return err - } - } - } else { - out.Items = nil + // in.DockerImageRepository has no peer in out + if err := s.Convert(&in.Image, &out.Image, 0); err != nil { + return err } + out.Tag = in.Tag return nil } -func convert_api_OAuthClientList_To_v1_OAuthClientList(in *oauthapi.OAuthClientList, out *oauthapiv1.OAuthClientList, s conversion.Scope) error { - return autoconvert_api_OAuthClientList_To_v1_OAuthClientList(in, out, s) +func autoconvert_api_ImageStreamSpec_To_v1_ImageStreamSpec(in *imageapi.ImageStreamSpec, out *imageapiv1.ImageStreamSpec, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*imageapi.ImageStreamSpec))(in) + } + out.DockerImageRepository = in.DockerImageRepository + if err := s.Convert(&in.Tags, &out.Tags, 0); err != nil { + return err + } + return nil } -func autoconvert_v1_OAuthAccessToken_To_api_OAuthAccessToken(in *oauthapiv1.OAuthAccessToken, out *oauthapi.OAuthAccessToken, s conversion.Scope) error { +func autoconvert_api_ImageStreamStatus_To_v1_ImageStreamStatus(in *imageapi.ImageStreamStatus, out *imageapiv1.ImageStreamStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapiv1.OAuthAccessToken))(in) + defaulting.(func(*imageapi.ImageStreamStatus))(in) + } + out.DockerImageRepository = in.DockerImageRepository + if err := s.Convert(&in.Tags, &out.Tags, 0); err != nil { + return err + } + return nil +} + +func autoconvert_api_ImageStreamTag_To_v1_ImageStreamTag(in *imageapi.ImageStreamTag, out *imageapiv1.ImageStreamTag, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*imageapi.ImageStreamTag))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.ClientName = in.ClientName - out.ExpiresIn = in.ExpiresIn - if in.Scopes != nil { - out.Scopes = make([]string, len(in.Scopes)) - for i := range in.Scopes { - out.Scopes[i] = in.Scopes[i] - } - } else { - out.Scopes = nil + if err := s.Convert(&in.Image, &out.Image, 0); err != nil { + return err } - out.RedirectURI = in.RedirectURI - out.UserName = in.UserName - out.UserUID = in.UserUID - out.AuthorizeToken = in.AuthorizeToken - out.RefreshToken = in.RefreshToken return nil } -func convert_v1_OAuthAccessToken_To_api_OAuthAccessToken(in *oauthapiv1.OAuthAccessToken, out *oauthapi.OAuthAccessToken, s conversion.Scope) error { - return autoconvert_v1_OAuthAccessToken_To_api_OAuthAccessToken(in, out, s) +func convert_api_ImageStreamTag_To_v1_ImageStreamTag(in *imageapi.ImageStreamTag, out *imageapiv1.ImageStreamTag, s conversion.Scope) error { + return autoconvert_api_ImageStreamTag_To_v1_ImageStreamTag(in, out, s) } -func autoconvert_v1_OAuthAccessTokenList_To_api_OAuthAccessTokenList(in *oauthapiv1.OAuthAccessTokenList, out *oauthapi.OAuthAccessTokenList, s conversion.Scope) error { +func autoconvert_api_ImageStreamTagList_To_v1_ImageStreamTagList(in *imageapi.ImageStreamTagList, out *imageapiv1.ImageStreamTagList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapiv1.OAuthAccessTokenList))(in) + defaulting.(func(*imageapi.ImageStreamTagList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3456,9 +3735,9 @@ func autoconvert_v1_OAuthAccessTokenList_To_api_OAuthAccessTokenList(in *oauthap return err } if in.Items != nil { - out.Items = make([]oauthapi.OAuthAccessToken, len(in.Items)) + out.Items = make([]imageapiv1.ImageStreamTag, len(in.Items)) for i := range in.Items { - if err := convert_v1_OAuthAccessToken_To_api_OAuthAccessToken(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_api_ImageStreamTag_To_v1_ImageStreamTag(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3468,13 +3747,13 @@ func autoconvert_v1_OAuthAccessTokenList_To_api_OAuthAccessTokenList(in *oauthap return nil } -func convert_v1_OAuthAccessTokenList_To_api_OAuthAccessTokenList(in *oauthapiv1.OAuthAccessTokenList, out *oauthapi.OAuthAccessTokenList, s conversion.Scope) error { - return autoconvert_v1_OAuthAccessTokenList_To_api_OAuthAccessTokenList(in, out, s) +func convert_api_ImageStreamTagList_To_v1_ImageStreamTagList(in *imageapi.ImageStreamTagList, out *imageapiv1.ImageStreamTagList, s conversion.Scope) error { + return autoconvert_api_ImageStreamTagList_To_v1_ImageStreamTagList(in, out, s) } -func autoconvert_v1_OAuthAuthorizeToken_To_api_OAuthAuthorizeToken(in *oauthapiv1.OAuthAuthorizeToken, out *oauthapi.OAuthAuthorizeToken, s conversion.Scope) error { +func autoconvert_v1_Image_To_api_Image(in *imageapiv1.Image, out *imageapi.Image, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapiv1.OAuthAuthorizeToken))(in) + defaulting.(func(*imageapiv1.Image))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3482,30 +3761,18 @@ func autoconvert_v1_OAuthAuthorizeToken_To_api_OAuthAuthorizeToken(in *oauthapiv if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.ClientName = in.ClientName - out.ExpiresIn = in.ExpiresIn - if in.Scopes != nil { - out.Scopes = make([]string, len(in.Scopes)) - for i := range in.Scopes { - out.Scopes[i] = in.Scopes[i] - } - } else { - out.Scopes = nil + out.DockerImageReference = in.DockerImageReference + if err := s.Convert(&in.DockerImageMetadata, &out.DockerImageMetadata, 0); err != nil { + return err } - out.RedirectURI = in.RedirectURI - out.State = in.State - out.UserName = in.UserName - out.UserUID = in.UserUID + out.DockerImageMetadataVersion = in.DockerImageMetadataVersion + out.DockerImageManifest = in.DockerImageManifest return nil } -func convert_v1_OAuthAuthorizeToken_To_api_OAuthAuthorizeToken(in *oauthapiv1.OAuthAuthorizeToken, out *oauthapi.OAuthAuthorizeToken, s conversion.Scope) error { - return autoconvert_v1_OAuthAuthorizeToken_To_api_OAuthAuthorizeToken(in, out, s) -} - -func autoconvert_v1_OAuthAuthorizeTokenList_To_api_OAuthAuthorizeTokenList(in *oauthapiv1.OAuthAuthorizeTokenList, out *oauthapi.OAuthAuthorizeTokenList, s conversion.Scope) error { +func autoconvert_v1_ImageList_To_api_ImageList(in *imageapiv1.ImageList, out *imageapi.ImageList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapiv1.OAuthAuthorizeTokenList))(in) + defaulting.(func(*imageapiv1.ImageList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3514,9 +3781,9 @@ func autoconvert_v1_OAuthAuthorizeTokenList_To_api_OAuthAuthorizeTokenList(in *o return err } if in.Items != nil { - out.Items = make([]oauthapi.OAuthAuthorizeToken, len(in.Items)) + out.Items = make([]imageapi.Image, len(in.Items)) for i := range in.Items { - if err := convert_v1_OAuthAuthorizeToken_To_api_OAuthAuthorizeToken(&in.Items[i], &out.Items[i], s); err != nil { + if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { return err } } @@ -3526,13 +3793,13 @@ func autoconvert_v1_OAuthAuthorizeTokenList_To_api_OAuthAuthorizeTokenList(in *o return nil } -func convert_v1_OAuthAuthorizeTokenList_To_api_OAuthAuthorizeTokenList(in *oauthapiv1.OAuthAuthorizeTokenList, out *oauthapi.OAuthAuthorizeTokenList, s conversion.Scope) error { - return autoconvert_v1_OAuthAuthorizeTokenList_To_api_OAuthAuthorizeTokenList(in, out, s) +func convert_v1_ImageList_To_api_ImageList(in *imageapiv1.ImageList, out *imageapi.ImageList, s conversion.Scope) error { + return autoconvert_v1_ImageList_To_api_ImageList(in, out, s) } -func autoconvert_v1_OAuthClient_To_api_OAuthClient(in *oauthapiv1.OAuthClient, out *oauthapi.OAuthClient, s conversion.Scope) error { +func autoconvert_v1_ImageStream_To_api_ImageStream(in *imageapiv1.ImageStream, out *imageapi.ImageStream, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapiv1.OAuthClient))(in) + defaulting.(func(*imageapiv1.ImageStream))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3540,26 +3807,22 @@ func autoconvert_v1_OAuthClient_To_api_OAuthClient(in *oauthapiv1.OAuthClient, o if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.Secret = in.Secret - out.RespondWithChallenges = in.RespondWithChallenges - if in.RedirectURIs != nil { - out.RedirectURIs = make([]string, len(in.RedirectURIs)) - for i := range in.RedirectURIs { - out.RedirectURIs[i] = in.RedirectURIs[i] - } - } else { - out.RedirectURIs = nil + if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil { + return err + } + if err := s.Convert(&in.Status, &out.Status, 0); err != nil { + return err } return nil } -func convert_v1_OAuthClient_To_api_OAuthClient(in *oauthapiv1.OAuthClient, out *oauthapi.OAuthClient, s conversion.Scope) error { - return autoconvert_v1_OAuthClient_To_api_OAuthClient(in, out, s) +func convert_v1_ImageStream_To_api_ImageStream(in *imageapiv1.ImageStream, out *imageapi.ImageStream, s conversion.Scope) error { + return autoconvert_v1_ImageStream_To_api_ImageStream(in, out, s) } -func autoconvert_v1_OAuthClientAuthorization_To_api_OAuthClientAuthorization(in *oauthapiv1.OAuthClientAuthorization, out *oauthapi.OAuthClientAuthorization, s conversion.Scope) error { +func autoconvert_v1_ImageStreamImage_To_api_ImageStreamImage(in *imageapiv1.ImageStreamImage, out *imageapi.ImageStreamImage, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapiv1.OAuthClientAuthorization))(in) + defaulting.(func(*imageapiv1.ImageStreamImage))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3567,27 +3830,19 @@ func autoconvert_v1_OAuthClientAuthorization_To_api_OAuthClientAuthorization(in if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.ClientName = in.ClientName - out.UserName = in.UserName - out.UserUID = in.UserUID - if in.Scopes != nil { - out.Scopes = make([]string, len(in.Scopes)) - for i := range in.Scopes { - out.Scopes[i] = in.Scopes[i] - } - } else { - out.Scopes = nil + if err := s.Convert(&in.Image, &out.Image, 0); err != nil { + return err } return nil } -func convert_v1_OAuthClientAuthorization_To_api_OAuthClientAuthorization(in *oauthapiv1.OAuthClientAuthorization, out *oauthapi.OAuthClientAuthorization, s conversion.Scope) error { - return autoconvert_v1_OAuthClientAuthorization_To_api_OAuthClientAuthorization(in, out, s) +func convert_v1_ImageStreamImage_To_api_ImageStreamImage(in *imageapiv1.ImageStreamImage, out *imageapi.ImageStreamImage, s conversion.Scope) error { + return autoconvert_v1_ImageStreamImage_To_api_ImageStreamImage(in, out, s) } -func autoconvert_v1_OAuthClientAuthorizationList_To_api_OAuthClientAuthorizationList(in *oauthapiv1.OAuthClientAuthorizationList, out *oauthapi.OAuthClientAuthorizationList, s conversion.Scope) error { +func autoconvert_v1_ImageStreamList_To_api_ImageStreamList(in *imageapiv1.ImageStreamList, out *imageapi.ImageStreamList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapiv1.OAuthClientAuthorizationList))(in) + defaulting.(func(*imageapiv1.ImageStreamList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3596,9 +3851,9 @@ func autoconvert_v1_OAuthClientAuthorizationList_To_api_OAuthClientAuthorization return err } if in.Items != nil { - out.Items = make([]oauthapi.OAuthClientAuthorization, len(in.Items)) + out.Items = make([]imageapi.ImageStream, len(in.Items)) for i := range in.Items { - if err := convert_v1_OAuthClientAuthorization_To_api_OAuthClientAuthorization(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1_ImageStream_To_api_ImageStream(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3608,63 +3863,72 @@ func autoconvert_v1_OAuthClientAuthorizationList_To_api_OAuthClientAuthorization return nil } -func convert_v1_OAuthClientAuthorizationList_To_api_OAuthClientAuthorizationList(in *oauthapiv1.OAuthClientAuthorizationList, out *oauthapi.OAuthClientAuthorizationList, s conversion.Scope) error { - return autoconvert_v1_OAuthClientAuthorizationList_To_api_OAuthClientAuthorizationList(in, out, s) +func convert_v1_ImageStreamList_To_api_ImageStreamList(in *imageapiv1.ImageStreamList, out *imageapi.ImageStreamList, s conversion.Scope) error { + return autoconvert_v1_ImageStreamList_To_api_ImageStreamList(in, out, s) } -func autoconvert_v1_OAuthClientList_To_api_OAuthClientList(in *oauthapiv1.OAuthClientList, out *oauthapi.OAuthClientList, s conversion.Scope) error { +func autoconvert_v1_ImageStreamMapping_To_api_ImageStreamMapping(in *imageapiv1.ImageStreamMapping, out *imageapi.ImageStreamMapping, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapiv1.OAuthClientList))(in) + defaulting.(func(*imageapiv1.ImageStreamMapping))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if in.Items != nil { - out.Items = make([]oauthapi.OAuthClient, len(in.Items)) - for i := range in.Items { - if err := convert_v1_OAuthClient_To_api_OAuthClient(&in.Items[i], &out.Items[i], s); err != nil { - return err - } - } - } else { - out.Items = nil + if err := s.Convert(&in.Image, &out.Image, 0); err != nil { + return err } + out.Tag = in.Tag return nil } -func convert_v1_OAuthClientList_To_api_OAuthClientList(in *oauthapiv1.OAuthClientList, out *oauthapi.OAuthClientList, s conversion.Scope) error { - return autoconvert_v1_OAuthClientList_To_api_OAuthClientList(in, out, s) +func autoconvert_v1_ImageStreamSpec_To_api_ImageStreamSpec(in *imageapiv1.ImageStreamSpec, out *imageapi.ImageStreamSpec, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*imageapiv1.ImageStreamSpec))(in) + } + out.DockerImageRepository = in.DockerImageRepository + if err := s.Convert(&in.Tags, &out.Tags, 0); err != nil { + return err + } + return nil } -func autoconvert_api_Project_To_v1_Project(in *projectapi.Project, out *projectapiv1.Project, s conversion.Scope) error { +func autoconvert_v1_ImageStreamStatus_To_api_ImageStreamStatus(in *imageapiv1.ImageStreamStatus, out *imageapi.ImageStreamStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapi.Project))(in) + defaulting.(func(*imageapiv1.ImageStreamStatus))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + out.DockerImageRepository = in.DockerImageRepository + if err := s.Convert(&in.Tags, &out.Tags, 0); err != nil { return err } - if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return nil +} + +func autoconvert_v1_ImageStreamTag_To_api_ImageStreamTag(in *imageapiv1.ImageStreamTag, out *imageapi.ImageStreamTag, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*imageapiv1.ImageStreamTag))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_api_ProjectSpec_To_v1_ProjectSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_api_ProjectStatus_To_v1_ProjectStatus(&in.Status, &out.Status, s); err != nil { + if err := s.Convert(&in.Image, &out.Image, 0); err != nil { return err } return nil } -func convert_api_Project_To_v1_Project(in *projectapi.Project, out *projectapiv1.Project, s conversion.Scope) error { - return autoconvert_api_Project_To_v1_Project(in, out, s) +func convert_v1_ImageStreamTag_To_api_ImageStreamTag(in *imageapiv1.ImageStreamTag, out *imageapi.ImageStreamTag, s conversion.Scope) error { + return autoconvert_v1_ImageStreamTag_To_api_ImageStreamTag(in, out, s) } -func autoconvert_api_ProjectList_To_v1_ProjectList(in *projectapi.ProjectList, out *projectapiv1.ProjectList, s conversion.Scope) error { +func autoconvert_v1_ImageStreamTagList_To_api_ImageStreamTagList(in *imageapiv1.ImageStreamTagList, out *imageapi.ImageStreamTagList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapi.ProjectList))(in) + defaulting.(func(*imageapiv1.ImageStreamTagList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3673,9 +3937,9 @@ func autoconvert_api_ProjectList_To_v1_ProjectList(in *projectapi.ProjectList, o return err } if in.Items != nil { - out.Items = make([]projectapiv1.Project, len(in.Items)) + out.Items = make([]imageapi.ImageStreamTag, len(in.Items)) for i := range in.Items { - if err := convert_api_Project_To_v1_Project(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1_ImageStreamTag_To_api_ImageStreamTag(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3685,13 +3949,13 @@ func autoconvert_api_ProjectList_To_v1_ProjectList(in *projectapi.ProjectList, o return nil } -func convert_api_ProjectList_To_v1_ProjectList(in *projectapi.ProjectList, out *projectapiv1.ProjectList, s conversion.Scope) error { - return autoconvert_api_ProjectList_To_v1_ProjectList(in, out, s) +func convert_v1_ImageStreamTagList_To_api_ImageStreamTagList(in *imageapiv1.ImageStreamTagList, out *imageapi.ImageStreamTagList, s conversion.Scope) error { + return autoconvert_v1_ImageStreamTagList_To_api_ImageStreamTagList(in, out, s) } -func autoconvert_api_ProjectRequest_To_v1_ProjectRequest(in *projectapi.ProjectRequest, out *projectapiv1.ProjectRequest, s conversion.Scope) error { +func autoconvert_api_OAuthAccessToken_To_v1_OAuthAccessToken(in *oauthapi.OAuthAccessToken, out *oauthapiv1.OAuthAccessToken, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapi.ProjectRequest))(in) + defaulting.(func(*oauthapi.OAuthAccessToken))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3699,72 +3963,89 @@ func autoconvert_api_ProjectRequest_To_v1_ProjectRequest(in *projectapi.ProjectR if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.DisplayName = in.DisplayName - out.Description = in.Description + out.ClientName = in.ClientName + out.ExpiresIn = in.ExpiresIn + if in.Scopes != nil { + out.Scopes = make([]string, len(in.Scopes)) + for i := range in.Scopes { + out.Scopes[i] = in.Scopes[i] + } + } else { + out.Scopes = nil + } + out.RedirectURI = in.RedirectURI + out.UserName = in.UserName + out.UserUID = in.UserUID + out.AuthorizeToken = in.AuthorizeToken + out.RefreshToken = in.RefreshToken return nil } -func convert_api_ProjectRequest_To_v1_ProjectRequest(in *projectapi.ProjectRequest, out *projectapiv1.ProjectRequest, s conversion.Scope) error { - return autoconvert_api_ProjectRequest_To_v1_ProjectRequest(in, out, s) +func convert_api_OAuthAccessToken_To_v1_OAuthAccessToken(in *oauthapi.OAuthAccessToken, out *oauthapiv1.OAuthAccessToken, s conversion.Scope) error { + return autoconvert_api_OAuthAccessToken_To_v1_OAuthAccessToken(in, out, s) } -func autoconvert_api_ProjectSpec_To_v1_ProjectSpec(in *projectapi.ProjectSpec, out *projectapiv1.ProjectSpec, s conversion.Scope) error { +func autoconvert_api_OAuthAccessTokenList_To_v1_OAuthAccessTokenList(in *oauthapi.OAuthAccessTokenList, out *oauthapiv1.OAuthAccessTokenList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapi.ProjectSpec))(in) + defaulting.(func(*oauthapi.OAuthAccessTokenList))(in) } - if in.Finalizers != nil { - out.Finalizers = make([]pkgapiv1.FinalizerName, len(in.Finalizers)) - for i := range in.Finalizers { - out.Finalizers[i] = pkgapiv1.FinalizerName(in.Finalizers[i]) + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]oauthapiv1.OAuthAccessToken, len(in.Items)) + for i := range in.Items { + if err := convert_api_OAuthAccessToken_To_v1_OAuthAccessToken(&in.Items[i], &out.Items[i], s); err != nil { + return err + } } } else { - out.Finalizers = nil - } - return nil -} - -func convert_api_ProjectSpec_To_v1_ProjectSpec(in *projectapi.ProjectSpec, out *projectapiv1.ProjectSpec, s conversion.Scope) error { - return autoconvert_api_ProjectSpec_To_v1_ProjectSpec(in, out, s) -} - -func autoconvert_api_ProjectStatus_To_v1_ProjectStatus(in *projectapi.ProjectStatus, out *projectapiv1.ProjectStatus, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapi.ProjectStatus))(in) + out.Items = nil } - out.Phase = pkgapiv1.NamespacePhase(in.Phase) return nil } -func convert_api_ProjectStatus_To_v1_ProjectStatus(in *projectapi.ProjectStatus, out *projectapiv1.ProjectStatus, s conversion.Scope) error { - return autoconvert_api_ProjectStatus_To_v1_ProjectStatus(in, out, s) +func convert_api_OAuthAccessTokenList_To_v1_OAuthAccessTokenList(in *oauthapi.OAuthAccessTokenList, out *oauthapiv1.OAuthAccessTokenList, s conversion.Scope) error { + return autoconvert_api_OAuthAccessTokenList_To_v1_OAuthAccessTokenList(in, out, s) } -func autoconvert_v1_Project_To_api_Project(in *projectapiv1.Project, out *projectapi.Project, s conversion.Scope) error { +func autoconvert_api_OAuthAuthorizeToken_To_v1_OAuthAuthorizeToken(in *oauthapi.OAuthAuthorizeToken, out *oauthapiv1.OAuthAuthorizeToken, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapiv1.Project))(in) + defaulting.(func(*oauthapi.OAuthAuthorizeToken))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - if err := convert_v1_ProjectSpec_To_api_ProjectSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_v1_ProjectStatus_To_api_ProjectStatus(&in.Status, &out.Status, s); err != nil { - return err + out.ClientName = in.ClientName + out.ExpiresIn = in.ExpiresIn + if in.Scopes != nil { + out.Scopes = make([]string, len(in.Scopes)) + for i := range in.Scopes { + out.Scopes[i] = in.Scopes[i] + } + } else { + out.Scopes = nil } + out.RedirectURI = in.RedirectURI + out.State = in.State + out.UserName = in.UserName + out.UserUID = in.UserUID return nil } -func convert_v1_Project_To_api_Project(in *projectapiv1.Project, out *projectapi.Project, s conversion.Scope) error { - return autoconvert_v1_Project_To_api_Project(in, out, s) +func convert_api_OAuthAuthorizeToken_To_v1_OAuthAuthorizeToken(in *oauthapi.OAuthAuthorizeToken, out *oauthapiv1.OAuthAuthorizeToken, s conversion.Scope) error { + return autoconvert_api_OAuthAuthorizeToken_To_v1_OAuthAuthorizeToken(in, out, s) } -func autoconvert_v1_ProjectList_To_api_ProjectList(in *projectapiv1.ProjectList, out *projectapi.ProjectList, s conversion.Scope) error { +func autoconvert_api_OAuthAuthorizeTokenList_To_v1_OAuthAuthorizeTokenList(in *oauthapi.OAuthAuthorizeTokenList, out *oauthapiv1.OAuthAuthorizeTokenList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapiv1.ProjectList))(in) + defaulting.(func(*oauthapi.OAuthAuthorizeTokenList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3773,9 +4054,9 @@ func autoconvert_v1_ProjectList_To_api_ProjectList(in *projectapiv1.ProjectList, return err } if in.Items != nil { - out.Items = make([]projectapi.Project, len(in.Items)) + out.Items = make([]oauthapiv1.OAuthAuthorizeToken, len(in.Items)) for i := range in.Items { - if err := convert_v1_Project_To_api_Project(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_api_OAuthAuthorizeToken_To_v1_OAuthAuthorizeToken(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3785,86 +4066,95 @@ func autoconvert_v1_ProjectList_To_api_ProjectList(in *projectapiv1.ProjectList, return nil } -func convert_v1_ProjectList_To_api_ProjectList(in *projectapiv1.ProjectList, out *projectapi.ProjectList, s conversion.Scope) error { - return autoconvert_v1_ProjectList_To_api_ProjectList(in, out, s) +func convert_api_OAuthAuthorizeTokenList_To_v1_OAuthAuthorizeTokenList(in *oauthapi.OAuthAuthorizeTokenList, out *oauthapiv1.OAuthAuthorizeTokenList, s conversion.Scope) error { + return autoconvert_api_OAuthAuthorizeTokenList_To_v1_OAuthAuthorizeTokenList(in, out, s) } -func autoconvert_v1_ProjectRequest_To_api_ProjectRequest(in *projectapiv1.ProjectRequest, out *projectapi.ProjectRequest, s conversion.Scope) error { +func autoconvert_api_OAuthClient_To_v1_OAuthClient(in *oauthapi.OAuthClient, out *oauthapiv1.OAuthClient, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapiv1.ProjectRequest))(in) + defaulting.(func(*oauthapi.OAuthClient))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.DisplayName = in.DisplayName - out.Description = in.Description - return nil -} - -func convert_v1_ProjectRequest_To_api_ProjectRequest(in *projectapiv1.ProjectRequest, out *projectapi.ProjectRequest, s conversion.Scope) error { - return autoconvert_v1_ProjectRequest_To_api_ProjectRequest(in, out, s) -} - -func autoconvert_v1_ProjectSpec_To_api_ProjectSpec(in *projectapiv1.ProjectSpec, out *projectapi.ProjectSpec, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapiv1.ProjectSpec))(in) - } - if in.Finalizers != nil { - out.Finalizers = make([]pkgapi.FinalizerName, len(in.Finalizers)) - for i := range in.Finalizers { - out.Finalizers[i] = pkgapi.FinalizerName(in.Finalizers[i]) + out.Secret = in.Secret + out.RespondWithChallenges = in.RespondWithChallenges + if in.RedirectURIs != nil { + out.RedirectURIs = make([]string, len(in.RedirectURIs)) + for i := range in.RedirectURIs { + out.RedirectURIs[i] = in.RedirectURIs[i] } } else { - out.Finalizers = nil + out.RedirectURIs = nil } return nil } -func convert_v1_ProjectSpec_To_api_ProjectSpec(in *projectapiv1.ProjectSpec, out *projectapi.ProjectSpec, s conversion.Scope) error { - return autoconvert_v1_ProjectSpec_To_api_ProjectSpec(in, out, s) +func convert_api_OAuthClient_To_v1_OAuthClient(in *oauthapi.OAuthClient, out *oauthapiv1.OAuthClient, s conversion.Scope) error { + return autoconvert_api_OAuthClient_To_v1_OAuthClient(in, out, s) } -func autoconvert_v1_ProjectStatus_To_api_ProjectStatus(in *projectapiv1.ProjectStatus, out *projectapi.ProjectStatus, s conversion.Scope) error { +func autoconvert_api_OAuthClientAuthorization_To_v1_OAuthClientAuthorization(in *oauthapi.OAuthClientAuthorization, out *oauthapiv1.OAuthClientAuthorization, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapiv1.ProjectStatus))(in) + defaulting.(func(*oauthapi.OAuthClientAuthorization))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + out.ClientName = in.ClientName + out.UserName = in.UserName + out.UserUID = in.UserUID + if in.Scopes != nil { + out.Scopes = make([]string, len(in.Scopes)) + for i := range in.Scopes { + out.Scopes[i] = in.Scopes[i] + } + } else { + out.Scopes = nil } - out.Phase = pkgapi.NamespacePhase(in.Phase) return nil } -func convert_v1_ProjectStatus_To_api_ProjectStatus(in *projectapiv1.ProjectStatus, out *projectapi.ProjectStatus, s conversion.Scope) error { - return autoconvert_v1_ProjectStatus_To_api_ProjectStatus(in, out, s) +func convert_api_OAuthClientAuthorization_To_v1_OAuthClientAuthorization(in *oauthapi.OAuthClientAuthorization, out *oauthapiv1.OAuthClientAuthorization, s conversion.Scope) error { + return autoconvert_api_OAuthClientAuthorization_To_v1_OAuthClientAuthorization(in, out, s) } -func autoconvert_api_Route_To_v1_Route(in *routeapi.Route, out *routeapiv1.Route, s conversion.Scope) error { +func autoconvert_api_OAuthClientAuthorizationList_To_v1_OAuthClientAuthorizationList(in *oauthapi.OAuthClientAuthorizationList, out *oauthapiv1.OAuthClientAuthorizationList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapi.Route))(in) + defaulting.(func(*oauthapi.OAuthClientAuthorizationList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - if err := convert_api_RouteSpec_To_v1_RouteSpec(&in.Spec, &out.Spec, s); err != nil { + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { return err } - if err := convert_api_RouteStatus_To_v1_RouteStatus(&in.Status, &out.Status, s); err != nil { - return err + if in.Items != nil { + out.Items = make([]oauthapiv1.OAuthClientAuthorization, len(in.Items)) + for i := range in.Items { + if err := convert_api_OAuthClientAuthorization_To_v1_OAuthClientAuthorization(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil } return nil } -func convert_api_Route_To_v1_Route(in *routeapi.Route, out *routeapiv1.Route, s conversion.Scope) error { - return autoconvert_api_Route_To_v1_Route(in, out, s) +func convert_api_OAuthClientAuthorizationList_To_v1_OAuthClientAuthorizationList(in *oauthapi.OAuthClientAuthorizationList, out *oauthapiv1.OAuthClientAuthorizationList, s conversion.Scope) error { + return autoconvert_api_OAuthClientAuthorizationList_To_v1_OAuthClientAuthorizationList(in, out, s) } -func autoconvert_api_RouteList_To_v1_RouteList(in *routeapi.RouteList, out *routeapiv1.RouteList, s conversion.Scope) error { +func autoconvert_api_OAuthClientList_To_v1_OAuthClientList(in *oauthapi.OAuthClientList, out *oauthapiv1.OAuthClientList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapi.RouteList))(in) + defaulting.(func(*oauthapi.OAuthClientList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3873,9 +4163,9 @@ func autoconvert_api_RouteList_To_v1_RouteList(in *routeapi.RouteList, out *rout return err } if in.Items != nil { - out.Items = make([]routeapiv1.Route, len(in.Items)) + out.Items = make([]oauthapiv1.OAuthClient, len(in.Items)) for i := range in.Items { - if err := convert_api_Route_To_v1_Route(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_api_OAuthClient_To_v1_OAuthClient(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3885,110 +4175,103 @@ func autoconvert_api_RouteList_To_v1_RouteList(in *routeapi.RouteList, out *rout return nil } -func convert_api_RouteList_To_v1_RouteList(in *routeapi.RouteList, out *routeapiv1.RouteList, s conversion.Scope) error { - return autoconvert_api_RouteList_To_v1_RouteList(in, out, s) +func convert_api_OAuthClientList_To_v1_OAuthClientList(in *oauthapi.OAuthClientList, out *oauthapiv1.OAuthClientList, s conversion.Scope) error { + return autoconvert_api_OAuthClientList_To_v1_OAuthClientList(in, out, s) } -func autoconvert_api_RoutePort_To_v1_RoutePort(in *routeapi.RoutePort, out *routeapiv1.RoutePort, s conversion.Scope) error { +func autoconvert_v1_OAuthAccessToken_To_api_OAuthAccessToken(in *oauthapiv1.OAuthAccessToken, out *oauthapi.OAuthAccessToken, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapi.RoutePort))(in) + defaulting.(func(*oauthapiv1.OAuthAccessToken))(in) } - if err := s.Convert(&in.TargetPort, &out.TargetPort, 0); err != nil { + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } + out.ClientName = in.ClientName + out.ExpiresIn = in.ExpiresIn + if in.Scopes != nil { + out.Scopes = make([]string, len(in.Scopes)) + for i := range in.Scopes { + out.Scopes[i] = in.Scopes[i] + } + } else { + out.Scopes = nil + } + out.RedirectURI = in.RedirectURI + out.UserName = in.UserName + out.UserUID = in.UserUID + out.AuthorizeToken = in.AuthorizeToken + out.RefreshToken = in.RefreshToken return nil } -func convert_api_RoutePort_To_v1_RoutePort(in *routeapi.RoutePort, out *routeapiv1.RoutePort, s conversion.Scope) error { - return autoconvert_api_RoutePort_To_v1_RoutePort(in, out, s) +func convert_v1_OAuthAccessToken_To_api_OAuthAccessToken(in *oauthapiv1.OAuthAccessToken, out *oauthapi.OAuthAccessToken, s conversion.Scope) error { + return autoconvert_v1_OAuthAccessToken_To_api_OAuthAccessToken(in, out, s) } -func autoconvert_api_RouteSpec_To_v1_RouteSpec(in *routeapi.RouteSpec, out *routeapiv1.RouteSpec, s conversion.Scope) error { +func autoconvert_v1_OAuthAccessTokenList_To_api_OAuthAccessTokenList(in *oauthapiv1.OAuthAccessTokenList, out *oauthapi.OAuthAccessTokenList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapi.RouteSpec))(in) + defaulting.(func(*oauthapiv1.OAuthAccessTokenList))(in) } - out.Host = in.Host - out.Path = in.Path - if err := convert_api_ObjectReference_To_v1_ObjectReference(&in.To, &out.To, s); err != nil { + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if in.Port != nil { - out.Port = new(routeapiv1.RoutePort) - if err := convert_api_RoutePort_To_v1_RoutePort(in.Port, out.Port, s); err != nil { - return err - } - } else { - out.Port = nil + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err } - if in.TLS != nil { - out.TLS = new(routeapiv1.TLSConfig) - if err := convert_api_TLSConfig_To_v1_TLSConfig(in.TLS, out.TLS, s); err != nil { - return err + if in.Items != nil { + out.Items = make([]oauthapi.OAuthAccessToken, len(in.Items)) + for i := range in.Items { + if err := convert_v1_OAuthAccessToken_To_api_OAuthAccessToken(&in.Items[i], &out.Items[i], s); err != nil { + return err + } } } else { - out.TLS = nil + out.Items = nil } return nil } -func convert_api_RouteSpec_To_v1_RouteSpec(in *routeapi.RouteSpec, out *routeapiv1.RouteSpec, s conversion.Scope) error { - return autoconvert_api_RouteSpec_To_v1_RouteSpec(in, out, s) +func convert_v1_OAuthAccessTokenList_To_api_OAuthAccessTokenList(in *oauthapiv1.OAuthAccessTokenList, out *oauthapi.OAuthAccessTokenList, s conversion.Scope) error { + return autoconvert_v1_OAuthAccessTokenList_To_api_OAuthAccessTokenList(in, out, s) } -func autoconvert_api_RouteStatus_To_v1_RouteStatus(in *routeapi.RouteStatus, out *routeapiv1.RouteStatus, s conversion.Scope) error { +func autoconvert_v1_OAuthAuthorizeToken_To_api_OAuthAuthorizeToken(in *oauthapiv1.OAuthAuthorizeToken, out *oauthapi.OAuthAuthorizeToken, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapi.RouteStatus))(in) + defaulting.(func(*oauthapiv1.OAuthAuthorizeToken))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + out.ClientName = in.ClientName + out.ExpiresIn = in.ExpiresIn + if in.Scopes != nil { + out.Scopes = make([]string, len(in.Scopes)) + for i := range in.Scopes { + out.Scopes[i] = in.Scopes[i] + } + } else { + out.Scopes = nil } + out.RedirectURI = in.RedirectURI + out.State = in.State + out.UserName = in.UserName + out.UserUID = in.UserUID return nil } -func convert_api_RouteStatus_To_v1_RouteStatus(in *routeapi.RouteStatus, out *routeapiv1.RouteStatus, s conversion.Scope) error { - return autoconvert_api_RouteStatus_To_v1_RouteStatus(in, out, s) -} - -func autoconvert_api_TLSConfig_To_v1_TLSConfig(in *routeapi.TLSConfig, out *routeapiv1.TLSConfig, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapi.TLSConfig))(in) - } - out.Termination = routeapiv1.TLSTerminationType(in.Termination) - out.Certificate = in.Certificate - out.Key = in.Key - out.CACertificate = in.CACertificate - out.DestinationCACertificate = in.DestinationCACertificate - out.InsecureEdgeTerminationPolicy = routeapiv1.InsecureEdgeTerminationPolicyType(in.InsecureEdgeTerminationPolicy) - return nil -} - -func convert_api_TLSConfig_To_v1_TLSConfig(in *routeapi.TLSConfig, out *routeapiv1.TLSConfig, s conversion.Scope) error { - return autoconvert_api_TLSConfig_To_v1_TLSConfig(in, out, s) -} - -func autoconvert_v1_Route_To_api_Route(in *routeapiv1.Route, out *routeapi.Route, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapiv1.Route))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err - } - if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - if err := convert_v1_RouteSpec_To_api_RouteSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := convert_v1_RouteStatus_To_api_RouteStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -func convert_v1_Route_To_api_Route(in *routeapiv1.Route, out *routeapi.Route, s conversion.Scope) error { - return autoconvert_v1_Route_To_api_Route(in, out, s) +func convert_v1_OAuthAuthorizeToken_To_api_OAuthAuthorizeToken(in *oauthapiv1.OAuthAuthorizeToken, out *oauthapi.OAuthAuthorizeToken, s conversion.Scope) error { + return autoconvert_v1_OAuthAuthorizeToken_To_api_OAuthAuthorizeToken(in, out, s) } -func autoconvert_v1_RouteList_To_api_RouteList(in *routeapiv1.RouteList, out *routeapi.RouteList, s conversion.Scope) error { +func autoconvert_v1_OAuthAuthorizeTokenList_To_api_OAuthAuthorizeTokenList(in *oauthapiv1.OAuthAuthorizeTokenList, out *oauthapi.OAuthAuthorizeTokenList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapiv1.RouteList))(in) + defaulting.(func(*oauthapiv1.OAuthAuthorizeTokenList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3997,9 +4280,9 @@ func autoconvert_v1_RouteList_To_api_RouteList(in *routeapiv1.RouteList, out *ro return err } if in.Items != nil { - out.Items = make([]routeapi.Route, len(in.Items)) + out.Items = make([]oauthapi.OAuthAuthorizeToken, len(in.Items)) for i := range in.Items { - if err := convert_v1_Route_To_api_Route(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1_OAuthAuthorizeToken_To_api_OAuthAuthorizeToken(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4009,107 +4292,95 @@ func autoconvert_v1_RouteList_To_api_RouteList(in *routeapiv1.RouteList, out *ro return nil } -func convert_v1_RouteList_To_api_RouteList(in *routeapiv1.RouteList, out *routeapi.RouteList, s conversion.Scope) error { - return autoconvert_v1_RouteList_To_api_RouteList(in, out, s) +func convert_v1_OAuthAuthorizeTokenList_To_api_OAuthAuthorizeTokenList(in *oauthapiv1.OAuthAuthorizeTokenList, out *oauthapi.OAuthAuthorizeTokenList, s conversion.Scope) error { + return autoconvert_v1_OAuthAuthorizeTokenList_To_api_OAuthAuthorizeTokenList(in, out, s) } -func autoconvert_v1_RoutePort_To_api_RoutePort(in *routeapiv1.RoutePort, out *routeapi.RoutePort, s conversion.Scope) error { +func autoconvert_v1_OAuthClient_To_api_OAuthClient(in *oauthapiv1.OAuthClient, out *oauthapi.OAuthClient, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapiv1.RoutePort))(in) + defaulting.(func(*oauthapiv1.OAuthClient))(in) } - if err := s.Convert(&in.TargetPort, &out.TargetPort, 0); err != nil { + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - return nil -} - -func convert_v1_RoutePort_To_api_RoutePort(in *routeapiv1.RoutePort, out *routeapi.RoutePort, s conversion.Scope) error { - return autoconvert_v1_RoutePort_To_api_RoutePort(in, out, s) -} - -func autoconvert_v1_RouteSpec_To_api_RouteSpec(in *routeapiv1.RouteSpec, out *routeapi.RouteSpec, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapiv1.RouteSpec))(in) - } - out.Host = in.Host - out.Path = in.Path - if err := convert_v1_ObjectReference_To_api_ObjectReference(&in.To, &out.To, s); err != nil { + if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if in.Port != nil { - out.Port = new(routeapi.RoutePort) - if err := convert_v1_RoutePort_To_api_RoutePort(in.Port, out.Port, s); err != nil { - return err - } - } else { - out.Port = nil - } - if in.TLS != nil { - out.TLS = new(routeapi.TLSConfig) - if err := convert_v1_TLSConfig_To_api_TLSConfig(in.TLS, out.TLS, s); err != nil { - return err + out.Secret = in.Secret + out.RespondWithChallenges = in.RespondWithChallenges + if in.RedirectURIs != nil { + out.RedirectURIs = make([]string, len(in.RedirectURIs)) + for i := range in.RedirectURIs { + out.RedirectURIs[i] = in.RedirectURIs[i] } } else { - out.TLS = nil + out.RedirectURIs = nil } return nil } -func convert_v1_RouteSpec_To_api_RouteSpec(in *routeapiv1.RouteSpec, out *routeapi.RouteSpec, s conversion.Scope) error { - return autoconvert_v1_RouteSpec_To_api_RouteSpec(in, out, s) +func convert_v1_OAuthClient_To_api_OAuthClient(in *oauthapiv1.OAuthClient, out *oauthapi.OAuthClient, s conversion.Scope) error { + return autoconvert_v1_OAuthClient_To_api_OAuthClient(in, out, s) } -func autoconvert_v1_RouteStatus_To_api_RouteStatus(in *routeapiv1.RouteStatus, out *routeapi.RouteStatus, s conversion.Scope) error { +func autoconvert_v1_OAuthClientAuthorization_To_api_OAuthClientAuthorization(in *oauthapiv1.OAuthClientAuthorization, out *oauthapi.OAuthClientAuthorization, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapiv1.RouteStatus))(in) + defaulting.(func(*oauthapiv1.OAuthClientAuthorization))(in) } - return nil -} - -func convert_v1_RouteStatus_To_api_RouteStatus(in *routeapiv1.RouteStatus, out *routeapi.RouteStatus, s conversion.Scope) error { - return autoconvert_v1_RouteStatus_To_api_RouteStatus(in, out, s) -} - -func autoconvert_v1_TLSConfig_To_api_TLSConfig(in *routeapiv1.TLSConfig, out *routeapi.TLSConfig, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapiv1.TLSConfig))(in) + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + out.ClientName = in.ClientName + out.UserName = in.UserName + out.UserUID = in.UserUID + if in.Scopes != nil { + out.Scopes = make([]string, len(in.Scopes)) + for i := range in.Scopes { + out.Scopes[i] = in.Scopes[i] + } + } else { + out.Scopes = nil } - out.Termination = routeapi.TLSTerminationType(in.Termination) - out.Certificate = in.Certificate - out.Key = in.Key - out.CACertificate = in.CACertificate - out.DestinationCACertificate = in.DestinationCACertificate - out.InsecureEdgeTerminationPolicy = routeapi.InsecureEdgeTerminationPolicyType(in.InsecureEdgeTerminationPolicy) return nil } -func convert_v1_TLSConfig_To_api_TLSConfig(in *routeapiv1.TLSConfig, out *routeapi.TLSConfig, s conversion.Scope) error { - return autoconvert_v1_TLSConfig_To_api_TLSConfig(in, out, s) +func convert_v1_OAuthClientAuthorization_To_api_OAuthClientAuthorization(in *oauthapiv1.OAuthClientAuthorization, out *oauthapi.OAuthClientAuthorization, s conversion.Scope) error { + return autoconvert_v1_OAuthClientAuthorization_To_api_OAuthClientAuthorization(in, out, s) } -func autoconvert_api_ClusterNetwork_To_v1_ClusterNetwork(in *sdnapi.ClusterNetwork, out *sdnapiv1.ClusterNetwork, s conversion.Scope) error { +func autoconvert_v1_OAuthClientAuthorizationList_To_api_OAuthClientAuthorizationList(in *oauthapiv1.OAuthClientAuthorizationList, out *oauthapi.OAuthClientAuthorizationList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapi.ClusterNetwork))(in) + defaulting.(func(*oauthapiv1.OAuthClientAuthorizationList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { return err } - out.Network = in.Network - out.HostSubnetLength = in.HostSubnetLength - out.ServiceNetwork = in.ServiceNetwork + if in.Items != nil { + out.Items = make([]oauthapi.OAuthClientAuthorization, len(in.Items)) + for i := range in.Items { + if err := convert_v1_OAuthClientAuthorization_To_api_OAuthClientAuthorization(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } return nil } -func convert_api_ClusterNetwork_To_v1_ClusterNetwork(in *sdnapi.ClusterNetwork, out *sdnapiv1.ClusterNetwork, s conversion.Scope) error { - return autoconvert_api_ClusterNetwork_To_v1_ClusterNetwork(in, out, s) +func convert_v1_OAuthClientAuthorizationList_To_api_OAuthClientAuthorizationList(in *oauthapiv1.OAuthClientAuthorizationList, out *oauthapi.OAuthClientAuthorizationList, s conversion.Scope) error { + return autoconvert_v1_OAuthClientAuthorizationList_To_api_OAuthClientAuthorizationList(in, out, s) } -func autoconvert_api_ClusterNetworkList_To_v1_ClusterNetworkList(in *sdnapi.ClusterNetworkList, out *sdnapiv1.ClusterNetworkList, s conversion.Scope) error { +func autoconvert_v1_OAuthClientList_To_api_OAuthClientList(in *oauthapiv1.OAuthClientList, out *oauthapi.OAuthClientList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapi.ClusterNetworkList))(in) + defaulting.(func(*oauthapiv1.OAuthClientList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4118,9 +4389,9 @@ func autoconvert_api_ClusterNetworkList_To_v1_ClusterNetworkList(in *sdnapi.Clus return err } if in.Items != nil { - out.Items = make([]sdnapiv1.ClusterNetwork, len(in.Items)) + out.Items = make([]oauthapi.OAuthClient, len(in.Items)) for i := range in.Items { - if err := convert_api_ClusterNetwork_To_v1_ClusterNetwork(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1_OAuthClient_To_api_OAuthClient(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4130,13 +4401,13 @@ func autoconvert_api_ClusterNetworkList_To_v1_ClusterNetworkList(in *sdnapi.Clus return nil } -func convert_api_ClusterNetworkList_To_v1_ClusterNetworkList(in *sdnapi.ClusterNetworkList, out *sdnapiv1.ClusterNetworkList, s conversion.Scope) error { - return autoconvert_api_ClusterNetworkList_To_v1_ClusterNetworkList(in, out, s) +func convert_v1_OAuthClientList_To_api_OAuthClientList(in *oauthapiv1.OAuthClientList, out *oauthapi.OAuthClientList, s conversion.Scope) error { + return autoconvert_v1_OAuthClientList_To_api_OAuthClientList(in, out, s) } -func autoconvert_api_HostSubnet_To_v1_HostSubnet(in *sdnapi.HostSubnet, out *sdnapiv1.HostSubnet, s conversion.Scope) error { +func autoconvert_api_Project_To_v1_Project(in *projectapi.Project, out *projectapiv1.Project, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapi.HostSubnet))(in) + defaulting.(func(*projectapi.Project))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4144,19 +4415,22 @@ func autoconvert_api_HostSubnet_To_v1_HostSubnet(in *sdnapi.HostSubnet, out *sdn if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.Host = in.Host - out.HostIP = in.HostIP - out.Subnet = in.Subnet + if err := convert_api_ProjectSpec_To_v1_ProjectSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := convert_api_ProjectStatus_To_v1_ProjectStatus(&in.Status, &out.Status, s); err != nil { + return err + } return nil } -func convert_api_HostSubnet_To_v1_HostSubnet(in *sdnapi.HostSubnet, out *sdnapiv1.HostSubnet, s conversion.Scope) error { - return autoconvert_api_HostSubnet_To_v1_HostSubnet(in, out, s) +func convert_api_Project_To_v1_Project(in *projectapi.Project, out *projectapiv1.Project, s conversion.Scope) error { + return autoconvert_api_Project_To_v1_Project(in, out, s) } -func autoconvert_api_HostSubnetList_To_v1_HostSubnetList(in *sdnapi.HostSubnetList, out *sdnapiv1.HostSubnetList, s conversion.Scope) error { +func autoconvert_api_ProjectList_To_v1_ProjectList(in *projectapi.ProjectList, out *projectapiv1.ProjectList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapi.HostSubnetList))(in) + defaulting.(func(*projectapi.ProjectList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4165,9 +4439,9 @@ func autoconvert_api_HostSubnetList_To_v1_HostSubnetList(in *sdnapi.HostSubnetLi return err } if in.Items != nil { - out.Items = make([]sdnapiv1.HostSubnet, len(in.Items)) + out.Items = make([]projectapiv1.Project, len(in.Items)) for i := range in.Items { - if err := convert_api_HostSubnet_To_v1_HostSubnet(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_api_Project_To_v1_Project(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4177,13 +4451,13 @@ func autoconvert_api_HostSubnetList_To_v1_HostSubnetList(in *sdnapi.HostSubnetLi return nil } -func convert_api_HostSubnetList_To_v1_HostSubnetList(in *sdnapi.HostSubnetList, out *sdnapiv1.HostSubnetList, s conversion.Scope) error { - return autoconvert_api_HostSubnetList_To_v1_HostSubnetList(in, out, s) +func convert_api_ProjectList_To_v1_ProjectList(in *projectapi.ProjectList, out *projectapiv1.ProjectList, s conversion.Scope) error { + return autoconvert_api_ProjectList_To_v1_ProjectList(in, out, s) } -func autoconvert_api_NetNamespace_To_v1_NetNamespace(in *sdnapi.NetNamespace, out *sdnapiv1.NetNamespace, s conversion.Scope) error { +func autoconvert_api_ProjectRequest_To_v1_ProjectRequest(in *projectapi.ProjectRequest, out *projectapiv1.ProjectRequest, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapi.NetNamespace))(in) + defaulting.(func(*projectapi.ProjectRequest))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4191,45 +4465,49 @@ func autoconvert_api_NetNamespace_To_v1_NetNamespace(in *sdnapi.NetNamespace, ou if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.NetName = in.NetName - out.NetID = in.NetID + out.DisplayName = in.DisplayName + out.Description = in.Description return nil } -func convert_api_NetNamespace_To_v1_NetNamespace(in *sdnapi.NetNamespace, out *sdnapiv1.NetNamespace, s conversion.Scope) error { - return autoconvert_api_NetNamespace_To_v1_NetNamespace(in, out, s) +func convert_api_ProjectRequest_To_v1_ProjectRequest(in *projectapi.ProjectRequest, out *projectapiv1.ProjectRequest, s conversion.Scope) error { + return autoconvert_api_ProjectRequest_To_v1_ProjectRequest(in, out, s) } -func autoconvert_api_NetNamespaceList_To_v1_NetNamespaceList(in *sdnapi.NetNamespaceList, out *sdnapiv1.NetNamespaceList, s conversion.Scope) error { +func autoconvert_api_ProjectSpec_To_v1_ProjectSpec(in *projectapi.ProjectSpec, out *projectapiv1.ProjectSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapi.NetNamespaceList))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err - } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { - return err + defaulting.(func(*projectapi.ProjectSpec))(in) } - if in.Items != nil { - out.Items = make([]sdnapiv1.NetNamespace, len(in.Items)) - for i := range in.Items { - if err := convert_api_NetNamespace_To_v1_NetNamespace(&in.Items[i], &out.Items[i], s); err != nil { - return err - } + if in.Finalizers != nil { + out.Finalizers = make([]pkgapiv1.FinalizerName, len(in.Finalizers)) + for i := range in.Finalizers { + out.Finalizers[i] = pkgapiv1.FinalizerName(in.Finalizers[i]) } } else { - out.Items = nil + out.Finalizers = nil } return nil } -func convert_api_NetNamespaceList_To_v1_NetNamespaceList(in *sdnapi.NetNamespaceList, out *sdnapiv1.NetNamespaceList, s conversion.Scope) error { - return autoconvert_api_NetNamespaceList_To_v1_NetNamespaceList(in, out, s) +func convert_api_ProjectSpec_To_v1_ProjectSpec(in *projectapi.ProjectSpec, out *projectapiv1.ProjectSpec, s conversion.Scope) error { + return autoconvert_api_ProjectSpec_To_v1_ProjectSpec(in, out, s) } -func autoconvert_v1_ClusterNetwork_To_api_ClusterNetwork(in *sdnapiv1.ClusterNetwork, out *sdnapi.ClusterNetwork, s conversion.Scope) error { +func autoconvert_api_ProjectStatus_To_v1_ProjectStatus(in *projectapi.ProjectStatus, out *projectapiv1.ProjectStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapiv1.ClusterNetwork))(in) + defaulting.(func(*projectapi.ProjectStatus))(in) + } + out.Phase = pkgapiv1.NamespacePhase(in.Phase) + return nil +} + +func convert_api_ProjectStatus_To_v1_ProjectStatus(in *projectapi.ProjectStatus, out *projectapiv1.ProjectStatus, s conversion.Scope) error { + return autoconvert_api_ProjectStatus_To_v1_ProjectStatus(in, out, s) +} + +func autoconvert_v1_Project_To_api_Project(in *projectapiv1.Project, out *projectapi.Project, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*projectapiv1.Project))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4237,19 +4515,22 @@ func autoconvert_v1_ClusterNetwork_To_api_ClusterNetwork(in *sdnapiv1.ClusterNet if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.Network = in.Network - out.HostSubnetLength = in.HostSubnetLength - out.ServiceNetwork = in.ServiceNetwork + if err := convert_v1_ProjectSpec_To_api_ProjectSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := convert_v1_ProjectStatus_To_api_ProjectStatus(&in.Status, &out.Status, s); err != nil { + return err + } return nil } -func convert_v1_ClusterNetwork_To_api_ClusterNetwork(in *sdnapiv1.ClusterNetwork, out *sdnapi.ClusterNetwork, s conversion.Scope) error { - return autoconvert_v1_ClusterNetwork_To_api_ClusterNetwork(in, out, s) +func convert_v1_Project_To_api_Project(in *projectapiv1.Project, out *projectapi.Project, s conversion.Scope) error { + return autoconvert_v1_Project_To_api_Project(in, out, s) } -func autoconvert_v1_ClusterNetworkList_To_api_ClusterNetworkList(in *sdnapiv1.ClusterNetworkList, out *sdnapi.ClusterNetworkList, s conversion.Scope) error { +func autoconvert_v1_ProjectList_To_api_ProjectList(in *projectapiv1.ProjectList, out *projectapi.ProjectList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapiv1.ClusterNetworkList))(in) + defaulting.(func(*projectapiv1.ProjectList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4258,9 +4539,9 @@ func autoconvert_v1_ClusterNetworkList_To_api_ClusterNetworkList(in *sdnapiv1.Cl return err } if in.Items != nil { - out.Items = make([]sdnapi.ClusterNetwork, len(in.Items)) + out.Items = make([]projectapi.Project, len(in.Items)) for i := range in.Items { - if err := convert_v1_ClusterNetwork_To_api_ClusterNetwork(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1_Project_To_api_Project(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4270,13 +4551,13 @@ func autoconvert_v1_ClusterNetworkList_To_api_ClusterNetworkList(in *sdnapiv1.Cl return nil } -func convert_v1_ClusterNetworkList_To_api_ClusterNetworkList(in *sdnapiv1.ClusterNetworkList, out *sdnapi.ClusterNetworkList, s conversion.Scope) error { - return autoconvert_v1_ClusterNetworkList_To_api_ClusterNetworkList(in, out, s) +func convert_v1_ProjectList_To_api_ProjectList(in *projectapiv1.ProjectList, out *projectapi.ProjectList, s conversion.Scope) error { + return autoconvert_v1_ProjectList_To_api_ProjectList(in, out, s) } -func autoconvert_v1_HostSubnet_To_api_HostSubnet(in *sdnapiv1.HostSubnet, out *sdnapi.HostSubnet, s conversion.Scope) error { +func autoconvert_v1_ProjectRequest_To_api_ProjectRequest(in *projectapiv1.ProjectRequest, out *projectapi.ProjectRequest, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapiv1.HostSubnet))(in) + defaulting.(func(*projectapiv1.ProjectRequest))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4284,65 +4565,72 @@ func autoconvert_v1_HostSubnet_To_api_HostSubnet(in *sdnapiv1.HostSubnet, out *s if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.Host = in.Host - out.HostIP = in.HostIP - out.Subnet = in.Subnet + out.DisplayName = in.DisplayName + out.Description = in.Description return nil } -func convert_v1_HostSubnet_To_api_HostSubnet(in *sdnapiv1.HostSubnet, out *sdnapi.HostSubnet, s conversion.Scope) error { - return autoconvert_v1_HostSubnet_To_api_HostSubnet(in, out, s) +func convert_v1_ProjectRequest_To_api_ProjectRequest(in *projectapiv1.ProjectRequest, out *projectapi.ProjectRequest, s conversion.Scope) error { + return autoconvert_v1_ProjectRequest_To_api_ProjectRequest(in, out, s) } -func autoconvert_v1_HostSubnetList_To_api_HostSubnetList(in *sdnapiv1.HostSubnetList, out *sdnapi.HostSubnetList, s conversion.Scope) error { +func autoconvert_v1_ProjectSpec_To_api_ProjectSpec(in *projectapiv1.ProjectSpec, out *projectapi.ProjectSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapiv1.HostSubnetList))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err - } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { - return err + defaulting.(func(*projectapiv1.ProjectSpec))(in) } - if in.Items != nil { - out.Items = make([]sdnapi.HostSubnet, len(in.Items)) - for i := range in.Items { - if err := convert_v1_HostSubnet_To_api_HostSubnet(&in.Items[i], &out.Items[i], s); err != nil { - return err - } + if in.Finalizers != nil { + out.Finalizers = make([]pkgapi.FinalizerName, len(in.Finalizers)) + for i := range in.Finalizers { + out.Finalizers[i] = pkgapi.FinalizerName(in.Finalizers[i]) } } else { - out.Items = nil + out.Finalizers = nil } return nil } -func convert_v1_HostSubnetList_To_api_HostSubnetList(in *sdnapiv1.HostSubnetList, out *sdnapi.HostSubnetList, s conversion.Scope) error { - return autoconvert_v1_HostSubnetList_To_api_HostSubnetList(in, out, s) +func convert_v1_ProjectSpec_To_api_ProjectSpec(in *projectapiv1.ProjectSpec, out *projectapi.ProjectSpec, s conversion.Scope) error { + return autoconvert_v1_ProjectSpec_To_api_ProjectSpec(in, out, s) } -func autoconvert_v1_NetNamespace_To_api_NetNamespace(in *sdnapiv1.NetNamespace, out *sdnapi.NetNamespace, s conversion.Scope) error { +func autoconvert_v1_ProjectStatus_To_api_ProjectStatus(in *projectapiv1.ProjectStatus, out *projectapi.ProjectStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapiv1.NetNamespace))(in) + defaulting.(func(*projectapiv1.ProjectStatus))(in) + } + out.Phase = pkgapi.NamespacePhase(in.Phase) + return nil +} + +func convert_v1_ProjectStatus_To_api_ProjectStatus(in *projectapiv1.ProjectStatus, out *projectapi.ProjectStatus, s conversion.Scope) error { + return autoconvert_v1_ProjectStatus_To_api_ProjectStatus(in, out, s) +} + +func autoconvert_api_Route_To_v1_Route(in *routeapi.Route, out *routeapiv1.Route, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*routeapi.Route))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if err := convert_api_RouteSpec_To_v1_RouteSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := convert_api_RouteStatus_To_v1_RouteStatus(&in.Status, &out.Status, s); err != nil { return err } - out.NetName = in.NetName - out.NetID = in.NetID return nil } -func convert_v1_NetNamespace_To_api_NetNamespace(in *sdnapiv1.NetNamespace, out *sdnapi.NetNamespace, s conversion.Scope) error { - return autoconvert_v1_NetNamespace_To_api_NetNamespace(in, out, s) +func convert_api_Route_To_v1_Route(in *routeapi.Route, out *routeapiv1.Route, s conversion.Scope) error { + return autoconvert_api_Route_To_v1_Route(in, out, s) } -func autoconvert_v1_NetNamespaceList_To_api_NetNamespaceList(in *sdnapiv1.NetNamespaceList, out *sdnapi.NetNamespaceList, s conversion.Scope) error { +func autoconvert_api_RouteList_To_v1_RouteList(in *routeapi.RouteList, out *routeapiv1.RouteList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapiv1.NetNamespaceList))(in) + defaulting.(func(*routeapi.RouteList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4351,9 +4639,9 @@ func autoconvert_v1_NetNamespaceList_To_api_NetNamespaceList(in *sdnapiv1.NetNam return err } if in.Items != nil { - out.Items = make([]sdnapi.NetNamespace, len(in.Items)) + out.Items = make([]routeapiv1.Route, len(in.Items)) for i := range in.Items { - if err := convert_v1_NetNamespace_To_api_NetNamespace(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_api_Route_To_v1_Route(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4363,103 +4651,87 @@ func autoconvert_v1_NetNamespaceList_To_api_NetNamespaceList(in *sdnapiv1.NetNam return nil } -func convert_v1_NetNamespaceList_To_api_NetNamespaceList(in *sdnapiv1.NetNamespaceList, out *sdnapi.NetNamespaceList, s conversion.Scope) error { - return autoconvert_v1_NetNamespaceList_To_api_NetNamespaceList(in, out, s) +func convert_api_RouteList_To_v1_RouteList(in *routeapi.RouteList, out *routeapiv1.RouteList, s conversion.Scope) error { + return autoconvert_api_RouteList_To_v1_RouteList(in, out, s) } -func autoconvert_api_Parameter_To_v1_Parameter(in *templateapi.Parameter, out *templateapiv1.Parameter, s conversion.Scope) error { +func autoconvert_api_RoutePort_To_v1_RoutePort(in *routeapi.RoutePort, out *routeapiv1.RoutePort, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*templateapi.Parameter))(in) + defaulting.(func(*routeapi.RoutePort))(in) + } + if err := s.Convert(&in.TargetPort, &out.TargetPort, 0); err != nil { + return err } - out.Name = in.Name - out.DisplayName = in.DisplayName - out.Description = in.Description - out.Value = in.Value - out.Generate = in.Generate - out.From = in.From - out.Required = in.Required return nil } -func convert_api_Parameter_To_v1_Parameter(in *templateapi.Parameter, out *templateapiv1.Parameter, s conversion.Scope) error { - return autoconvert_api_Parameter_To_v1_Parameter(in, out, s) +func convert_api_RoutePort_To_v1_RoutePort(in *routeapi.RoutePort, out *routeapiv1.RoutePort, s conversion.Scope) error { + return autoconvert_api_RoutePort_To_v1_RoutePort(in, out, s) } -func autoconvert_api_Template_To_v1_Template(in *templateapi.Template, out *templateapiv1.Template, s conversion.Scope) error { +func autoconvert_api_RouteSpec_To_v1_RouteSpec(in *routeapi.RouteSpec, out *routeapiv1.RouteSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*templateapi.Template))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + defaulting.(func(*routeapi.RouteSpec))(in) } - if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + out.Host = in.Host + out.Path = in.Path + if err := convert_api_ObjectReference_To_v1_ObjectReference(&in.To, &out.To, s); err != nil { return err } - if in.Parameters != nil { - out.Parameters = make([]templateapiv1.Parameter, len(in.Parameters)) - for i := range in.Parameters { - if err := convert_api_Parameter_To_v1_Parameter(&in.Parameters[i], &out.Parameters[i], s); err != nil { - return err - } + if in.Port != nil { + out.Port = new(routeapiv1.RoutePort) + if err := convert_api_RoutePort_To_v1_RoutePort(in.Port, out.Port, s); err != nil { + return err } } else { - out.Parameters = nil + out.Port = nil } - if err := s.Convert(&in.Objects, &out.Objects, 0); err != nil { - return err + if in.TLS != nil { + out.TLS = new(routeapiv1.TLSConfig) + if err := convert_api_TLSConfig_To_v1_TLSConfig(in.TLS, out.TLS, s); err != nil { + return err + } + } else { + out.TLS = nil } - // in.ObjectLabels has no peer in out return nil } -func autoconvert_api_TemplateList_To_v1_TemplateList(in *templateapi.TemplateList, out *templateapiv1.TemplateList, s conversion.Scope) error { +func convert_api_RouteSpec_To_v1_RouteSpec(in *routeapi.RouteSpec, out *routeapiv1.RouteSpec, s conversion.Scope) error { + return autoconvert_api_RouteSpec_To_v1_RouteSpec(in, out, s) +} + +func autoconvert_api_RouteStatus_To_v1_RouteStatus(in *routeapi.RouteStatus, out *routeapiv1.RouteStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*templateapi.TemplateList))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err - } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { - return err - } - if in.Items != nil { - out.Items = make([]templateapiv1.Template, len(in.Items)) - for i := range in.Items { - if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { - return err - } - } - } else { - out.Items = nil + defaulting.(func(*routeapi.RouteStatus))(in) } return nil } -func convert_api_TemplateList_To_v1_TemplateList(in *templateapi.TemplateList, out *templateapiv1.TemplateList, s conversion.Scope) error { - return autoconvert_api_TemplateList_To_v1_TemplateList(in, out, s) +func convert_api_RouteStatus_To_v1_RouteStatus(in *routeapi.RouteStatus, out *routeapiv1.RouteStatus, s conversion.Scope) error { + return autoconvert_api_RouteStatus_To_v1_RouteStatus(in, out, s) } -func autoconvert_v1_Parameter_To_api_Parameter(in *templateapiv1.Parameter, out *templateapi.Parameter, s conversion.Scope) error { +func autoconvert_api_TLSConfig_To_v1_TLSConfig(in *routeapi.TLSConfig, out *routeapiv1.TLSConfig, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*templateapiv1.Parameter))(in) + defaulting.(func(*routeapi.TLSConfig))(in) } - out.Name = in.Name - out.DisplayName = in.DisplayName - out.Description = in.Description - out.Value = in.Value - out.Generate = in.Generate - out.From = in.From - out.Required = in.Required + out.Termination = routeapiv1.TLSTerminationType(in.Termination) + out.Certificate = in.Certificate + out.Key = in.Key + out.CACertificate = in.CACertificate + out.DestinationCACertificate = in.DestinationCACertificate + out.InsecureEdgeTerminationPolicy = routeapiv1.InsecureEdgeTerminationPolicyType(in.InsecureEdgeTerminationPolicy) return nil } -func convert_v1_Parameter_To_api_Parameter(in *templateapiv1.Parameter, out *templateapi.Parameter, s conversion.Scope) error { - return autoconvert_v1_Parameter_To_api_Parameter(in, out, s) +func convert_api_TLSConfig_To_v1_TLSConfig(in *routeapi.TLSConfig, out *routeapiv1.TLSConfig, s conversion.Scope) error { + return autoconvert_api_TLSConfig_To_v1_TLSConfig(in, out, s) } -func autoconvert_v1_Template_To_api_Template(in *templateapiv1.Template, out *templateapi.Template, s conversion.Scope) error { +func autoconvert_v1_Route_To_api_Route(in *routeapiv1.Route, out *routeapi.Route, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*templateapiv1.Template))(in) + defaulting.(func(*routeapiv1.Route))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4467,33 +4739,22 @@ func autoconvert_v1_Template_To_api_Template(in *templateapiv1.Template, out *te if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := s.Convert(&in.Objects, &out.Objects, 0); err != nil { + if err := convert_v1_RouteSpec_To_api_RouteSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if in.Parameters != nil { - out.Parameters = make([]templateapi.Parameter, len(in.Parameters)) - for i := range in.Parameters { - if err := convert_v1_Parameter_To_api_Parameter(&in.Parameters[i], &out.Parameters[i], s); err != nil { - return err - } - } - } else { - out.Parameters = nil - } - if in.Labels != nil { - out.Labels = make(map[string]string) - for key, val := range in.Labels { - out.Labels[key] = val - } - } else { - out.Labels = nil + if err := convert_v1_RouteStatus_To_api_RouteStatus(&in.Status, &out.Status, s); err != nil { + return err } return nil } -func autoconvert_v1_TemplateList_To_api_TemplateList(in *templateapiv1.TemplateList, out *templateapi.TemplateList, s conversion.Scope) error { +func convert_v1_Route_To_api_Route(in *routeapiv1.Route, out *routeapi.Route, s conversion.Scope) error { + return autoconvert_v1_Route_To_api_Route(in, out, s) +} + +func autoconvert_v1_RouteList_To_api_RouteList(in *routeapiv1.RouteList, out *routeapi.RouteList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*templateapiv1.TemplateList))(in) + defaulting.(func(*routeapiv1.RouteList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4502,9 +4763,9 @@ func autoconvert_v1_TemplateList_To_api_TemplateList(in *templateapiv1.TemplateL return err } if in.Items != nil { - out.Items = make([]templateapi.Template, len(in.Items)) + out.Items = make([]routeapi.Route, len(in.Items)) for i := range in.Items { - if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { + if err := convert_v1_Route_To_api_Route(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4514,65 +4775,87 @@ func autoconvert_v1_TemplateList_To_api_TemplateList(in *templateapiv1.TemplateL return nil } -func convert_v1_TemplateList_To_api_TemplateList(in *templateapiv1.TemplateList, out *templateapi.TemplateList, s conversion.Scope) error { - return autoconvert_v1_TemplateList_To_api_TemplateList(in, out, s) +func convert_v1_RouteList_To_api_RouteList(in *routeapiv1.RouteList, out *routeapi.RouteList, s conversion.Scope) error { + return autoconvert_v1_RouteList_To_api_RouteList(in, out, s) } -func autoconvert_api_Group_To_v1_Group(in *userapi.Group, out *userapiv1.Group, s conversion.Scope) error { +func autoconvert_v1_RoutePort_To_api_RoutePort(in *routeapiv1.RoutePort, out *routeapi.RoutePort, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapi.Group))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + defaulting.(func(*routeapiv1.RoutePort))(in) } - if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if err := s.Convert(&in.TargetPort, &out.TargetPort, 0); err != nil { return err } - if in.Users != nil { - out.Users = make([]string, len(in.Users)) - for i := range in.Users { - out.Users[i] = in.Users[i] - } - } else { - out.Users = nil - } return nil } -func convert_api_Group_To_v1_Group(in *userapi.Group, out *userapiv1.Group, s conversion.Scope) error { - return autoconvert_api_Group_To_v1_Group(in, out, s) +func convert_v1_RoutePort_To_api_RoutePort(in *routeapiv1.RoutePort, out *routeapi.RoutePort, s conversion.Scope) error { + return autoconvert_v1_RoutePort_To_api_RoutePort(in, out, s) } -func autoconvert_api_GroupList_To_v1_GroupList(in *userapi.GroupList, out *userapiv1.GroupList, s conversion.Scope) error { +func autoconvert_v1_RouteSpec_To_api_RouteSpec(in *routeapiv1.RouteSpec, out *routeapi.RouteSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapi.GroupList))(in) + defaulting.(func(*routeapiv1.RouteSpec))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + out.Host = in.Host + out.Path = in.Path + if err := convert_v1_ObjectReference_To_api_ObjectReference(&in.To, &out.To, s); err != nil { return err } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { - return err + if in.Port != nil { + out.Port = new(routeapi.RoutePort) + if err := convert_v1_RoutePort_To_api_RoutePort(in.Port, out.Port, s); err != nil { + return err + } + } else { + out.Port = nil } - if in.Items != nil { - out.Items = make([]userapiv1.Group, len(in.Items)) - for i := range in.Items { - if err := convert_api_Group_To_v1_Group(&in.Items[i], &out.Items[i], s); err != nil { - return err - } + if in.TLS != nil { + out.TLS = new(routeapi.TLSConfig) + if err := convert_v1_TLSConfig_To_api_TLSConfig(in.TLS, out.TLS, s); err != nil { + return err } } else { - out.Items = nil + out.TLS = nil } return nil } -func convert_api_GroupList_To_v1_GroupList(in *userapi.GroupList, out *userapiv1.GroupList, s conversion.Scope) error { - return autoconvert_api_GroupList_To_v1_GroupList(in, out, s) +func convert_v1_RouteSpec_To_api_RouteSpec(in *routeapiv1.RouteSpec, out *routeapi.RouteSpec, s conversion.Scope) error { + return autoconvert_v1_RouteSpec_To_api_RouteSpec(in, out, s) } -func autoconvert_api_Identity_To_v1_Identity(in *userapi.Identity, out *userapiv1.Identity, s conversion.Scope) error { +func autoconvert_v1_RouteStatus_To_api_RouteStatus(in *routeapiv1.RouteStatus, out *routeapi.RouteStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapi.Identity))(in) + defaulting.(func(*routeapiv1.RouteStatus))(in) + } + return nil +} + +func convert_v1_RouteStatus_To_api_RouteStatus(in *routeapiv1.RouteStatus, out *routeapi.RouteStatus, s conversion.Scope) error { + return autoconvert_v1_RouteStatus_To_api_RouteStatus(in, out, s) +} + +func autoconvert_v1_TLSConfig_To_api_TLSConfig(in *routeapiv1.TLSConfig, out *routeapi.TLSConfig, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*routeapiv1.TLSConfig))(in) + } + out.Termination = routeapi.TLSTerminationType(in.Termination) + out.Certificate = in.Certificate + out.Key = in.Key + out.CACertificate = in.CACertificate + out.DestinationCACertificate = in.DestinationCACertificate + out.InsecureEdgeTerminationPolicy = routeapi.InsecureEdgeTerminationPolicyType(in.InsecureEdgeTerminationPolicy) + return nil +} + +func convert_v1_TLSConfig_To_api_TLSConfig(in *routeapiv1.TLSConfig, out *routeapi.TLSConfig, s conversion.Scope) error { + return autoconvert_v1_TLSConfig_To_api_TLSConfig(in, out, s) +} + +func autoconvert_api_ClusterNetwork_To_v1_ClusterNetwork(in *sdnapi.ClusterNetwork, out *sdnapiv1.ClusterNetwork, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*sdnapi.ClusterNetwork))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4580,29 +4863,19 @@ func autoconvert_api_Identity_To_v1_Identity(in *userapi.Identity, out *userapiv if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.ProviderName = in.ProviderName - out.ProviderUserName = in.ProviderUserName - if err := convert_api_ObjectReference_To_v1_ObjectReference(&in.User, &out.User, s); err != nil { - return err - } - if in.Extra != nil { - out.Extra = make(map[string]string) - for key, val := range in.Extra { - out.Extra[key] = val - } - } else { - out.Extra = nil - } + out.Network = in.Network + out.HostSubnetLength = in.HostSubnetLength + out.ServiceNetwork = in.ServiceNetwork return nil } -func convert_api_Identity_To_v1_Identity(in *userapi.Identity, out *userapiv1.Identity, s conversion.Scope) error { - return autoconvert_api_Identity_To_v1_Identity(in, out, s) +func convert_api_ClusterNetwork_To_v1_ClusterNetwork(in *sdnapi.ClusterNetwork, out *sdnapiv1.ClusterNetwork, s conversion.Scope) error { + return autoconvert_api_ClusterNetwork_To_v1_ClusterNetwork(in, out, s) } -func autoconvert_api_IdentityList_To_v1_IdentityList(in *userapi.IdentityList, out *userapiv1.IdentityList, s conversion.Scope) error { +func autoconvert_api_ClusterNetworkList_To_v1_ClusterNetworkList(in *sdnapi.ClusterNetworkList, out *sdnapiv1.ClusterNetworkList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapi.IdentityList))(in) + defaulting.(func(*sdnapi.ClusterNetworkList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4611,9 +4884,9 @@ func autoconvert_api_IdentityList_To_v1_IdentityList(in *userapi.IdentityList, o return err } if in.Items != nil { - out.Items = make([]userapiv1.Identity, len(in.Items)) + out.Items = make([]sdnapiv1.ClusterNetwork, len(in.Items)) for i := range in.Items { - if err := convert_api_Identity_To_v1_Identity(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_api_ClusterNetwork_To_v1_ClusterNetwork(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4623,13 +4896,13 @@ func autoconvert_api_IdentityList_To_v1_IdentityList(in *userapi.IdentityList, o return nil } -func convert_api_IdentityList_To_v1_IdentityList(in *userapi.IdentityList, out *userapiv1.IdentityList, s conversion.Scope) error { - return autoconvert_api_IdentityList_To_v1_IdentityList(in, out, s) +func convert_api_ClusterNetworkList_To_v1_ClusterNetworkList(in *sdnapi.ClusterNetworkList, out *sdnapiv1.ClusterNetworkList, s conversion.Scope) error { + return autoconvert_api_ClusterNetworkList_To_v1_ClusterNetworkList(in, out, s) } -func autoconvert_api_User_To_v1_User(in *userapi.User, out *userapiv1.User, s conversion.Scope) error { +func autoconvert_api_HostSubnet_To_v1_HostSubnet(in *sdnapi.HostSubnet, out *sdnapiv1.HostSubnet, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapi.User))(in) + defaulting.(func(*sdnapi.HostSubnet))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4637,33 +4910,46 @@ func autoconvert_api_User_To_v1_User(in *userapi.User, out *userapiv1.User, s co if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.FullName = in.FullName - if in.Identities != nil { - out.Identities = make([]string, len(in.Identities)) - for i := range in.Identities { - out.Identities[i] = in.Identities[i] - } - } else { - out.Identities = nil + out.Host = in.Host + out.HostIP = in.HostIP + out.Subnet = in.Subnet + return nil +} + +func convert_api_HostSubnet_To_v1_HostSubnet(in *sdnapi.HostSubnet, out *sdnapiv1.HostSubnet, s conversion.Scope) error { + return autoconvert_api_HostSubnet_To_v1_HostSubnet(in, out, s) +} + +func autoconvert_api_HostSubnetList_To_v1_HostSubnetList(in *sdnapi.HostSubnetList, out *sdnapiv1.HostSubnetList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*sdnapi.HostSubnetList))(in) } - if in.Groups != nil { - out.Groups = make([]string, len(in.Groups)) - for i := range in.Groups { - out.Groups[i] = in.Groups[i] + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]sdnapiv1.HostSubnet, len(in.Items)) + for i := range in.Items { + if err := convert_api_HostSubnet_To_v1_HostSubnet(&in.Items[i], &out.Items[i], s); err != nil { + return err + } } } else { - out.Groups = nil + out.Items = nil } return nil } -func convert_api_User_To_v1_User(in *userapi.User, out *userapiv1.User, s conversion.Scope) error { - return autoconvert_api_User_To_v1_User(in, out, s) +func convert_api_HostSubnetList_To_v1_HostSubnetList(in *sdnapi.HostSubnetList, out *sdnapiv1.HostSubnetList, s conversion.Scope) error { + return autoconvert_api_HostSubnetList_To_v1_HostSubnetList(in, out, s) } -func autoconvert_api_UserIdentityMapping_To_v1_UserIdentityMapping(in *userapi.UserIdentityMapping, out *userapiv1.UserIdentityMapping, s conversion.Scope) error { +func autoconvert_api_NetNamespace_To_v1_NetNamespace(in *sdnapi.NetNamespace, out *sdnapiv1.NetNamespace, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapi.UserIdentityMapping))(in) + defaulting.(func(*sdnapi.NetNamespace))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4671,22 +4957,18 @@ func autoconvert_api_UserIdentityMapping_To_v1_UserIdentityMapping(in *userapi.U if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_api_ObjectReference_To_v1_ObjectReference(&in.Identity, &out.Identity, s); err != nil { - return err - } - if err := convert_api_ObjectReference_To_v1_ObjectReference(&in.User, &out.User, s); err != nil { - return err - } + out.NetName = in.NetName + out.NetID = in.NetID return nil } -func convert_api_UserIdentityMapping_To_v1_UserIdentityMapping(in *userapi.UserIdentityMapping, out *userapiv1.UserIdentityMapping, s conversion.Scope) error { - return autoconvert_api_UserIdentityMapping_To_v1_UserIdentityMapping(in, out, s) +func convert_api_NetNamespace_To_v1_NetNamespace(in *sdnapi.NetNamespace, out *sdnapiv1.NetNamespace, s conversion.Scope) error { + return autoconvert_api_NetNamespace_To_v1_NetNamespace(in, out, s) } -func autoconvert_api_UserList_To_v1_UserList(in *userapi.UserList, out *userapiv1.UserList, s conversion.Scope) error { +func autoconvert_api_NetNamespaceList_To_v1_NetNamespaceList(in *sdnapi.NetNamespaceList, out *sdnapiv1.NetNamespaceList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapi.UserList))(in) + defaulting.(func(*sdnapi.NetNamespaceList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4695,9 +4977,9 @@ func autoconvert_api_UserList_To_v1_UserList(in *userapi.UserList, out *userapiv return err } if in.Items != nil { - out.Items = make([]userapiv1.User, len(in.Items)) + out.Items = make([]sdnapiv1.NetNamespace, len(in.Items)) for i := range in.Items { - if err := convert_api_User_To_v1_User(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_api_NetNamespace_To_v1_NetNamespace(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4707,13 +4989,13 @@ func autoconvert_api_UserList_To_v1_UserList(in *userapi.UserList, out *userapiv return nil } -func convert_api_UserList_To_v1_UserList(in *userapi.UserList, out *userapiv1.UserList, s conversion.Scope) error { - return autoconvert_api_UserList_To_v1_UserList(in, out, s) +func convert_api_NetNamespaceList_To_v1_NetNamespaceList(in *sdnapi.NetNamespaceList, out *sdnapiv1.NetNamespaceList, s conversion.Scope) error { + return autoconvert_api_NetNamespaceList_To_v1_NetNamespaceList(in, out, s) } -func autoconvert_v1_Group_To_api_Group(in *userapiv1.Group, out *userapi.Group, s conversion.Scope) error { +func autoconvert_v1_ClusterNetwork_To_api_ClusterNetwork(in *sdnapiv1.ClusterNetwork, out *sdnapi.ClusterNetwork, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapiv1.Group))(in) + defaulting.(func(*sdnapiv1.ClusterNetwork))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4721,24 +5003,19 @@ func autoconvert_v1_Group_To_api_Group(in *userapiv1.Group, out *userapi.Group, if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if in.Users != nil { - out.Users = make([]string, len(in.Users)) - for i := range in.Users { - out.Users[i] = in.Users[i] - } - } else { - out.Users = nil - } + out.Network = in.Network + out.HostSubnetLength = in.HostSubnetLength + out.ServiceNetwork = in.ServiceNetwork return nil } -func convert_v1_Group_To_api_Group(in *userapiv1.Group, out *userapi.Group, s conversion.Scope) error { - return autoconvert_v1_Group_To_api_Group(in, out, s) +func convert_v1_ClusterNetwork_To_api_ClusterNetwork(in *sdnapiv1.ClusterNetwork, out *sdnapi.ClusterNetwork, s conversion.Scope) error { + return autoconvert_v1_ClusterNetwork_To_api_ClusterNetwork(in, out, s) } -func autoconvert_v1_GroupList_To_api_GroupList(in *userapiv1.GroupList, out *userapi.GroupList, s conversion.Scope) error { +func autoconvert_v1_ClusterNetworkList_To_api_ClusterNetworkList(in *sdnapiv1.ClusterNetworkList, out *sdnapi.ClusterNetworkList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapiv1.GroupList))(in) + defaulting.(func(*sdnapiv1.ClusterNetworkList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4747,9 +5024,9 @@ func autoconvert_v1_GroupList_To_api_GroupList(in *userapiv1.GroupList, out *use return err } if in.Items != nil { - out.Items = make([]userapi.Group, len(in.Items)) + out.Items = make([]sdnapi.ClusterNetwork, len(in.Items)) for i := range in.Items { - if err := convert_v1_Group_To_api_Group(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1_ClusterNetwork_To_api_ClusterNetwork(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4759,13 +5036,13 @@ func autoconvert_v1_GroupList_To_api_GroupList(in *userapiv1.GroupList, out *use return nil } -func convert_v1_GroupList_To_api_GroupList(in *userapiv1.GroupList, out *userapi.GroupList, s conversion.Scope) error { - return autoconvert_v1_GroupList_To_api_GroupList(in, out, s) +func convert_v1_ClusterNetworkList_To_api_ClusterNetworkList(in *sdnapiv1.ClusterNetworkList, out *sdnapi.ClusterNetworkList, s conversion.Scope) error { + return autoconvert_v1_ClusterNetworkList_To_api_ClusterNetworkList(in, out, s) } -func autoconvert_v1_Identity_To_api_Identity(in *userapiv1.Identity, out *userapi.Identity, s conversion.Scope) error { +func autoconvert_v1_HostSubnet_To_api_HostSubnet(in *sdnapiv1.HostSubnet, out *sdnapi.HostSubnet, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapiv1.Identity))(in) + defaulting.(func(*sdnapiv1.HostSubnet))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4773,29 +5050,19 @@ func autoconvert_v1_Identity_To_api_Identity(in *userapiv1.Identity, out *userap if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.ProviderName = in.ProviderName - out.ProviderUserName = in.ProviderUserName - if err := convert_v1_ObjectReference_To_api_ObjectReference(&in.User, &out.User, s); err != nil { - return err - } - if in.Extra != nil { - out.Extra = make(map[string]string) - for key, val := range in.Extra { - out.Extra[key] = val - } - } else { - out.Extra = nil - } + out.Host = in.Host + out.HostIP = in.HostIP + out.Subnet = in.Subnet return nil } -func convert_v1_Identity_To_api_Identity(in *userapiv1.Identity, out *userapi.Identity, s conversion.Scope) error { - return autoconvert_v1_Identity_To_api_Identity(in, out, s) +func convert_v1_HostSubnet_To_api_HostSubnet(in *sdnapiv1.HostSubnet, out *sdnapi.HostSubnet, s conversion.Scope) error { + return autoconvert_v1_HostSubnet_To_api_HostSubnet(in, out, s) } -func autoconvert_v1_IdentityList_To_api_IdentityList(in *userapiv1.IdentityList, out *userapi.IdentityList, s conversion.Scope) error { +func autoconvert_v1_HostSubnetList_To_api_HostSubnetList(in *sdnapiv1.HostSubnetList, out *sdnapi.HostSubnetList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapiv1.IdentityList))(in) + defaulting.(func(*sdnapiv1.HostSubnetList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4804,9 +5071,9 @@ func autoconvert_v1_IdentityList_To_api_IdentityList(in *userapiv1.IdentityList, return err } if in.Items != nil { - out.Items = make([]userapi.Identity, len(in.Items)) + out.Items = make([]sdnapi.HostSubnet, len(in.Items)) for i := range in.Items { - if err := convert_v1_Identity_To_api_Identity(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1_HostSubnet_To_api_HostSubnet(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4816,13 +5083,13 @@ func autoconvert_v1_IdentityList_To_api_IdentityList(in *userapiv1.IdentityList, return nil } -func convert_v1_IdentityList_To_api_IdentityList(in *userapiv1.IdentityList, out *userapi.IdentityList, s conversion.Scope) error { - return autoconvert_v1_IdentityList_To_api_IdentityList(in, out, s) +func convert_v1_HostSubnetList_To_api_HostSubnetList(in *sdnapiv1.HostSubnetList, out *sdnapi.HostSubnetList, s conversion.Scope) error { + return autoconvert_v1_HostSubnetList_To_api_HostSubnetList(in, out, s) } -func autoconvert_v1_User_To_api_User(in *userapiv1.User, out *userapi.User, s conversion.Scope) error { +func autoconvert_v1_NetNamespace_To_api_NetNamespace(in *sdnapiv1.NetNamespace, out *sdnapi.NetNamespace, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapiv1.User))(in) + defaulting.(func(*sdnapiv1.NetNamespace))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4830,67 +5097,1840 @@ func autoconvert_v1_User_To_api_User(in *userapiv1.User, out *userapi.User, s co if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.FullName = in.FullName + out.NetName = in.NetName + out.NetID = in.NetID + return nil +} + +func convert_v1_NetNamespace_To_api_NetNamespace(in *sdnapiv1.NetNamespace, out *sdnapi.NetNamespace, s conversion.Scope) error { + return autoconvert_v1_NetNamespace_To_api_NetNamespace(in, out, s) +} + +func autoconvert_v1_NetNamespaceList_To_api_NetNamespaceList(in *sdnapiv1.NetNamespaceList, out *sdnapi.NetNamespaceList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*sdnapiv1.NetNamespaceList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]sdnapi.NetNamespace, len(in.Items)) + for i := range in.Items { + if err := convert_v1_NetNamespace_To_api_NetNamespace(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_v1_NetNamespaceList_To_api_NetNamespaceList(in *sdnapiv1.NetNamespaceList, out *sdnapi.NetNamespaceList, s conversion.Scope) error { + return autoconvert_v1_NetNamespaceList_To_api_NetNamespaceList(in, out, s) +} + +func autoconvert_api_Parameter_To_v1_Parameter(in *templateapi.Parameter, out *templateapiv1.Parameter, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*templateapi.Parameter))(in) + } + out.Name = in.Name + out.DisplayName = in.DisplayName + out.Description = in.Description + out.Value = in.Value + out.Generate = in.Generate + out.From = in.From + out.Required = in.Required + return nil +} + +func convert_api_Parameter_To_v1_Parameter(in *templateapi.Parameter, out *templateapiv1.Parameter, s conversion.Scope) error { + return autoconvert_api_Parameter_To_v1_Parameter(in, out, s) +} + +func autoconvert_api_Template_To_v1_Template(in *templateapi.Template, out *templateapiv1.Template, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*templateapi.Template))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if in.Parameters != nil { + out.Parameters = make([]templateapiv1.Parameter, len(in.Parameters)) + for i := range in.Parameters { + if err := convert_api_Parameter_To_v1_Parameter(&in.Parameters[i], &out.Parameters[i], s); err != nil { + return err + } + } + } else { + out.Parameters = nil + } + if err := s.Convert(&in.Objects, &out.Objects, 0); err != nil { + return err + } + // in.ObjectLabels has no peer in out + return nil +} + +func autoconvert_api_TemplateList_To_v1_TemplateList(in *templateapi.TemplateList, out *templateapiv1.TemplateList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*templateapi.TemplateList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]templateapiv1.Template, len(in.Items)) + for i := range in.Items { + if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_api_TemplateList_To_v1_TemplateList(in *templateapi.TemplateList, out *templateapiv1.TemplateList, s conversion.Scope) error { + return autoconvert_api_TemplateList_To_v1_TemplateList(in, out, s) +} + +func autoconvert_v1_Parameter_To_api_Parameter(in *templateapiv1.Parameter, out *templateapi.Parameter, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*templateapiv1.Parameter))(in) + } + out.Name = in.Name + out.DisplayName = in.DisplayName + out.Description = in.Description + out.Value = in.Value + out.Generate = in.Generate + out.From = in.From + out.Required = in.Required + return nil +} + +func convert_v1_Parameter_To_api_Parameter(in *templateapiv1.Parameter, out *templateapi.Parameter, s conversion.Scope) error { + return autoconvert_v1_Parameter_To_api_Parameter(in, out, s) +} + +func autoconvert_v1_Template_To_api_Template(in *templateapiv1.Template, out *templateapi.Template, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*templateapiv1.Template))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if err := s.Convert(&in.Objects, &out.Objects, 0); err != nil { + return err + } + if in.Parameters != nil { + out.Parameters = make([]templateapi.Parameter, len(in.Parameters)) + for i := range in.Parameters { + if err := convert_v1_Parameter_To_api_Parameter(&in.Parameters[i], &out.Parameters[i], s); err != nil { + return err + } + } + } else { + out.Parameters = nil + } + if in.Labels != nil { + out.Labels = make(map[string]string) + for key, val := range in.Labels { + out.Labels[key] = val + } + } else { + out.Labels = nil + } + return nil +} + +func autoconvert_v1_TemplateList_To_api_TemplateList(in *templateapiv1.TemplateList, out *templateapi.TemplateList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*templateapiv1.TemplateList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]templateapi.Template, len(in.Items)) + for i := range in.Items { + if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_v1_TemplateList_To_api_TemplateList(in *templateapiv1.TemplateList, out *templateapi.TemplateList, s conversion.Scope) error { + return autoconvert_v1_TemplateList_To_api_TemplateList(in, out, s) +} + +func autoconvert_api_Group_To_v1_Group(in *userapi.Group, out *userapiv1.Group, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapi.Group))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if in.Users != nil { + out.Users = make([]string, len(in.Users)) + for i := range in.Users { + out.Users[i] = in.Users[i] + } + } else { + out.Users = nil + } + return nil +} + +func convert_api_Group_To_v1_Group(in *userapi.Group, out *userapiv1.Group, s conversion.Scope) error { + return autoconvert_api_Group_To_v1_Group(in, out, s) +} + +func autoconvert_api_GroupList_To_v1_GroupList(in *userapi.GroupList, out *userapiv1.GroupList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapi.GroupList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]userapiv1.Group, len(in.Items)) + for i := range in.Items { + if err := convert_api_Group_To_v1_Group(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_api_GroupList_To_v1_GroupList(in *userapi.GroupList, out *userapiv1.GroupList, s conversion.Scope) error { + return autoconvert_api_GroupList_To_v1_GroupList(in, out, s) +} + +func autoconvert_api_Identity_To_v1_Identity(in *userapi.Identity, out *userapiv1.Identity, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapi.Identity))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + out.ProviderName = in.ProviderName + out.ProviderUserName = in.ProviderUserName + if err := convert_api_ObjectReference_To_v1_ObjectReference(&in.User, &out.User, s); err != nil { + return err + } + if in.Extra != nil { + out.Extra = make(map[string]string) + for key, val := range in.Extra { + out.Extra[key] = val + } + } else { + out.Extra = nil + } + return nil +} + +func convert_api_Identity_To_v1_Identity(in *userapi.Identity, out *userapiv1.Identity, s conversion.Scope) error { + return autoconvert_api_Identity_To_v1_Identity(in, out, s) +} + +func autoconvert_api_IdentityList_To_v1_IdentityList(in *userapi.IdentityList, out *userapiv1.IdentityList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapi.IdentityList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]userapiv1.Identity, len(in.Items)) + for i := range in.Items { + if err := convert_api_Identity_To_v1_Identity(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_api_IdentityList_To_v1_IdentityList(in *userapi.IdentityList, out *userapiv1.IdentityList, s conversion.Scope) error { + return autoconvert_api_IdentityList_To_v1_IdentityList(in, out, s) +} + +func autoconvert_api_User_To_v1_User(in *userapi.User, out *userapiv1.User, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapi.User))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + out.FullName = in.FullName + if in.Identities != nil { + out.Identities = make([]string, len(in.Identities)) + for i := range in.Identities { + out.Identities[i] = in.Identities[i] + } + } else { + out.Identities = nil + } + if in.Groups != nil { + out.Groups = make([]string, len(in.Groups)) + for i := range in.Groups { + out.Groups[i] = in.Groups[i] + } + } else { + out.Groups = nil + } + return nil +} + +func convert_api_User_To_v1_User(in *userapi.User, out *userapiv1.User, s conversion.Scope) error { + return autoconvert_api_User_To_v1_User(in, out, s) +} + +func autoconvert_api_UserIdentityMapping_To_v1_UserIdentityMapping(in *userapi.UserIdentityMapping, out *userapiv1.UserIdentityMapping, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapi.UserIdentityMapping))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if err := convert_api_ObjectReference_To_v1_ObjectReference(&in.Identity, &out.Identity, s); err != nil { + return err + } + if err := convert_api_ObjectReference_To_v1_ObjectReference(&in.User, &out.User, s); err != nil { + return err + } + return nil +} + +func convert_api_UserIdentityMapping_To_v1_UserIdentityMapping(in *userapi.UserIdentityMapping, out *userapiv1.UserIdentityMapping, s conversion.Scope) error { + return autoconvert_api_UserIdentityMapping_To_v1_UserIdentityMapping(in, out, s) +} + +func autoconvert_api_UserList_To_v1_UserList(in *userapi.UserList, out *userapiv1.UserList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapi.UserList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]userapiv1.User, len(in.Items)) + for i := range in.Items { + if err := convert_api_User_To_v1_User(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_api_UserList_To_v1_UserList(in *userapi.UserList, out *userapiv1.UserList, s conversion.Scope) error { + return autoconvert_api_UserList_To_v1_UserList(in, out, s) +} + +func autoconvert_v1_Group_To_api_Group(in *userapiv1.Group, out *userapi.Group, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapiv1.Group))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if in.Users != nil { + out.Users = make([]string, len(in.Users)) + for i := range in.Users { + out.Users[i] = in.Users[i] + } + } else { + out.Users = nil + } + return nil +} + +func convert_v1_Group_To_api_Group(in *userapiv1.Group, out *userapi.Group, s conversion.Scope) error { + return autoconvert_v1_Group_To_api_Group(in, out, s) +} + +func autoconvert_v1_GroupList_To_api_GroupList(in *userapiv1.GroupList, out *userapi.GroupList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapiv1.GroupList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]userapi.Group, len(in.Items)) + for i := range in.Items { + if err := convert_v1_Group_To_api_Group(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_v1_GroupList_To_api_GroupList(in *userapiv1.GroupList, out *userapi.GroupList, s conversion.Scope) error { + return autoconvert_v1_GroupList_To_api_GroupList(in, out, s) +} + +func autoconvert_v1_Identity_To_api_Identity(in *userapiv1.Identity, out *userapi.Identity, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapiv1.Identity))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + out.ProviderName = in.ProviderName + out.ProviderUserName = in.ProviderUserName + if err := convert_v1_ObjectReference_To_api_ObjectReference(&in.User, &out.User, s); err != nil { + return err + } + if in.Extra != nil { + out.Extra = make(map[string]string) + for key, val := range in.Extra { + out.Extra[key] = val + } + } else { + out.Extra = nil + } + return nil +} + +func convert_v1_Identity_To_api_Identity(in *userapiv1.Identity, out *userapi.Identity, s conversion.Scope) error { + return autoconvert_v1_Identity_To_api_Identity(in, out, s) +} + +func autoconvert_v1_IdentityList_To_api_IdentityList(in *userapiv1.IdentityList, out *userapi.IdentityList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapiv1.IdentityList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]userapi.Identity, len(in.Items)) + for i := range in.Items { + if err := convert_v1_Identity_To_api_Identity(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_v1_IdentityList_To_api_IdentityList(in *userapiv1.IdentityList, out *userapi.IdentityList, s conversion.Scope) error { + return autoconvert_v1_IdentityList_To_api_IdentityList(in, out, s) +} + +func autoconvert_v1_User_To_api_User(in *userapiv1.User, out *userapi.User, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapiv1.User))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + out.FullName = in.FullName if in.Identities != nil { out.Identities = make([]string, len(in.Identities)) for i := range in.Identities { out.Identities[i] = in.Identities[i] } } else { - out.Identities = nil + out.Identities = nil + } + if in.Groups != nil { + out.Groups = make([]string, len(in.Groups)) + for i := range in.Groups { + out.Groups[i] = in.Groups[i] + } + } else { + out.Groups = nil + } + return nil +} + +func convert_v1_User_To_api_User(in *userapiv1.User, out *userapi.User, s conversion.Scope) error { + return autoconvert_v1_User_To_api_User(in, out, s) +} + +func autoconvert_v1_UserIdentityMapping_To_api_UserIdentityMapping(in *userapiv1.UserIdentityMapping, out *userapi.UserIdentityMapping, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapiv1.UserIdentityMapping))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if err := convert_v1_ObjectReference_To_api_ObjectReference(&in.Identity, &out.Identity, s); err != nil { + return err + } + if err := convert_v1_ObjectReference_To_api_ObjectReference(&in.User, &out.User, s); err != nil { + return err + } + return nil +} + +func convert_v1_UserIdentityMapping_To_api_UserIdentityMapping(in *userapiv1.UserIdentityMapping, out *userapi.UserIdentityMapping, s conversion.Scope) error { + return autoconvert_v1_UserIdentityMapping_To_api_UserIdentityMapping(in, out, s) +} + +func autoconvert_v1_UserList_To_api_UserList(in *userapiv1.UserList, out *userapi.UserList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapiv1.UserList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]userapi.User, len(in.Items)) + for i := range in.Items { + if err := convert_v1_User_To_api_User(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_v1_UserList_To_api_UserList(in *userapiv1.UserList, out *userapi.UserList, s conversion.Scope) error { + return autoconvert_v1_UserList_To_api_UserList(in, out, s) +} + +func autoconvert_api_AWSElasticBlockStoreVolumeSource_To_v1_AWSElasticBlockStoreVolumeSource(in *pkgapi.AWSElasticBlockStoreVolumeSource, out *pkgapiv1.AWSElasticBlockStoreVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.AWSElasticBlockStoreVolumeSource))(in) + } + out.VolumeID = in.VolumeID + out.FSType = in.FSType + out.Partition = in.Partition + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_AWSElasticBlockStoreVolumeSource_To_v1_AWSElasticBlockStoreVolumeSource(in *pkgapi.AWSElasticBlockStoreVolumeSource, out *pkgapiv1.AWSElasticBlockStoreVolumeSource, s conversion.Scope) error { + return autoconvert_api_AWSElasticBlockStoreVolumeSource_To_v1_AWSElasticBlockStoreVolumeSource(in, out, s) +} + +func autoconvert_api_Capabilities_To_v1_Capabilities(in *pkgapi.Capabilities, out *pkgapiv1.Capabilities, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.Capabilities))(in) + } + if in.Add != nil { + out.Add = make([]pkgapiv1.Capability, len(in.Add)) + for i := range in.Add { + out.Add[i] = pkgapiv1.Capability(in.Add[i]) + } + } else { + out.Add = nil + } + if in.Drop != nil { + out.Drop = make([]pkgapiv1.Capability, len(in.Drop)) + for i := range in.Drop { + out.Drop[i] = pkgapiv1.Capability(in.Drop[i]) + } + } else { + out.Drop = nil + } + return nil +} + +func convert_api_Capabilities_To_v1_Capabilities(in *pkgapi.Capabilities, out *pkgapiv1.Capabilities, s conversion.Scope) error { + return autoconvert_api_Capabilities_To_v1_Capabilities(in, out, s) +} + +func autoconvert_api_CephFSVolumeSource_To_v1_CephFSVolumeSource(in *pkgapi.CephFSVolumeSource, out *pkgapiv1.CephFSVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.CephFSVolumeSource))(in) + } + if in.Monitors != nil { + out.Monitors = make([]string, len(in.Monitors)) + for i := range in.Monitors { + out.Monitors[i] = in.Monitors[i] + } + } else { + out.Monitors = nil + } + out.User = in.User + out.SecretFile = in.SecretFile + if in.SecretRef != nil { + out.SecretRef = new(pkgapiv1.LocalObjectReference) + if err := convert_api_LocalObjectReference_To_v1_LocalObjectReference(in.SecretRef, out.SecretRef, s); err != nil { + return err + } + } else { + out.SecretRef = nil + } + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_CephFSVolumeSource_To_v1_CephFSVolumeSource(in *pkgapi.CephFSVolumeSource, out *pkgapiv1.CephFSVolumeSource, s conversion.Scope) error { + return autoconvert_api_CephFSVolumeSource_To_v1_CephFSVolumeSource(in, out, s) +} + +func autoconvert_api_CinderVolumeSource_To_v1_CinderVolumeSource(in *pkgapi.CinderVolumeSource, out *pkgapiv1.CinderVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.CinderVolumeSource))(in) + } + out.VolumeID = in.VolumeID + out.FSType = in.FSType + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_CinderVolumeSource_To_v1_CinderVolumeSource(in *pkgapi.CinderVolumeSource, out *pkgapiv1.CinderVolumeSource, s conversion.Scope) error { + return autoconvert_api_CinderVolumeSource_To_v1_CinderVolumeSource(in, out, s) +} + +func autoconvert_api_Container_To_v1_Container(in *pkgapi.Container, out *pkgapiv1.Container, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.Container))(in) + } + out.Name = in.Name + out.Image = in.Image + if in.Command != nil { + out.Command = make([]string, len(in.Command)) + for i := range in.Command { + out.Command[i] = in.Command[i] + } + } else { + out.Command = nil + } + if in.Args != nil { + out.Args = make([]string, len(in.Args)) + for i := range in.Args { + out.Args[i] = in.Args[i] + } + } else { + out.Args = nil + } + out.WorkingDir = in.WorkingDir + if in.Ports != nil { + out.Ports = make([]pkgapiv1.ContainerPort, len(in.Ports)) + for i := range in.Ports { + if err := convert_api_ContainerPort_To_v1_ContainerPort(&in.Ports[i], &out.Ports[i], s); err != nil { + return err + } + } + } else { + out.Ports = nil + } + if in.Env != nil { + out.Env = make([]pkgapiv1.EnvVar, len(in.Env)) + for i := range in.Env { + if err := convert_api_EnvVar_To_v1_EnvVar(&in.Env[i], &out.Env[i], s); err != nil { + return err + } + } + } else { + out.Env = nil + } + if err := convert_api_ResourceRequirements_To_v1_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { + return err + } + if in.VolumeMounts != nil { + out.VolumeMounts = make([]pkgapiv1.VolumeMount, len(in.VolumeMounts)) + for i := range in.VolumeMounts { + if err := convert_api_VolumeMount_To_v1_VolumeMount(&in.VolumeMounts[i], &out.VolumeMounts[i], s); err != nil { + return err + } + } + } else { + out.VolumeMounts = nil + } + if in.LivenessProbe != nil { + out.LivenessProbe = new(pkgapiv1.Probe) + if err := convert_api_Probe_To_v1_Probe(in.LivenessProbe, out.LivenessProbe, s); err != nil { + return err + } + } else { + out.LivenessProbe = nil + } + if in.ReadinessProbe != nil { + out.ReadinessProbe = new(pkgapiv1.Probe) + if err := convert_api_Probe_To_v1_Probe(in.ReadinessProbe, out.ReadinessProbe, s); err != nil { + return err + } + } else { + out.ReadinessProbe = nil + } + if in.Lifecycle != nil { + out.Lifecycle = new(pkgapiv1.Lifecycle) + if err := convert_api_Lifecycle_To_v1_Lifecycle(in.Lifecycle, out.Lifecycle, s); err != nil { + return err + } + } else { + out.Lifecycle = nil + } + out.TerminationMessagePath = in.TerminationMessagePath + out.ImagePullPolicy = pkgapiv1.PullPolicy(in.ImagePullPolicy) + if in.SecurityContext != nil { + out.SecurityContext = new(pkgapiv1.SecurityContext) + if err := convert_api_SecurityContext_To_v1_SecurityContext(in.SecurityContext, out.SecurityContext, s); err != nil { + return err + } + } else { + out.SecurityContext = nil + } + out.Stdin = in.Stdin + out.StdinOnce = in.StdinOnce + out.TTY = in.TTY + return nil +} + +func convert_api_Container_To_v1_Container(in *pkgapi.Container, out *pkgapiv1.Container, s conversion.Scope) error { + return autoconvert_api_Container_To_v1_Container(in, out, s) +} + +func autoconvert_api_ContainerPort_To_v1_ContainerPort(in *pkgapi.ContainerPort, out *pkgapiv1.ContainerPort, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.ContainerPort))(in) + } + out.Name = in.Name + out.HostPort = in.HostPort + out.ContainerPort = in.ContainerPort + out.Protocol = pkgapiv1.Protocol(in.Protocol) + out.HostIP = in.HostIP + return nil +} + +func convert_api_ContainerPort_To_v1_ContainerPort(in *pkgapi.ContainerPort, out *pkgapiv1.ContainerPort, s conversion.Scope) error { + return autoconvert_api_ContainerPort_To_v1_ContainerPort(in, out, s) +} + +func autoconvert_api_DownwardAPIVolumeFile_To_v1_DownwardAPIVolumeFile(in *pkgapi.DownwardAPIVolumeFile, out *pkgapiv1.DownwardAPIVolumeFile, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.DownwardAPIVolumeFile))(in) + } + out.Path = in.Path + if err := convert_api_ObjectFieldSelector_To_v1_ObjectFieldSelector(&in.FieldRef, &out.FieldRef, s); err != nil { + return err + } + return nil +} + +func convert_api_DownwardAPIVolumeFile_To_v1_DownwardAPIVolumeFile(in *pkgapi.DownwardAPIVolumeFile, out *pkgapiv1.DownwardAPIVolumeFile, s conversion.Scope) error { + return autoconvert_api_DownwardAPIVolumeFile_To_v1_DownwardAPIVolumeFile(in, out, s) +} + +func autoconvert_api_DownwardAPIVolumeSource_To_v1_DownwardAPIVolumeSource(in *pkgapi.DownwardAPIVolumeSource, out *pkgapiv1.DownwardAPIVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.DownwardAPIVolumeSource))(in) + } + if in.Items != nil { + out.Items = make([]pkgapiv1.DownwardAPIVolumeFile, len(in.Items)) + for i := range in.Items { + if err := convert_api_DownwardAPIVolumeFile_To_v1_DownwardAPIVolumeFile(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_api_DownwardAPIVolumeSource_To_v1_DownwardAPIVolumeSource(in *pkgapi.DownwardAPIVolumeSource, out *pkgapiv1.DownwardAPIVolumeSource, s conversion.Scope) error { + return autoconvert_api_DownwardAPIVolumeSource_To_v1_DownwardAPIVolumeSource(in, out, s) +} + +func autoconvert_api_EmptyDirVolumeSource_To_v1_EmptyDirVolumeSource(in *pkgapi.EmptyDirVolumeSource, out *pkgapiv1.EmptyDirVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.EmptyDirVolumeSource))(in) + } + out.Medium = pkgapiv1.StorageMedium(in.Medium) + return nil +} + +func convert_api_EmptyDirVolumeSource_To_v1_EmptyDirVolumeSource(in *pkgapi.EmptyDirVolumeSource, out *pkgapiv1.EmptyDirVolumeSource, s conversion.Scope) error { + return autoconvert_api_EmptyDirVolumeSource_To_v1_EmptyDirVolumeSource(in, out, s) +} + +func autoconvert_api_EnvVar_To_v1_EnvVar(in *pkgapi.EnvVar, out *pkgapiv1.EnvVar, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.EnvVar))(in) + } + out.Name = in.Name + out.Value = in.Value + if in.ValueFrom != nil { + out.ValueFrom = new(pkgapiv1.EnvVarSource) + if err := convert_api_EnvVarSource_To_v1_EnvVarSource(in.ValueFrom, out.ValueFrom, s); err != nil { + return err + } + } else { + out.ValueFrom = nil + } + return nil +} + +func convert_api_EnvVar_To_v1_EnvVar(in *pkgapi.EnvVar, out *pkgapiv1.EnvVar, s conversion.Scope) error { + return autoconvert_api_EnvVar_To_v1_EnvVar(in, out, s) +} + +func autoconvert_api_EnvVarSource_To_v1_EnvVarSource(in *pkgapi.EnvVarSource, out *pkgapiv1.EnvVarSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.EnvVarSource))(in) + } + if in.FieldRef != nil { + out.FieldRef = new(pkgapiv1.ObjectFieldSelector) + if err := convert_api_ObjectFieldSelector_To_v1_ObjectFieldSelector(in.FieldRef, out.FieldRef, s); err != nil { + return err + } + } else { + out.FieldRef = nil + } + return nil +} + +func convert_api_EnvVarSource_To_v1_EnvVarSource(in *pkgapi.EnvVarSource, out *pkgapiv1.EnvVarSource, s conversion.Scope) error { + return autoconvert_api_EnvVarSource_To_v1_EnvVarSource(in, out, s) +} + +func autoconvert_api_ExecAction_To_v1_ExecAction(in *pkgapi.ExecAction, out *pkgapiv1.ExecAction, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.ExecAction))(in) + } + if in.Command != nil { + out.Command = make([]string, len(in.Command)) + for i := range in.Command { + out.Command[i] = in.Command[i] + } + } else { + out.Command = nil + } + return nil +} + +func convert_api_ExecAction_To_v1_ExecAction(in *pkgapi.ExecAction, out *pkgapiv1.ExecAction, s conversion.Scope) error { + return autoconvert_api_ExecAction_To_v1_ExecAction(in, out, s) +} + +func autoconvert_api_FCVolumeSource_To_v1_FCVolumeSource(in *pkgapi.FCVolumeSource, out *pkgapiv1.FCVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.FCVolumeSource))(in) + } + if in.TargetWWNs != nil { + out.TargetWWNs = make([]string, len(in.TargetWWNs)) + for i := range in.TargetWWNs { + out.TargetWWNs[i] = in.TargetWWNs[i] + } + } else { + out.TargetWWNs = nil + } + if in.Lun != nil { + out.Lun = new(int) + *out.Lun = *in.Lun + } else { + out.Lun = nil + } + out.FSType = in.FSType + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_FCVolumeSource_To_v1_FCVolumeSource(in *pkgapi.FCVolumeSource, out *pkgapiv1.FCVolumeSource, s conversion.Scope) error { + return autoconvert_api_FCVolumeSource_To_v1_FCVolumeSource(in, out, s) +} + +func autoconvert_api_FlockerVolumeSource_To_v1_FlockerVolumeSource(in *pkgapi.FlockerVolumeSource, out *pkgapiv1.FlockerVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.FlockerVolumeSource))(in) + } + out.DatasetName = in.DatasetName + return nil +} + +func convert_api_FlockerVolumeSource_To_v1_FlockerVolumeSource(in *pkgapi.FlockerVolumeSource, out *pkgapiv1.FlockerVolumeSource, s conversion.Scope) error { + return autoconvert_api_FlockerVolumeSource_To_v1_FlockerVolumeSource(in, out, s) +} + +func autoconvert_api_GCEPersistentDiskVolumeSource_To_v1_GCEPersistentDiskVolumeSource(in *pkgapi.GCEPersistentDiskVolumeSource, out *pkgapiv1.GCEPersistentDiskVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.GCEPersistentDiskVolumeSource))(in) + } + out.PDName = in.PDName + out.FSType = in.FSType + out.Partition = in.Partition + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_GCEPersistentDiskVolumeSource_To_v1_GCEPersistentDiskVolumeSource(in *pkgapi.GCEPersistentDiskVolumeSource, out *pkgapiv1.GCEPersistentDiskVolumeSource, s conversion.Scope) error { + return autoconvert_api_GCEPersistentDiskVolumeSource_To_v1_GCEPersistentDiskVolumeSource(in, out, s) +} + +func autoconvert_api_GitRepoVolumeSource_To_v1_GitRepoVolumeSource(in *pkgapi.GitRepoVolumeSource, out *pkgapiv1.GitRepoVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.GitRepoVolumeSource))(in) + } + out.Repository = in.Repository + out.Revision = in.Revision + return nil +} + +func convert_api_GitRepoVolumeSource_To_v1_GitRepoVolumeSource(in *pkgapi.GitRepoVolumeSource, out *pkgapiv1.GitRepoVolumeSource, s conversion.Scope) error { + return autoconvert_api_GitRepoVolumeSource_To_v1_GitRepoVolumeSource(in, out, s) +} + +func autoconvert_api_GlusterfsVolumeSource_To_v1_GlusterfsVolumeSource(in *pkgapi.GlusterfsVolumeSource, out *pkgapiv1.GlusterfsVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.GlusterfsVolumeSource))(in) + } + out.EndpointsName = in.EndpointsName + out.Path = in.Path + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_GlusterfsVolumeSource_To_v1_GlusterfsVolumeSource(in *pkgapi.GlusterfsVolumeSource, out *pkgapiv1.GlusterfsVolumeSource, s conversion.Scope) error { + return autoconvert_api_GlusterfsVolumeSource_To_v1_GlusterfsVolumeSource(in, out, s) +} + +func autoconvert_api_HTTPGetAction_To_v1_HTTPGetAction(in *pkgapi.HTTPGetAction, out *pkgapiv1.HTTPGetAction, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.HTTPGetAction))(in) + } + out.Path = in.Path + if err := s.Convert(&in.Port, &out.Port, 0); err != nil { + return err + } + out.Host = in.Host + out.Scheme = pkgapiv1.URIScheme(in.Scheme) + return nil +} + +func convert_api_HTTPGetAction_To_v1_HTTPGetAction(in *pkgapi.HTTPGetAction, out *pkgapiv1.HTTPGetAction, s conversion.Scope) error { + return autoconvert_api_HTTPGetAction_To_v1_HTTPGetAction(in, out, s) +} + +func autoconvert_api_Handler_To_v1_Handler(in *pkgapi.Handler, out *pkgapiv1.Handler, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.Handler))(in) + } + if in.Exec != nil { + out.Exec = new(pkgapiv1.ExecAction) + if err := convert_api_ExecAction_To_v1_ExecAction(in.Exec, out.Exec, s); err != nil { + return err + } + } else { + out.Exec = nil + } + if in.HTTPGet != nil { + out.HTTPGet = new(pkgapiv1.HTTPGetAction) + if err := convert_api_HTTPGetAction_To_v1_HTTPGetAction(in.HTTPGet, out.HTTPGet, s); err != nil { + return err + } + } else { + out.HTTPGet = nil + } + if in.TCPSocket != nil { + out.TCPSocket = new(pkgapiv1.TCPSocketAction) + if err := convert_api_TCPSocketAction_To_v1_TCPSocketAction(in.TCPSocket, out.TCPSocket, s); err != nil { + return err + } + } else { + out.TCPSocket = nil + } + return nil +} + +func convert_api_Handler_To_v1_Handler(in *pkgapi.Handler, out *pkgapiv1.Handler, s conversion.Scope) error { + return autoconvert_api_Handler_To_v1_Handler(in, out, s) +} + +func autoconvert_api_HostPathVolumeSource_To_v1_HostPathVolumeSource(in *pkgapi.HostPathVolumeSource, out *pkgapiv1.HostPathVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.HostPathVolumeSource))(in) + } + out.Path = in.Path + return nil +} + +func convert_api_HostPathVolumeSource_To_v1_HostPathVolumeSource(in *pkgapi.HostPathVolumeSource, out *pkgapiv1.HostPathVolumeSource, s conversion.Scope) error { + return autoconvert_api_HostPathVolumeSource_To_v1_HostPathVolumeSource(in, out, s) +} + +func autoconvert_api_ISCSIVolumeSource_To_v1_ISCSIVolumeSource(in *pkgapi.ISCSIVolumeSource, out *pkgapiv1.ISCSIVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.ISCSIVolumeSource))(in) + } + out.TargetPortal = in.TargetPortal + out.IQN = in.IQN + out.Lun = in.Lun + out.FSType = in.FSType + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_ISCSIVolumeSource_To_v1_ISCSIVolumeSource(in *pkgapi.ISCSIVolumeSource, out *pkgapiv1.ISCSIVolumeSource, s conversion.Scope) error { + return autoconvert_api_ISCSIVolumeSource_To_v1_ISCSIVolumeSource(in, out, s) +} + +func autoconvert_api_Lifecycle_To_v1_Lifecycle(in *pkgapi.Lifecycle, out *pkgapiv1.Lifecycle, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.Lifecycle))(in) + } + if in.PostStart != nil { + out.PostStart = new(pkgapiv1.Handler) + if err := convert_api_Handler_To_v1_Handler(in.PostStart, out.PostStart, s); err != nil { + return err + } + } else { + out.PostStart = nil + } + if in.PreStop != nil { + out.PreStop = new(pkgapiv1.Handler) + if err := convert_api_Handler_To_v1_Handler(in.PreStop, out.PreStop, s); err != nil { + return err + } + } else { + out.PreStop = nil + } + return nil +} + +func convert_api_Lifecycle_To_v1_Lifecycle(in *pkgapi.Lifecycle, out *pkgapiv1.Lifecycle, s conversion.Scope) error { + return autoconvert_api_Lifecycle_To_v1_Lifecycle(in, out, s) +} + +func autoconvert_api_LocalObjectReference_To_v1_LocalObjectReference(in *pkgapi.LocalObjectReference, out *pkgapiv1.LocalObjectReference, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.LocalObjectReference))(in) + } + out.Name = in.Name + return nil +} + +func convert_api_LocalObjectReference_To_v1_LocalObjectReference(in *pkgapi.LocalObjectReference, out *pkgapiv1.LocalObjectReference, s conversion.Scope) error { + return autoconvert_api_LocalObjectReference_To_v1_LocalObjectReference(in, out, s) +} + +func autoconvert_api_NFSVolumeSource_To_v1_NFSVolumeSource(in *pkgapi.NFSVolumeSource, out *pkgapiv1.NFSVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.NFSVolumeSource))(in) + } + out.Server = in.Server + out.Path = in.Path + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_NFSVolumeSource_To_v1_NFSVolumeSource(in *pkgapi.NFSVolumeSource, out *pkgapiv1.NFSVolumeSource, s conversion.Scope) error { + return autoconvert_api_NFSVolumeSource_To_v1_NFSVolumeSource(in, out, s) +} + +func autoconvert_api_ObjectFieldSelector_To_v1_ObjectFieldSelector(in *pkgapi.ObjectFieldSelector, out *pkgapiv1.ObjectFieldSelector, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.ObjectFieldSelector))(in) + } + out.APIVersion = in.APIVersion + out.FieldPath = in.FieldPath + return nil +} + +func convert_api_ObjectFieldSelector_To_v1_ObjectFieldSelector(in *pkgapi.ObjectFieldSelector, out *pkgapiv1.ObjectFieldSelector, s conversion.Scope) error { + return autoconvert_api_ObjectFieldSelector_To_v1_ObjectFieldSelector(in, out, s) +} + +func autoconvert_api_ObjectMeta_To_v1_ObjectMeta(in *pkgapi.ObjectMeta, out *pkgapiv1.ObjectMeta, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.ObjectMeta))(in) + } + out.Name = in.Name + out.GenerateName = in.GenerateName + out.Namespace = in.Namespace + out.SelfLink = in.SelfLink + out.UID = in.UID + out.ResourceVersion = in.ResourceVersion + out.Generation = in.Generation + if err := s.Convert(&in.CreationTimestamp, &out.CreationTimestamp, 0); err != nil { + return err + } + if in.DeletionTimestamp != nil { + if err := s.Convert(&in.DeletionTimestamp, &out.DeletionTimestamp, 0); err != nil { + return err + } + } else { + out.DeletionTimestamp = nil + } + if in.DeletionGracePeriodSeconds != nil { + out.DeletionGracePeriodSeconds = new(int64) + *out.DeletionGracePeriodSeconds = *in.DeletionGracePeriodSeconds + } else { + out.DeletionGracePeriodSeconds = nil + } + if in.Labels != nil { + out.Labels = make(map[string]string) + for key, val := range in.Labels { + out.Labels[key] = val + } + } else { + out.Labels = nil + } + if in.Annotations != nil { + out.Annotations = make(map[string]string) + for key, val := range in.Annotations { + out.Annotations[key] = val + } + } else { + out.Annotations = nil + } + return nil +} + +func convert_api_ObjectMeta_To_v1_ObjectMeta(in *pkgapi.ObjectMeta, out *pkgapiv1.ObjectMeta, s conversion.Scope) error { + return autoconvert_api_ObjectMeta_To_v1_ObjectMeta(in, out, s) +} + +func autoconvert_api_ObjectReference_To_v1_ObjectReference(in *pkgapi.ObjectReference, out *pkgapiv1.ObjectReference, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.ObjectReference))(in) + } + out.Kind = in.Kind + out.Namespace = in.Namespace + out.Name = in.Name + out.UID = in.UID + out.APIVersion = in.APIVersion + out.ResourceVersion = in.ResourceVersion + out.FieldPath = in.FieldPath + return nil +} + +func convert_api_ObjectReference_To_v1_ObjectReference(in *pkgapi.ObjectReference, out *pkgapiv1.ObjectReference, s conversion.Scope) error { + return autoconvert_api_ObjectReference_To_v1_ObjectReference(in, out, s) +} + +func autoconvert_api_PersistentVolumeClaimVolumeSource_To_v1_PersistentVolumeClaimVolumeSource(in *pkgapi.PersistentVolumeClaimVolumeSource, out *pkgapiv1.PersistentVolumeClaimVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.PersistentVolumeClaimVolumeSource))(in) + } + out.ClaimName = in.ClaimName + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_PersistentVolumeClaimVolumeSource_To_v1_PersistentVolumeClaimVolumeSource(in *pkgapi.PersistentVolumeClaimVolumeSource, out *pkgapiv1.PersistentVolumeClaimVolumeSource, s conversion.Scope) error { + return autoconvert_api_PersistentVolumeClaimVolumeSource_To_v1_PersistentVolumeClaimVolumeSource(in, out, s) +} + +func autoconvert_api_PodSpec_To_v1_PodSpec(in *pkgapi.PodSpec, out *pkgapiv1.PodSpec, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.PodSpec))(in) + } + if in.Volumes != nil { + out.Volumes = make([]pkgapiv1.Volume, len(in.Volumes)) + for i := range in.Volumes { + if err := convert_api_Volume_To_v1_Volume(&in.Volumes[i], &out.Volumes[i], s); err != nil { + return err + } + } + } else { + out.Volumes = nil + } + if in.Containers != nil { + out.Containers = make([]pkgapiv1.Container, len(in.Containers)) + for i := range in.Containers { + if err := convert_api_Container_To_v1_Container(&in.Containers[i], &out.Containers[i], s); err != nil { + return err + } + } + } else { + out.Containers = nil + } + out.RestartPolicy = pkgapiv1.RestartPolicy(in.RestartPolicy) + if in.TerminationGracePeriodSeconds != nil { + out.TerminationGracePeriodSeconds = new(int64) + *out.TerminationGracePeriodSeconds = *in.TerminationGracePeriodSeconds + } else { + out.TerminationGracePeriodSeconds = nil + } + if in.ActiveDeadlineSeconds != nil { + out.ActiveDeadlineSeconds = new(int64) + *out.ActiveDeadlineSeconds = *in.ActiveDeadlineSeconds + } else { + out.ActiveDeadlineSeconds = nil + } + out.DNSPolicy = pkgapiv1.DNSPolicy(in.DNSPolicy) + if in.NodeSelector != nil { + out.NodeSelector = make(map[string]string) + for key, val := range in.NodeSelector { + out.NodeSelector[key] = val + } + } else { + out.NodeSelector = nil + } + out.ServiceAccountName = in.ServiceAccountName + out.NodeName = in.NodeName + if in.SecurityContext != nil { + if err := s.Convert(&in.SecurityContext, &out.SecurityContext, 0); err != nil { + return err + } + } else { + out.SecurityContext = nil + } + if in.ImagePullSecrets != nil { + out.ImagePullSecrets = make([]pkgapiv1.LocalObjectReference, len(in.ImagePullSecrets)) + for i := range in.ImagePullSecrets { + if err := convert_api_LocalObjectReference_To_v1_LocalObjectReference(&in.ImagePullSecrets[i], &out.ImagePullSecrets[i], s); err != nil { + return err + } + } + } else { + out.ImagePullSecrets = nil + } + return nil +} + +func autoconvert_api_PodTemplateSpec_To_v1_PodTemplateSpec(in *pkgapi.PodTemplateSpec, out *pkgapiv1.PodTemplateSpec, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.PodTemplateSpec))(in) + } + if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil { + return err + } + return nil +} + +func convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(in *pkgapi.PodTemplateSpec, out *pkgapiv1.PodTemplateSpec, s conversion.Scope) error { + return autoconvert_api_PodTemplateSpec_To_v1_PodTemplateSpec(in, out, s) +} + +func autoconvert_api_Probe_To_v1_Probe(in *pkgapi.Probe, out *pkgapiv1.Probe, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.Probe))(in) + } + if err := convert_api_Handler_To_v1_Handler(&in.Handler, &out.Handler, s); err != nil { + return err + } + out.InitialDelaySeconds = in.InitialDelaySeconds + out.TimeoutSeconds = in.TimeoutSeconds + return nil +} + +func convert_api_Probe_To_v1_Probe(in *pkgapi.Probe, out *pkgapiv1.Probe, s conversion.Scope) error { + return autoconvert_api_Probe_To_v1_Probe(in, out, s) +} + +func autoconvert_api_RBDVolumeSource_To_v1_RBDVolumeSource(in *pkgapi.RBDVolumeSource, out *pkgapiv1.RBDVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.RBDVolumeSource))(in) + } + if in.CephMonitors != nil { + out.CephMonitors = make([]string, len(in.CephMonitors)) + for i := range in.CephMonitors { + out.CephMonitors[i] = in.CephMonitors[i] + } + } else { + out.CephMonitors = nil + } + out.RBDImage = in.RBDImage + out.FSType = in.FSType + out.RBDPool = in.RBDPool + out.RadosUser = in.RadosUser + out.Keyring = in.Keyring + if in.SecretRef != nil { + out.SecretRef = new(pkgapiv1.LocalObjectReference) + if err := convert_api_LocalObjectReference_To_v1_LocalObjectReference(in.SecretRef, out.SecretRef, s); err != nil { + return err + } + } else { + out.SecretRef = nil + } + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_RBDVolumeSource_To_v1_RBDVolumeSource(in *pkgapi.RBDVolumeSource, out *pkgapiv1.RBDVolumeSource, s conversion.Scope) error { + return autoconvert_api_RBDVolumeSource_To_v1_RBDVolumeSource(in, out, s) +} + +func autoconvert_api_ResourceRequirements_To_v1_ResourceRequirements(in *pkgapi.ResourceRequirements, out *pkgapiv1.ResourceRequirements, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.ResourceRequirements))(in) + } + if in.Limits != nil { + out.Limits = make(pkgapiv1.ResourceList) + for key, val := range in.Limits { + newVal := resource.Quantity{} + if err := s.Convert(&val, &newVal, 0); err != nil { + return err + } + out.Limits[pkgapiv1.ResourceName(key)] = newVal + } + } else { + out.Limits = nil + } + if in.Requests != nil { + out.Requests = make(pkgapiv1.ResourceList) + for key, val := range in.Requests { + newVal := resource.Quantity{} + if err := s.Convert(&val, &newVal, 0); err != nil { + return err + } + out.Requests[pkgapiv1.ResourceName(key)] = newVal + } + } else { + out.Requests = nil + } + return nil +} + +func convert_api_ResourceRequirements_To_v1_ResourceRequirements(in *pkgapi.ResourceRequirements, out *pkgapiv1.ResourceRequirements, s conversion.Scope) error { + return autoconvert_api_ResourceRequirements_To_v1_ResourceRequirements(in, out, s) +} + +func autoconvert_api_SELinuxOptions_To_v1_SELinuxOptions(in *pkgapi.SELinuxOptions, out *pkgapiv1.SELinuxOptions, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.SELinuxOptions))(in) + } + out.User = in.User + out.Role = in.Role + out.Type = in.Type + out.Level = in.Level + return nil +} + +func convert_api_SELinuxOptions_To_v1_SELinuxOptions(in *pkgapi.SELinuxOptions, out *pkgapiv1.SELinuxOptions, s conversion.Scope) error { + return autoconvert_api_SELinuxOptions_To_v1_SELinuxOptions(in, out, s) +} + +func autoconvert_api_SecretVolumeSource_To_v1_SecretVolumeSource(in *pkgapi.SecretVolumeSource, out *pkgapiv1.SecretVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.SecretVolumeSource))(in) + } + out.SecretName = in.SecretName + return nil +} + +func convert_api_SecretVolumeSource_To_v1_SecretVolumeSource(in *pkgapi.SecretVolumeSource, out *pkgapiv1.SecretVolumeSource, s conversion.Scope) error { + return autoconvert_api_SecretVolumeSource_To_v1_SecretVolumeSource(in, out, s) +} + +func autoconvert_api_SecurityContext_To_v1_SecurityContext(in *pkgapi.SecurityContext, out *pkgapiv1.SecurityContext, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.SecurityContext))(in) + } + if in.Capabilities != nil { + out.Capabilities = new(pkgapiv1.Capabilities) + if err := convert_api_Capabilities_To_v1_Capabilities(in.Capabilities, out.Capabilities, s); err != nil { + return err + } + } else { + out.Capabilities = nil + } + if in.Privileged != nil { + out.Privileged = new(bool) + *out.Privileged = *in.Privileged + } else { + out.Privileged = nil + } + if in.SELinuxOptions != nil { + out.SELinuxOptions = new(pkgapiv1.SELinuxOptions) + if err := convert_api_SELinuxOptions_To_v1_SELinuxOptions(in.SELinuxOptions, out.SELinuxOptions, s); err != nil { + return err + } + } else { + out.SELinuxOptions = nil + } + if in.RunAsUser != nil { + out.RunAsUser = new(int64) + *out.RunAsUser = *in.RunAsUser + } else { + out.RunAsUser = nil + } + if in.RunAsNonRoot != nil { + out.RunAsNonRoot = new(bool) + *out.RunAsNonRoot = *in.RunAsNonRoot + } else { + out.RunAsNonRoot = nil + } + return nil +} + +func convert_api_SecurityContext_To_v1_SecurityContext(in *pkgapi.SecurityContext, out *pkgapiv1.SecurityContext, s conversion.Scope) error { + return autoconvert_api_SecurityContext_To_v1_SecurityContext(in, out, s) +} + +func autoconvert_api_TCPSocketAction_To_v1_TCPSocketAction(in *pkgapi.TCPSocketAction, out *pkgapiv1.TCPSocketAction, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.TCPSocketAction))(in) + } + if err := s.Convert(&in.Port, &out.Port, 0); err != nil { + return err + } + return nil +} + +func convert_api_TCPSocketAction_To_v1_TCPSocketAction(in *pkgapi.TCPSocketAction, out *pkgapiv1.TCPSocketAction, s conversion.Scope) error { + return autoconvert_api_TCPSocketAction_To_v1_TCPSocketAction(in, out, s) +} + +func autoconvert_api_Volume_To_v1_Volume(in *pkgapi.Volume, out *pkgapiv1.Volume, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.Volume))(in) + } + out.Name = in.Name + if err := s.Convert(&in.VolumeSource, &out.VolumeSource, 0); err != nil { + return err + } + return nil +} + +func convert_api_Volume_To_v1_Volume(in *pkgapi.Volume, out *pkgapiv1.Volume, s conversion.Scope) error { + return autoconvert_api_Volume_To_v1_Volume(in, out, s) +} + +func autoconvert_api_VolumeMount_To_v1_VolumeMount(in *pkgapi.VolumeMount, out *pkgapiv1.VolumeMount, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.VolumeMount))(in) + } + out.Name = in.Name + out.ReadOnly = in.ReadOnly + out.MountPath = in.MountPath + return nil +} + +func convert_api_VolumeMount_To_v1_VolumeMount(in *pkgapi.VolumeMount, out *pkgapiv1.VolumeMount, s conversion.Scope) error { + return autoconvert_api_VolumeMount_To_v1_VolumeMount(in, out, s) +} + +func autoconvert_api_VolumeSource_To_v1_VolumeSource(in *pkgapi.VolumeSource, out *pkgapiv1.VolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.VolumeSource))(in) + } + if in.HostPath != nil { + out.HostPath = new(pkgapiv1.HostPathVolumeSource) + if err := convert_api_HostPathVolumeSource_To_v1_HostPathVolumeSource(in.HostPath, out.HostPath, s); err != nil { + return err + } + } else { + out.HostPath = nil + } + if in.EmptyDir != nil { + out.EmptyDir = new(pkgapiv1.EmptyDirVolumeSource) + if err := convert_api_EmptyDirVolumeSource_To_v1_EmptyDirVolumeSource(in.EmptyDir, out.EmptyDir, s); err != nil { + return err + } + } else { + out.EmptyDir = nil + } + if in.GCEPersistentDisk != nil { + out.GCEPersistentDisk = new(pkgapiv1.GCEPersistentDiskVolumeSource) + if err := convert_api_GCEPersistentDiskVolumeSource_To_v1_GCEPersistentDiskVolumeSource(in.GCEPersistentDisk, out.GCEPersistentDisk, s); err != nil { + return err + } + } else { + out.GCEPersistentDisk = nil + } + if in.AWSElasticBlockStore != nil { + out.AWSElasticBlockStore = new(pkgapiv1.AWSElasticBlockStoreVolumeSource) + if err := convert_api_AWSElasticBlockStoreVolumeSource_To_v1_AWSElasticBlockStoreVolumeSource(in.AWSElasticBlockStore, out.AWSElasticBlockStore, s); err != nil { + return err + } + } else { + out.AWSElasticBlockStore = nil + } + if in.GitRepo != nil { + out.GitRepo = new(pkgapiv1.GitRepoVolumeSource) + if err := convert_api_GitRepoVolumeSource_To_v1_GitRepoVolumeSource(in.GitRepo, out.GitRepo, s); err != nil { + return err + } + } else { + out.GitRepo = nil + } + if in.Secret != nil { + out.Secret = new(pkgapiv1.SecretVolumeSource) + if err := convert_api_SecretVolumeSource_To_v1_SecretVolumeSource(in.Secret, out.Secret, s); err != nil { + return err + } + } else { + out.Secret = nil + } + if in.NFS != nil { + out.NFS = new(pkgapiv1.NFSVolumeSource) + if err := convert_api_NFSVolumeSource_To_v1_NFSVolumeSource(in.NFS, out.NFS, s); err != nil { + return err + } + } else { + out.NFS = nil + } + if in.ISCSI != nil { + out.ISCSI = new(pkgapiv1.ISCSIVolumeSource) + if err := convert_api_ISCSIVolumeSource_To_v1_ISCSIVolumeSource(in.ISCSI, out.ISCSI, s); err != nil { + return err + } + } else { + out.ISCSI = nil + } + if in.Glusterfs != nil { + out.Glusterfs = new(pkgapiv1.GlusterfsVolumeSource) + if err := convert_api_GlusterfsVolumeSource_To_v1_GlusterfsVolumeSource(in.Glusterfs, out.Glusterfs, s); err != nil { + return err + } + } else { + out.Glusterfs = nil + } + if in.PersistentVolumeClaim != nil { + out.PersistentVolumeClaim = new(pkgapiv1.PersistentVolumeClaimVolumeSource) + if err := convert_api_PersistentVolumeClaimVolumeSource_To_v1_PersistentVolumeClaimVolumeSource(in.PersistentVolumeClaim, out.PersistentVolumeClaim, s); err != nil { + return err + } + } else { + out.PersistentVolumeClaim = nil + } + if in.RBD != nil { + out.RBD = new(pkgapiv1.RBDVolumeSource) + if err := convert_api_RBDVolumeSource_To_v1_RBDVolumeSource(in.RBD, out.RBD, s); err != nil { + return err + } + } else { + out.RBD = nil + } + if in.Cinder != nil { + out.Cinder = new(pkgapiv1.CinderVolumeSource) + if err := convert_api_CinderVolumeSource_To_v1_CinderVolumeSource(in.Cinder, out.Cinder, s); err != nil { + return err + } + } else { + out.Cinder = nil + } + if in.CephFS != nil { + out.CephFS = new(pkgapiv1.CephFSVolumeSource) + if err := convert_api_CephFSVolumeSource_To_v1_CephFSVolumeSource(in.CephFS, out.CephFS, s); err != nil { + return err + } + } else { + out.CephFS = nil + } + if in.Flocker != nil { + out.Flocker = new(pkgapiv1.FlockerVolumeSource) + if err := convert_api_FlockerVolumeSource_To_v1_FlockerVolumeSource(in.Flocker, out.Flocker, s); err != nil { + return err + } + } else { + out.Flocker = nil + } + if in.DownwardAPI != nil { + out.DownwardAPI = new(pkgapiv1.DownwardAPIVolumeSource) + if err := convert_api_DownwardAPIVolumeSource_To_v1_DownwardAPIVolumeSource(in.DownwardAPI, out.DownwardAPI, s); err != nil { + return err + } + } else { + out.DownwardAPI = nil + } + if in.FC != nil { + out.FC = new(pkgapiv1.FCVolumeSource) + if err := convert_api_FCVolumeSource_To_v1_FCVolumeSource(in.FC, out.FC, s); err != nil { + return err + } + } else { + out.FC = nil + } + return nil +} + +func autoconvert_v1_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource(in *pkgapiv1.AWSElasticBlockStoreVolumeSource, out *pkgapi.AWSElasticBlockStoreVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.AWSElasticBlockStoreVolumeSource))(in) + } + out.VolumeID = in.VolumeID + out.FSType = in.FSType + out.Partition = in.Partition + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_v1_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource(in *pkgapiv1.AWSElasticBlockStoreVolumeSource, out *pkgapi.AWSElasticBlockStoreVolumeSource, s conversion.Scope) error { + return autoconvert_v1_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource(in, out, s) +} + +func autoconvert_v1_Capabilities_To_api_Capabilities(in *pkgapiv1.Capabilities, out *pkgapi.Capabilities, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.Capabilities))(in) + } + if in.Add != nil { + out.Add = make([]pkgapi.Capability, len(in.Add)) + for i := range in.Add { + out.Add[i] = pkgapi.Capability(in.Add[i]) + } + } else { + out.Add = nil } - if in.Groups != nil { - out.Groups = make([]string, len(in.Groups)) - for i := range in.Groups { - out.Groups[i] = in.Groups[i] + if in.Drop != nil { + out.Drop = make([]pkgapi.Capability, len(in.Drop)) + for i := range in.Drop { + out.Drop[i] = pkgapi.Capability(in.Drop[i]) } } else { - out.Groups = nil + out.Drop = nil } return nil } -func convert_v1_User_To_api_User(in *userapiv1.User, out *userapi.User, s conversion.Scope) error { - return autoconvert_v1_User_To_api_User(in, out, s) +func convert_v1_Capabilities_To_api_Capabilities(in *pkgapiv1.Capabilities, out *pkgapi.Capabilities, s conversion.Scope) error { + return autoconvert_v1_Capabilities_To_api_Capabilities(in, out, s) } -func autoconvert_v1_UserIdentityMapping_To_api_UserIdentityMapping(in *userapiv1.UserIdentityMapping, out *userapi.UserIdentityMapping, s conversion.Scope) error { +func autoconvert_v1_CephFSVolumeSource_To_api_CephFSVolumeSource(in *pkgapiv1.CephFSVolumeSource, out *pkgapi.CephFSVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapiv1.UserIdentityMapping))(in) + defaulting.(func(*pkgapiv1.CephFSVolumeSource))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + if in.Monitors != nil { + out.Monitors = make([]string, len(in.Monitors)) + for i := range in.Monitors { + out.Monitors[i] = in.Monitors[i] + } + } else { + out.Monitors = nil } - if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err + out.User = in.User + out.SecretFile = in.SecretFile + if in.SecretRef != nil { + out.SecretRef = new(pkgapi.LocalObjectReference) + if err := convert_v1_LocalObjectReference_To_api_LocalObjectReference(in.SecretRef, out.SecretRef, s); err != nil { + return err + } + } else { + out.SecretRef = nil } - if err := convert_v1_ObjectReference_To_api_ObjectReference(&in.Identity, &out.Identity, s); err != nil { - return err + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_v1_CephFSVolumeSource_To_api_CephFSVolumeSource(in *pkgapiv1.CephFSVolumeSource, out *pkgapi.CephFSVolumeSource, s conversion.Scope) error { + return autoconvert_v1_CephFSVolumeSource_To_api_CephFSVolumeSource(in, out, s) +} + +func autoconvert_v1_CinderVolumeSource_To_api_CinderVolumeSource(in *pkgapiv1.CinderVolumeSource, out *pkgapi.CinderVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.CinderVolumeSource))(in) } - if err := convert_v1_ObjectReference_To_api_ObjectReference(&in.User, &out.User, s); err != nil { + out.VolumeID = in.VolumeID + out.FSType = in.FSType + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_v1_CinderVolumeSource_To_api_CinderVolumeSource(in *pkgapiv1.CinderVolumeSource, out *pkgapi.CinderVolumeSource, s conversion.Scope) error { + return autoconvert_v1_CinderVolumeSource_To_api_CinderVolumeSource(in, out, s) +} + +func autoconvert_v1_Container_To_api_Container(in *pkgapiv1.Container, out *pkgapi.Container, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.Container))(in) + } + out.Name = in.Name + out.Image = in.Image + if in.Command != nil { + out.Command = make([]string, len(in.Command)) + for i := range in.Command { + out.Command[i] = in.Command[i] + } + } else { + out.Command = nil + } + if in.Args != nil { + out.Args = make([]string, len(in.Args)) + for i := range in.Args { + out.Args[i] = in.Args[i] + } + } else { + out.Args = nil + } + out.WorkingDir = in.WorkingDir + if in.Ports != nil { + out.Ports = make([]pkgapi.ContainerPort, len(in.Ports)) + for i := range in.Ports { + if err := convert_v1_ContainerPort_To_api_ContainerPort(&in.Ports[i], &out.Ports[i], s); err != nil { + return err + } + } + } else { + out.Ports = nil + } + if in.Env != nil { + out.Env = make([]pkgapi.EnvVar, len(in.Env)) + for i := range in.Env { + if err := convert_v1_EnvVar_To_api_EnvVar(&in.Env[i], &out.Env[i], s); err != nil { + return err + } + } + } else { + out.Env = nil + } + if err := convert_v1_ResourceRequirements_To_api_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { return err } + if in.VolumeMounts != nil { + out.VolumeMounts = make([]pkgapi.VolumeMount, len(in.VolumeMounts)) + for i := range in.VolumeMounts { + if err := convert_v1_VolumeMount_To_api_VolumeMount(&in.VolumeMounts[i], &out.VolumeMounts[i], s); err != nil { + return err + } + } + } else { + out.VolumeMounts = nil + } + if in.LivenessProbe != nil { + out.LivenessProbe = new(pkgapi.Probe) + if err := convert_v1_Probe_To_api_Probe(in.LivenessProbe, out.LivenessProbe, s); err != nil { + return err + } + } else { + out.LivenessProbe = nil + } + if in.ReadinessProbe != nil { + out.ReadinessProbe = new(pkgapi.Probe) + if err := convert_v1_Probe_To_api_Probe(in.ReadinessProbe, out.ReadinessProbe, s); err != nil { + return err + } + } else { + out.ReadinessProbe = nil + } + if in.Lifecycle != nil { + out.Lifecycle = new(pkgapi.Lifecycle) + if err := convert_v1_Lifecycle_To_api_Lifecycle(in.Lifecycle, out.Lifecycle, s); err != nil { + return err + } + } else { + out.Lifecycle = nil + } + out.TerminationMessagePath = in.TerminationMessagePath + out.ImagePullPolicy = pkgapi.PullPolicy(in.ImagePullPolicy) + if in.SecurityContext != nil { + out.SecurityContext = new(pkgapi.SecurityContext) + if err := convert_v1_SecurityContext_To_api_SecurityContext(in.SecurityContext, out.SecurityContext, s); err != nil { + return err + } + } else { + out.SecurityContext = nil + } + out.Stdin = in.Stdin + out.StdinOnce = in.StdinOnce + out.TTY = in.TTY return nil } -func convert_v1_UserIdentityMapping_To_api_UserIdentityMapping(in *userapiv1.UserIdentityMapping, out *userapi.UserIdentityMapping, s conversion.Scope) error { - return autoconvert_v1_UserIdentityMapping_To_api_UserIdentityMapping(in, out, s) +func convert_v1_Container_To_api_Container(in *pkgapiv1.Container, out *pkgapi.Container, s conversion.Scope) error { + return autoconvert_v1_Container_To_api_Container(in, out, s) } -func autoconvert_v1_UserList_To_api_UserList(in *userapiv1.UserList, out *userapi.UserList, s conversion.Scope) error { +func autoconvert_v1_ContainerPort_To_api_ContainerPort(in *pkgapiv1.ContainerPort, out *pkgapi.ContainerPort, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapiv1.UserList))(in) + defaulting.(func(*pkgapiv1.ContainerPort))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + out.Name = in.Name + out.HostPort = in.HostPort + out.ContainerPort = in.ContainerPort + out.Protocol = pkgapi.Protocol(in.Protocol) + out.HostIP = in.HostIP + return nil +} + +func convert_v1_ContainerPort_To_api_ContainerPort(in *pkgapiv1.ContainerPort, out *pkgapi.ContainerPort, s conversion.Scope) error { + return autoconvert_v1_ContainerPort_To_api_ContainerPort(in, out, s) +} + +func autoconvert_v1_DownwardAPIVolumeFile_To_api_DownwardAPIVolumeFile(in *pkgapiv1.DownwardAPIVolumeFile, out *pkgapi.DownwardAPIVolumeFile, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.DownwardAPIVolumeFile))(in) } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + out.Path = in.Path + if err := convert_v1_ObjectFieldSelector_To_api_ObjectFieldSelector(&in.FieldRef, &out.FieldRef, s); err != nil { return err } + return nil +} + +func convert_v1_DownwardAPIVolumeFile_To_api_DownwardAPIVolumeFile(in *pkgapiv1.DownwardAPIVolumeFile, out *pkgapi.DownwardAPIVolumeFile, s conversion.Scope) error { + return autoconvert_v1_DownwardAPIVolumeFile_To_api_DownwardAPIVolumeFile(in, out, s) +} + +func autoconvert_v1_DownwardAPIVolumeSource_To_api_DownwardAPIVolumeSource(in *pkgapiv1.DownwardAPIVolumeSource, out *pkgapi.DownwardAPIVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.DownwardAPIVolumeSource))(in) + } if in.Items != nil { - out.Items = make([]userapi.User, len(in.Items)) + out.Items = make([]pkgapi.DownwardAPIVolumeFile, len(in.Items)) for i := range in.Items { - if err := convert_v1_User_To_api_User(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1_DownwardAPIVolumeFile_To_api_DownwardAPIVolumeFile(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4900,19 +6940,31 @@ func autoconvert_v1_UserList_To_api_UserList(in *userapiv1.UserList, out *userap return nil } -func convert_v1_UserList_To_api_UserList(in *userapiv1.UserList, out *userapi.UserList, s conversion.Scope) error { - return autoconvert_v1_UserList_To_api_UserList(in, out, s) +func convert_v1_DownwardAPIVolumeSource_To_api_DownwardAPIVolumeSource(in *pkgapiv1.DownwardAPIVolumeSource, out *pkgapi.DownwardAPIVolumeSource, s conversion.Scope) error { + return autoconvert_v1_DownwardAPIVolumeSource_To_api_DownwardAPIVolumeSource(in, out, s) } -func autoconvert_api_EnvVar_To_v1_EnvVar(in *pkgapi.EnvVar, out *pkgapiv1.EnvVar, s conversion.Scope) error { +func autoconvert_v1_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in *pkgapiv1.EmptyDirVolumeSource, out *pkgapi.EmptyDirVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*pkgapi.EnvVar))(in) + defaulting.(func(*pkgapiv1.EmptyDirVolumeSource))(in) + } + out.Medium = pkgapi.StorageMedium(in.Medium) + return nil +} + +func convert_v1_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in *pkgapiv1.EmptyDirVolumeSource, out *pkgapi.EmptyDirVolumeSource, s conversion.Scope) error { + return autoconvert_v1_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in, out, s) +} + +func autoconvert_v1_EnvVar_To_api_EnvVar(in *pkgapiv1.EnvVar, out *pkgapi.EnvVar, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.EnvVar))(in) } out.Name = in.Name out.Value = in.Value if in.ValueFrom != nil { - out.ValueFrom = new(pkgapiv1.EnvVarSource) - if err := convert_api_EnvVarSource_To_v1_EnvVarSource(in.ValueFrom, out.ValueFrom, s); err != nil { + out.ValueFrom = new(pkgapi.EnvVarSource) + if err := convert_v1_EnvVarSource_To_api_EnvVarSource(in.ValueFrom, out.ValueFrom, s); err != nil { return err } } else { @@ -4921,17 +6973,17 @@ func autoconvert_api_EnvVar_To_v1_EnvVar(in *pkgapi.EnvVar, out *pkgapiv1.EnvVar return nil } -func convert_api_EnvVar_To_v1_EnvVar(in *pkgapi.EnvVar, out *pkgapiv1.EnvVar, s conversion.Scope) error { - return autoconvert_api_EnvVar_To_v1_EnvVar(in, out, s) +func convert_v1_EnvVar_To_api_EnvVar(in *pkgapiv1.EnvVar, out *pkgapi.EnvVar, s conversion.Scope) error { + return autoconvert_v1_EnvVar_To_api_EnvVar(in, out, s) } -func autoconvert_api_EnvVarSource_To_v1_EnvVarSource(in *pkgapi.EnvVarSource, out *pkgapiv1.EnvVarSource, s conversion.Scope) error { +func autoconvert_v1_EnvVarSource_To_api_EnvVarSource(in *pkgapiv1.EnvVarSource, out *pkgapi.EnvVarSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*pkgapi.EnvVarSource))(in) + defaulting.(func(*pkgapiv1.EnvVarSource))(in) } if in.FieldRef != nil { - out.FieldRef = new(pkgapiv1.ObjectFieldSelector) - if err := convert_api_ObjectFieldSelector_To_v1_ObjectFieldSelector(in.FieldRef, out.FieldRef, s); err != nil { + out.FieldRef = new(pkgapi.ObjectFieldSelector) + if err := convert_v1_ObjectFieldSelector_To_api_ObjectFieldSelector(in.FieldRef, out.FieldRef, s); err != nil { return err } } else { @@ -4940,176 +6992,215 @@ func autoconvert_api_EnvVarSource_To_v1_EnvVarSource(in *pkgapi.EnvVarSource, ou return nil } -func convert_api_EnvVarSource_To_v1_EnvVarSource(in *pkgapi.EnvVarSource, out *pkgapiv1.EnvVarSource, s conversion.Scope) error { - return autoconvert_api_EnvVarSource_To_v1_EnvVarSource(in, out, s) +func convert_v1_EnvVarSource_To_api_EnvVarSource(in *pkgapiv1.EnvVarSource, out *pkgapi.EnvVarSource, s conversion.Scope) error { + return autoconvert_v1_EnvVarSource_To_api_EnvVarSource(in, out, s) } -func autoconvert_api_LocalObjectReference_To_v1_LocalObjectReference(in *pkgapi.LocalObjectReference, out *pkgapiv1.LocalObjectReference, s conversion.Scope) error { +func autoconvert_v1_ExecAction_To_api_ExecAction(in *pkgapiv1.ExecAction, out *pkgapi.ExecAction, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*pkgapi.LocalObjectReference))(in) + defaulting.(func(*pkgapiv1.ExecAction))(in) + } + if in.Command != nil { + out.Command = make([]string, len(in.Command)) + for i := range in.Command { + out.Command[i] = in.Command[i] + } + } else { + out.Command = nil } - out.Name = in.Name return nil } -func convert_api_LocalObjectReference_To_v1_LocalObjectReference(in *pkgapi.LocalObjectReference, out *pkgapiv1.LocalObjectReference, s conversion.Scope) error { - return autoconvert_api_LocalObjectReference_To_v1_LocalObjectReference(in, out, s) +func convert_v1_ExecAction_To_api_ExecAction(in *pkgapiv1.ExecAction, out *pkgapi.ExecAction, s conversion.Scope) error { + return autoconvert_v1_ExecAction_To_api_ExecAction(in, out, s) } -func autoconvert_api_ObjectFieldSelector_To_v1_ObjectFieldSelector(in *pkgapi.ObjectFieldSelector, out *pkgapiv1.ObjectFieldSelector, s conversion.Scope) error { +func autoconvert_v1_FCVolumeSource_To_api_FCVolumeSource(in *pkgapiv1.FCVolumeSource, out *pkgapi.FCVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*pkgapi.ObjectFieldSelector))(in) + defaulting.(func(*pkgapiv1.FCVolumeSource))(in) } - out.APIVersion = in.APIVersion - out.FieldPath = in.FieldPath + if in.TargetWWNs != nil { + out.TargetWWNs = make([]string, len(in.TargetWWNs)) + for i := range in.TargetWWNs { + out.TargetWWNs[i] = in.TargetWWNs[i] + } + } else { + out.TargetWWNs = nil + } + if in.Lun != nil { + out.Lun = new(int) + *out.Lun = *in.Lun + } else { + out.Lun = nil + } + out.FSType = in.FSType + out.ReadOnly = in.ReadOnly return nil } -func convert_api_ObjectFieldSelector_To_v1_ObjectFieldSelector(in *pkgapi.ObjectFieldSelector, out *pkgapiv1.ObjectFieldSelector, s conversion.Scope) error { - return autoconvert_api_ObjectFieldSelector_To_v1_ObjectFieldSelector(in, out, s) +func convert_v1_FCVolumeSource_To_api_FCVolumeSource(in *pkgapiv1.FCVolumeSource, out *pkgapi.FCVolumeSource, s conversion.Scope) error { + return autoconvert_v1_FCVolumeSource_To_api_FCVolumeSource(in, out, s) } -func autoconvert_api_ObjectMeta_To_v1_ObjectMeta(in *pkgapi.ObjectMeta, out *pkgapiv1.ObjectMeta, s conversion.Scope) error { +func autoconvert_v1_FlockerVolumeSource_To_api_FlockerVolumeSource(in *pkgapiv1.FlockerVolumeSource, out *pkgapi.FlockerVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*pkgapi.ObjectMeta))(in) - } - out.Name = in.Name - out.GenerateName = in.GenerateName - out.Namespace = in.Namespace - out.SelfLink = in.SelfLink - out.UID = in.UID - out.ResourceVersion = in.ResourceVersion - out.Generation = in.Generation - if err := s.Convert(&in.CreationTimestamp, &out.CreationTimestamp, 0); err != nil { - return err - } - if in.DeletionTimestamp != nil { - if err := s.Convert(&in.DeletionTimestamp, &out.DeletionTimestamp, 0); err != nil { - return err - } - } else { - out.DeletionTimestamp = nil + defaulting.(func(*pkgapiv1.FlockerVolumeSource))(in) } - if in.DeletionGracePeriodSeconds != nil { - out.DeletionGracePeriodSeconds = new(int64) - *out.DeletionGracePeriodSeconds = *in.DeletionGracePeriodSeconds - } else { - out.DeletionGracePeriodSeconds = nil + out.DatasetName = in.DatasetName + return nil +} + +func convert_v1_FlockerVolumeSource_To_api_FlockerVolumeSource(in *pkgapiv1.FlockerVolumeSource, out *pkgapi.FlockerVolumeSource, s conversion.Scope) error { + return autoconvert_v1_FlockerVolumeSource_To_api_FlockerVolumeSource(in, out, s) +} + +func autoconvert_v1_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSource(in *pkgapiv1.GCEPersistentDiskVolumeSource, out *pkgapi.GCEPersistentDiskVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.GCEPersistentDiskVolumeSource))(in) } - if in.Labels != nil { - out.Labels = make(map[string]string) - for key, val := range in.Labels { - out.Labels[key] = val - } - } else { - out.Labels = nil + out.PDName = in.PDName + out.FSType = in.FSType + out.Partition = in.Partition + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_v1_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSource(in *pkgapiv1.GCEPersistentDiskVolumeSource, out *pkgapi.GCEPersistentDiskVolumeSource, s conversion.Scope) error { + return autoconvert_v1_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSource(in, out, s) +} + +func autoconvert_v1_GitRepoVolumeSource_To_api_GitRepoVolumeSource(in *pkgapiv1.GitRepoVolumeSource, out *pkgapi.GitRepoVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.GitRepoVolumeSource))(in) } - if in.Annotations != nil { - out.Annotations = make(map[string]string) - for key, val := range in.Annotations { - out.Annotations[key] = val - } - } else { - out.Annotations = nil + out.Repository = in.Repository + out.Revision = in.Revision + return nil +} + +func convert_v1_GitRepoVolumeSource_To_api_GitRepoVolumeSource(in *pkgapiv1.GitRepoVolumeSource, out *pkgapi.GitRepoVolumeSource, s conversion.Scope) error { + return autoconvert_v1_GitRepoVolumeSource_To_api_GitRepoVolumeSource(in, out, s) +} + +func autoconvert_v1_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in *pkgapiv1.GlusterfsVolumeSource, out *pkgapi.GlusterfsVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.GlusterfsVolumeSource))(in) } + out.EndpointsName = in.EndpointsName + out.Path = in.Path + out.ReadOnly = in.ReadOnly return nil } -func convert_api_ObjectMeta_To_v1_ObjectMeta(in *pkgapi.ObjectMeta, out *pkgapiv1.ObjectMeta, s conversion.Scope) error { - return autoconvert_api_ObjectMeta_To_v1_ObjectMeta(in, out, s) +func convert_v1_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in *pkgapiv1.GlusterfsVolumeSource, out *pkgapi.GlusterfsVolumeSource, s conversion.Scope) error { + return autoconvert_v1_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in, out, s) } -func autoconvert_api_ObjectReference_To_v1_ObjectReference(in *pkgapi.ObjectReference, out *pkgapiv1.ObjectReference, s conversion.Scope) error { +func autoconvert_v1_HTTPGetAction_To_api_HTTPGetAction(in *pkgapiv1.HTTPGetAction, out *pkgapi.HTTPGetAction, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*pkgapi.ObjectReference))(in) + defaulting.(func(*pkgapiv1.HTTPGetAction))(in) } - out.Kind = in.Kind - out.Namespace = in.Namespace - out.Name = in.Name - out.UID = in.UID - out.APIVersion = in.APIVersion - out.ResourceVersion = in.ResourceVersion - out.FieldPath = in.FieldPath + out.Path = in.Path + if err := s.Convert(&in.Port, &out.Port, 0); err != nil { + return err + } + out.Host = in.Host + out.Scheme = pkgapi.URIScheme(in.Scheme) return nil } -func convert_api_ObjectReference_To_v1_ObjectReference(in *pkgapi.ObjectReference, out *pkgapiv1.ObjectReference, s conversion.Scope) error { - return autoconvert_api_ObjectReference_To_v1_ObjectReference(in, out, s) +func convert_v1_HTTPGetAction_To_api_HTTPGetAction(in *pkgapiv1.HTTPGetAction, out *pkgapi.HTTPGetAction, s conversion.Scope) error { + return autoconvert_v1_HTTPGetAction_To_api_HTTPGetAction(in, out, s) } -func autoconvert_api_ResourceRequirements_To_v1_ResourceRequirements(in *pkgapi.ResourceRequirements, out *pkgapiv1.ResourceRequirements, s conversion.Scope) error { +func autoconvert_v1_Handler_To_api_Handler(in *pkgapiv1.Handler, out *pkgapi.Handler, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*pkgapi.ResourceRequirements))(in) + defaulting.(func(*pkgapiv1.Handler))(in) } - if in.Limits != nil { - out.Limits = make(pkgapiv1.ResourceList) - for key, val := range in.Limits { - newVal := resource.Quantity{} - if err := s.Convert(&val, &newVal, 0); err != nil { - return err - } - out.Limits[pkgapiv1.ResourceName(key)] = newVal + if in.Exec != nil { + out.Exec = new(pkgapi.ExecAction) + if err := convert_v1_ExecAction_To_api_ExecAction(in.Exec, out.Exec, s); err != nil { + return err } } else { - out.Limits = nil - } - if in.Requests != nil { - out.Requests = make(pkgapiv1.ResourceList) - for key, val := range in.Requests { - newVal := resource.Quantity{} - if err := s.Convert(&val, &newVal, 0); err != nil { - return err - } - out.Requests[pkgapiv1.ResourceName(key)] = newVal + out.Exec = nil + } + if in.HTTPGet != nil { + out.HTTPGet = new(pkgapi.HTTPGetAction) + if err := convert_v1_HTTPGetAction_To_api_HTTPGetAction(in.HTTPGet, out.HTTPGet, s); err != nil { + return err } } else { - out.Requests = nil + out.HTTPGet = nil + } + if in.TCPSocket != nil { + out.TCPSocket = new(pkgapi.TCPSocketAction) + if err := convert_v1_TCPSocketAction_To_api_TCPSocketAction(in.TCPSocket, out.TCPSocket, s); err != nil { + return err + } + } else { + out.TCPSocket = nil } return nil } -func convert_api_ResourceRequirements_To_v1_ResourceRequirements(in *pkgapi.ResourceRequirements, out *pkgapiv1.ResourceRequirements, s conversion.Scope) error { - return autoconvert_api_ResourceRequirements_To_v1_ResourceRequirements(in, out, s) +func convert_v1_Handler_To_api_Handler(in *pkgapiv1.Handler, out *pkgapi.Handler, s conversion.Scope) error { + return autoconvert_v1_Handler_To_api_Handler(in, out, s) } -func autoconvert_v1_EnvVar_To_api_EnvVar(in *pkgapiv1.EnvVar, out *pkgapi.EnvVar, s conversion.Scope) error { +func autoconvert_v1_HostPathVolumeSource_To_api_HostPathVolumeSource(in *pkgapiv1.HostPathVolumeSource, out *pkgapi.HostPathVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*pkgapiv1.EnvVar))(in) + defaulting.(func(*pkgapiv1.HostPathVolumeSource))(in) } - out.Name = in.Name - out.Value = in.Value - if in.ValueFrom != nil { - out.ValueFrom = new(pkgapi.EnvVarSource) - if err := convert_v1_EnvVarSource_To_api_EnvVarSource(in.ValueFrom, out.ValueFrom, s); err != nil { - return err - } - } else { - out.ValueFrom = nil + out.Path = in.Path + return nil +} + +func convert_v1_HostPathVolumeSource_To_api_HostPathVolumeSource(in *pkgapiv1.HostPathVolumeSource, out *pkgapi.HostPathVolumeSource, s conversion.Scope) error { + return autoconvert_v1_HostPathVolumeSource_To_api_HostPathVolumeSource(in, out, s) +} + +func autoconvert_v1_ISCSIVolumeSource_To_api_ISCSIVolumeSource(in *pkgapiv1.ISCSIVolumeSource, out *pkgapi.ISCSIVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.ISCSIVolumeSource))(in) } + out.TargetPortal = in.TargetPortal + out.IQN = in.IQN + out.Lun = in.Lun + out.FSType = in.FSType + out.ReadOnly = in.ReadOnly return nil } -func convert_v1_EnvVar_To_api_EnvVar(in *pkgapiv1.EnvVar, out *pkgapi.EnvVar, s conversion.Scope) error { - return autoconvert_v1_EnvVar_To_api_EnvVar(in, out, s) +func convert_v1_ISCSIVolumeSource_To_api_ISCSIVolumeSource(in *pkgapiv1.ISCSIVolumeSource, out *pkgapi.ISCSIVolumeSource, s conversion.Scope) error { + return autoconvert_v1_ISCSIVolumeSource_To_api_ISCSIVolumeSource(in, out, s) } -func autoconvert_v1_EnvVarSource_To_api_EnvVarSource(in *pkgapiv1.EnvVarSource, out *pkgapi.EnvVarSource, s conversion.Scope) error { +func autoconvert_v1_Lifecycle_To_api_Lifecycle(in *pkgapiv1.Lifecycle, out *pkgapi.Lifecycle, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*pkgapiv1.EnvVarSource))(in) + defaulting.(func(*pkgapiv1.Lifecycle))(in) } - if in.FieldRef != nil { - out.FieldRef = new(pkgapi.ObjectFieldSelector) - if err := convert_v1_ObjectFieldSelector_To_api_ObjectFieldSelector(in.FieldRef, out.FieldRef, s); err != nil { + if in.PostStart != nil { + out.PostStart = new(pkgapi.Handler) + if err := convert_v1_Handler_To_api_Handler(in.PostStart, out.PostStart, s); err != nil { return err } } else { - out.FieldRef = nil + out.PostStart = nil + } + if in.PreStop != nil { + out.PreStop = new(pkgapi.Handler) + if err := convert_v1_Handler_To_api_Handler(in.PreStop, out.PreStop, s); err != nil { + return err + } + } else { + out.PreStop = nil } return nil } -func convert_v1_EnvVarSource_To_api_EnvVarSource(in *pkgapiv1.EnvVarSource, out *pkgapi.EnvVarSource, s conversion.Scope) error { - return autoconvert_v1_EnvVarSource_To_api_EnvVarSource(in, out, s) +func convert_v1_Lifecycle_To_api_Lifecycle(in *pkgapiv1.Lifecycle, out *pkgapi.Lifecycle, s conversion.Scope) error { + return autoconvert_v1_Lifecycle_To_api_Lifecycle(in, out, s) } func autoconvert_v1_LocalObjectReference_To_api_LocalObjectReference(in *pkgapiv1.LocalObjectReference, out *pkgapi.LocalObjectReference, s conversion.Scope) error { @@ -5124,6 +7215,20 @@ func convert_v1_LocalObjectReference_To_api_LocalObjectReference(in *pkgapiv1.Lo return autoconvert_v1_LocalObjectReference_To_api_LocalObjectReference(in, out, s) } +func autoconvert_v1_NFSVolumeSource_To_api_NFSVolumeSource(in *pkgapiv1.NFSVolumeSource, out *pkgapi.NFSVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.NFSVolumeSource))(in) + } + out.Server = in.Server + out.Path = in.Path + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_v1_NFSVolumeSource_To_api_NFSVolumeSource(in *pkgapiv1.NFSVolumeSource, out *pkgapi.NFSVolumeSource, s conversion.Scope) error { + return autoconvert_v1_NFSVolumeSource_To_api_NFSVolumeSource(in, out, s) +} + func autoconvert_v1_ObjectFieldSelector_To_api_ObjectFieldSelector(in *pkgapiv1.ObjectFieldSelector, out *pkgapi.ObjectFieldSelector, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*pkgapiv1.ObjectFieldSelector))(in) @@ -5205,6 +7310,158 @@ func convert_v1_ObjectReference_To_api_ObjectReference(in *pkgapiv1.ObjectRefere return autoconvert_v1_ObjectReference_To_api_ObjectReference(in, out, s) } +func autoconvert_v1_PersistentVolumeClaimVolumeSource_To_api_PersistentVolumeClaimVolumeSource(in *pkgapiv1.PersistentVolumeClaimVolumeSource, out *pkgapi.PersistentVolumeClaimVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.PersistentVolumeClaimVolumeSource))(in) + } + out.ClaimName = in.ClaimName + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_v1_PersistentVolumeClaimVolumeSource_To_api_PersistentVolumeClaimVolumeSource(in *pkgapiv1.PersistentVolumeClaimVolumeSource, out *pkgapi.PersistentVolumeClaimVolumeSource, s conversion.Scope) error { + return autoconvert_v1_PersistentVolumeClaimVolumeSource_To_api_PersistentVolumeClaimVolumeSource(in, out, s) +} + +func autoconvert_v1_PodSpec_To_api_PodSpec(in *pkgapiv1.PodSpec, out *pkgapi.PodSpec, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.PodSpec))(in) + } + if in.Volumes != nil { + out.Volumes = make([]pkgapi.Volume, len(in.Volumes)) + for i := range in.Volumes { + if err := convert_v1_Volume_To_api_Volume(&in.Volumes[i], &out.Volumes[i], s); err != nil { + return err + } + } + } else { + out.Volumes = nil + } + if in.Containers != nil { + out.Containers = make([]pkgapi.Container, len(in.Containers)) + for i := range in.Containers { + if err := convert_v1_Container_To_api_Container(&in.Containers[i], &out.Containers[i], s); err != nil { + return err + } + } + } else { + out.Containers = nil + } + out.RestartPolicy = pkgapi.RestartPolicy(in.RestartPolicy) + if in.TerminationGracePeriodSeconds != nil { + out.TerminationGracePeriodSeconds = new(int64) + *out.TerminationGracePeriodSeconds = *in.TerminationGracePeriodSeconds + } else { + out.TerminationGracePeriodSeconds = nil + } + if in.ActiveDeadlineSeconds != nil { + out.ActiveDeadlineSeconds = new(int64) + *out.ActiveDeadlineSeconds = *in.ActiveDeadlineSeconds + } else { + out.ActiveDeadlineSeconds = nil + } + out.DNSPolicy = pkgapi.DNSPolicy(in.DNSPolicy) + if in.NodeSelector != nil { + out.NodeSelector = make(map[string]string) + for key, val := range in.NodeSelector { + out.NodeSelector[key] = val + } + } else { + out.NodeSelector = nil + } + // in.DeprecatedHost has no peer in out + out.ServiceAccountName = in.ServiceAccountName + // in.DeprecatedServiceAccount has no peer in out + out.NodeName = in.NodeName + // in.HostNetwork has no peer in out + // in.HostPID has no peer in out + // in.HostIPC has no peer in out + if in.SecurityContext != nil { + if err := s.Convert(&in.SecurityContext, &out.SecurityContext, 0); err != nil { + return err + } + } else { + out.SecurityContext = nil + } + if in.ImagePullSecrets != nil { + out.ImagePullSecrets = make([]pkgapi.LocalObjectReference, len(in.ImagePullSecrets)) + for i := range in.ImagePullSecrets { + if err := convert_v1_LocalObjectReference_To_api_LocalObjectReference(&in.ImagePullSecrets[i], &out.ImagePullSecrets[i], s); err != nil { + return err + } + } + } else { + out.ImagePullSecrets = nil + } + return nil +} + +func autoconvert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in *pkgapiv1.PodTemplateSpec, out *pkgapi.PodTemplateSpec, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.PodTemplateSpec))(in) + } + if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil { + return err + } + return nil +} + +func convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in *pkgapiv1.PodTemplateSpec, out *pkgapi.PodTemplateSpec, s conversion.Scope) error { + return autoconvert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in, out, s) +} + +func autoconvert_v1_Probe_To_api_Probe(in *pkgapiv1.Probe, out *pkgapi.Probe, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.Probe))(in) + } + if err := convert_v1_Handler_To_api_Handler(&in.Handler, &out.Handler, s); err != nil { + return err + } + out.InitialDelaySeconds = in.InitialDelaySeconds + out.TimeoutSeconds = in.TimeoutSeconds + return nil +} + +func convert_v1_Probe_To_api_Probe(in *pkgapiv1.Probe, out *pkgapi.Probe, s conversion.Scope) error { + return autoconvert_v1_Probe_To_api_Probe(in, out, s) +} + +func autoconvert_v1_RBDVolumeSource_To_api_RBDVolumeSource(in *pkgapiv1.RBDVolumeSource, out *pkgapi.RBDVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.RBDVolumeSource))(in) + } + if in.CephMonitors != nil { + out.CephMonitors = make([]string, len(in.CephMonitors)) + for i := range in.CephMonitors { + out.CephMonitors[i] = in.CephMonitors[i] + } + } else { + out.CephMonitors = nil + } + out.RBDImage = in.RBDImage + out.FSType = in.FSType + out.RBDPool = in.RBDPool + out.RadosUser = in.RadosUser + out.Keyring = in.Keyring + if in.SecretRef != nil { + out.SecretRef = new(pkgapi.LocalObjectReference) + if err := convert_v1_LocalObjectReference_To_api_LocalObjectReference(in.SecretRef, out.SecretRef, s); err != nil { + return err + } + } else { + out.SecretRef = nil + } + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_v1_RBDVolumeSource_To_api_RBDVolumeSource(in *pkgapiv1.RBDVolumeSource, out *pkgapi.RBDVolumeSource, s conversion.Scope) error { + return autoconvert_v1_RBDVolumeSource_To_api_RBDVolumeSource(in, out, s) +} + func autoconvert_v1_ResourceRequirements_To_api_ResourceRequirements(in *pkgapiv1.ResourceRequirements, out *pkgapi.ResourceRequirements, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*pkgapiv1.ResourceRequirements))(in) @@ -5240,8 +7497,260 @@ func convert_v1_ResourceRequirements_To_api_ResourceRequirements(in *pkgapiv1.Re return autoconvert_v1_ResourceRequirements_To_api_ResourceRequirements(in, out, s) } +func autoconvert_v1_SELinuxOptions_To_api_SELinuxOptions(in *pkgapiv1.SELinuxOptions, out *pkgapi.SELinuxOptions, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.SELinuxOptions))(in) + } + out.User = in.User + out.Role = in.Role + out.Type = in.Type + out.Level = in.Level + return nil +} + +func convert_v1_SELinuxOptions_To_api_SELinuxOptions(in *pkgapiv1.SELinuxOptions, out *pkgapi.SELinuxOptions, s conversion.Scope) error { + return autoconvert_v1_SELinuxOptions_To_api_SELinuxOptions(in, out, s) +} + +func autoconvert_v1_SecretVolumeSource_To_api_SecretVolumeSource(in *pkgapiv1.SecretVolumeSource, out *pkgapi.SecretVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.SecretVolumeSource))(in) + } + out.SecretName = in.SecretName + return nil +} + +func convert_v1_SecretVolumeSource_To_api_SecretVolumeSource(in *pkgapiv1.SecretVolumeSource, out *pkgapi.SecretVolumeSource, s conversion.Scope) error { + return autoconvert_v1_SecretVolumeSource_To_api_SecretVolumeSource(in, out, s) +} + +func autoconvert_v1_SecurityContext_To_api_SecurityContext(in *pkgapiv1.SecurityContext, out *pkgapi.SecurityContext, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.SecurityContext))(in) + } + if in.Capabilities != nil { + out.Capabilities = new(pkgapi.Capabilities) + if err := convert_v1_Capabilities_To_api_Capabilities(in.Capabilities, out.Capabilities, s); err != nil { + return err + } + } else { + out.Capabilities = nil + } + if in.Privileged != nil { + out.Privileged = new(bool) + *out.Privileged = *in.Privileged + } else { + out.Privileged = nil + } + if in.SELinuxOptions != nil { + out.SELinuxOptions = new(pkgapi.SELinuxOptions) + if err := convert_v1_SELinuxOptions_To_api_SELinuxOptions(in.SELinuxOptions, out.SELinuxOptions, s); err != nil { + return err + } + } else { + out.SELinuxOptions = nil + } + if in.RunAsUser != nil { + out.RunAsUser = new(int64) + *out.RunAsUser = *in.RunAsUser + } else { + out.RunAsUser = nil + } + if in.RunAsNonRoot != nil { + out.RunAsNonRoot = new(bool) + *out.RunAsNonRoot = *in.RunAsNonRoot + } else { + out.RunAsNonRoot = nil + } + return nil +} + +func convert_v1_SecurityContext_To_api_SecurityContext(in *pkgapiv1.SecurityContext, out *pkgapi.SecurityContext, s conversion.Scope) error { + return autoconvert_v1_SecurityContext_To_api_SecurityContext(in, out, s) +} + +func autoconvert_v1_TCPSocketAction_To_api_TCPSocketAction(in *pkgapiv1.TCPSocketAction, out *pkgapi.TCPSocketAction, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.TCPSocketAction))(in) + } + if err := s.Convert(&in.Port, &out.Port, 0); err != nil { + return err + } + return nil +} + +func convert_v1_TCPSocketAction_To_api_TCPSocketAction(in *pkgapiv1.TCPSocketAction, out *pkgapi.TCPSocketAction, s conversion.Scope) error { + return autoconvert_v1_TCPSocketAction_To_api_TCPSocketAction(in, out, s) +} + +func autoconvert_v1_Volume_To_api_Volume(in *pkgapiv1.Volume, out *pkgapi.Volume, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.Volume))(in) + } + out.Name = in.Name + if err := s.Convert(&in.VolumeSource, &out.VolumeSource, 0); err != nil { + return err + } + return nil +} + +func convert_v1_Volume_To_api_Volume(in *pkgapiv1.Volume, out *pkgapi.Volume, s conversion.Scope) error { + return autoconvert_v1_Volume_To_api_Volume(in, out, s) +} + +func autoconvert_v1_VolumeMount_To_api_VolumeMount(in *pkgapiv1.VolumeMount, out *pkgapi.VolumeMount, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.VolumeMount))(in) + } + out.Name = in.Name + out.ReadOnly = in.ReadOnly + out.MountPath = in.MountPath + return nil +} + +func convert_v1_VolumeMount_To_api_VolumeMount(in *pkgapiv1.VolumeMount, out *pkgapi.VolumeMount, s conversion.Scope) error { + return autoconvert_v1_VolumeMount_To_api_VolumeMount(in, out, s) +} + +func autoconvert_v1_VolumeSource_To_api_VolumeSource(in *pkgapiv1.VolumeSource, out *pkgapi.VolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1.VolumeSource))(in) + } + if in.HostPath != nil { + out.HostPath = new(pkgapi.HostPathVolumeSource) + if err := convert_v1_HostPathVolumeSource_To_api_HostPathVolumeSource(in.HostPath, out.HostPath, s); err != nil { + return err + } + } else { + out.HostPath = nil + } + if in.EmptyDir != nil { + out.EmptyDir = new(pkgapi.EmptyDirVolumeSource) + if err := convert_v1_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in.EmptyDir, out.EmptyDir, s); err != nil { + return err + } + } else { + out.EmptyDir = nil + } + if in.GCEPersistentDisk != nil { + out.GCEPersistentDisk = new(pkgapi.GCEPersistentDiskVolumeSource) + if err := convert_v1_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSource(in.GCEPersistentDisk, out.GCEPersistentDisk, s); err != nil { + return err + } + } else { + out.GCEPersistentDisk = nil + } + if in.AWSElasticBlockStore != nil { + out.AWSElasticBlockStore = new(pkgapi.AWSElasticBlockStoreVolumeSource) + if err := convert_v1_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource(in.AWSElasticBlockStore, out.AWSElasticBlockStore, s); err != nil { + return err + } + } else { + out.AWSElasticBlockStore = nil + } + if in.GitRepo != nil { + out.GitRepo = new(pkgapi.GitRepoVolumeSource) + if err := convert_v1_GitRepoVolumeSource_To_api_GitRepoVolumeSource(in.GitRepo, out.GitRepo, s); err != nil { + return err + } + } else { + out.GitRepo = nil + } + if in.Secret != nil { + out.Secret = new(pkgapi.SecretVolumeSource) + if err := convert_v1_SecretVolumeSource_To_api_SecretVolumeSource(in.Secret, out.Secret, s); err != nil { + return err + } + } else { + out.Secret = nil + } + if in.NFS != nil { + out.NFS = new(pkgapi.NFSVolumeSource) + if err := convert_v1_NFSVolumeSource_To_api_NFSVolumeSource(in.NFS, out.NFS, s); err != nil { + return err + } + } else { + out.NFS = nil + } + if in.ISCSI != nil { + out.ISCSI = new(pkgapi.ISCSIVolumeSource) + if err := convert_v1_ISCSIVolumeSource_To_api_ISCSIVolumeSource(in.ISCSI, out.ISCSI, s); err != nil { + return err + } + } else { + out.ISCSI = nil + } + if in.Glusterfs != nil { + out.Glusterfs = new(pkgapi.GlusterfsVolumeSource) + if err := convert_v1_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in.Glusterfs, out.Glusterfs, s); err != nil { + return err + } + } else { + out.Glusterfs = nil + } + if in.PersistentVolumeClaim != nil { + out.PersistentVolumeClaim = new(pkgapi.PersistentVolumeClaimVolumeSource) + if err := convert_v1_PersistentVolumeClaimVolumeSource_To_api_PersistentVolumeClaimVolumeSource(in.PersistentVolumeClaim, out.PersistentVolumeClaim, s); err != nil { + return err + } + } else { + out.PersistentVolumeClaim = nil + } + if in.RBD != nil { + out.RBD = new(pkgapi.RBDVolumeSource) + if err := convert_v1_RBDVolumeSource_To_api_RBDVolumeSource(in.RBD, out.RBD, s); err != nil { + return err + } + } else { + out.RBD = nil + } + if in.Cinder != nil { + out.Cinder = new(pkgapi.CinderVolumeSource) + if err := convert_v1_CinderVolumeSource_To_api_CinderVolumeSource(in.Cinder, out.Cinder, s); err != nil { + return err + } + } else { + out.Cinder = nil + } + if in.CephFS != nil { + out.CephFS = new(pkgapi.CephFSVolumeSource) + if err := convert_v1_CephFSVolumeSource_To_api_CephFSVolumeSource(in.CephFS, out.CephFS, s); err != nil { + return err + } + } else { + out.CephFS = nil + } + if in.Flocker != nil { + out.Flocker = new(pkgapi.FlockerVolumeSource) + if err := convert_v1_FlockerVolumeSource_To_api_FlockerVolumeSource(in.Flocker, out.Flocker, s); err != nil { + return err + } + } else { + out.Flocker = nil + } + if in.DownwardAPI != nil { + out.DownwardAPI = new(pkgapi.DownwardAPIVolumeSource) + if err := convert_v1_DownwardAPIVolumeSource_To_api_DownwardAPIVolumeSource(in.DownwardAPI, out.DownwardAPI, s); err != nil { + return err + } + } else { + out.DownwardAPI = nil + } + if in.FC != nil { + out.FC = new(pkgapi.FCVolumeSource) + if err := convert_v1_FCVolumeSource_To_api_FCVolumeSource(in.FC, out.FC, s); err != nil { + return err + } + } else { + out.FC = nil + } + // in.Metadata has no peer in out + return nil +} + func init() { err := pkgapi.Scheme.AddGeneratedConversionFuncs( + autoconvert_api_AWSElasticBlockStoreVolumeSource_To_v1_AWSElasticBlockStoreVolumeSource, autoconvert_api_BinaryBuildRequestOptions_To_v1_BinaryBuildRequestOptions, autoconvert_api_BinaryBuildSource_To_v1_BinaryBuildSource, autoconvert_api_BuildConfigList_To_v1_BuildConfigList, @@ -5259,6 +7768,9 @@ func init() { autoconvert_api_BuildStrategy_To_v1_BuildStrategy, autoconvert_api_BuildTriggerPolicy_To_v1_BuildTriggerPolicy, autoconvert_api_Build_To_v1_Build, + autoconvert_api_Capabilities_To_v1_Capabilities, + autoconvert_api_CephFSVolumeSource_To_v1_CephFSVolumeSource, + autoconvert_api_CinderVolumeSource_To_v1_CinderVolumeSource, autoconvert_api_ClusterNetworkList_To_v1_ClusterNetworkList, autoconvert_api_ClusterNetwork_To_v1_ClusterNetwork, autoconvert_api_ClusterPolicyBindingList_To_v1_ClusterPolicyBindingList, @@ -5269,22 +7781,47 @@ func init() { autoconvert_api_ClusterRoleBinding_To_v1_ClusterRoleBinding, autoconvert_api_ClusterRoleList_To_v1_ClusterRoleList, autoconvert_api_ClusterRole_To_v1_ClusterRole, + autoconvert_api_ContainerPort_To_v1_ContainerPort, + autoconvert_api_Container_To_v1_Container, autoconvert_api_CustomBuildStrategy_To_v1_CustomBuildStrategy, + autoconvert_api_CustomDeploymentStrategyParams_To_v1_CustomDeploymentStrategyParams, + autoconvert_api_DeploymentCauseImageTrigger_To_v1_DeploymentCauseImageTrigger, + autoconvert_api_DeploymentCause_To_v1_DeploymentCause, autoconvert_api_DeploymentConfigList_To_v1_DeploymentConfigList, autoconvert_api_DeploymentConfigRollbackSpec_To_v1_DeploymentConfigRollbackSpec, autoconvert_api_DeploymentConfigRollback_To_v1_DeploymentConfigRollback, + autoconvert_api_DeploymentConfigSpec_To_v1_DeploymentConfigSpec, + autoconvert_api_DeploymentConfigStatus_To_v1_DeploymentConfigStatus, autoconvert_api_DeploymentConfig_To_v1_DeploymentConfig, + autoconvert_api_DeploymentDetails_To_v1_DeploymentDetails, autoconvert_api_DeploymentLogOptions_To_v1_DeploymentLogOptions, autoconvert_api_DeploymentLog_To_v1_DeploymentLog, + autoconvert_api_DeploymentStrategy_To_v1_DeploymentStrategy, + autoconvert_api_DeploymentTriggerImageChangeParams_To_v1_DeploymentTriggerImageChangeParams, + autoconvert_api_DeploymentTriggerPolicy_To_v1_DeploymentTriggerPolicy, autoconvert_api_DockerBuildStrategy_To_v1_DockerBuildStrategy, + autoconvert_api_DownwardAPIVolumeFile_To_v1_DownwardAPIVolumeFile, + autoconvert_api_DownwardAPIVolumeSource_To_v1_DownwardAPIVolumeSource, + autoconvert_api_EmptyDirVolumeSource_To_v1_EmptyDirVolumeSource, autoconvert_api_EnvVarSource_To_v1_EnvVarSource, autoconvert_api_EnvVar_To_v1_EnvVar, + autoconvert_api_ExecAction_To_v1_ExecAction, + autoconvert_api_ExecNewPodHook_To_v1_ExecNewPodHook, + autoconvert_api_FCVolumeSource_To_v1_FCVolumeSource, + autoconvert_api_FlockerVolumeSource_To_v1_FlockerVolumeSource, + autoconvert_api_GCEPersistentDiskVolumeSource_To_v1_GCEPersistentDiskVolumeSource, autoconvert_api_GitBuildSource_To_v1_GitBuildSource, + autoconvert_api_GitRepoVolumeSource_To_v1_GitRepoVolumeSource, autoconvert_api_GitSourceRevision_To_v1_GitSourceRevision, + autoconvert_api_GlusterfsVolumeSource_To_v1_GlusterfsVolumeSource, autoconvert_api_GroupList_To_v1_GroupList, autoconvert_api_Group_To_v1_Group, + autoconvert_api_HTTPGetAction_To_v1_HTTPGetAction, + autoconvert_api_Handler_To_v1_Handler, + autoconvert_api_HostPathVolumeSource_To_v1_HostPathVolumeSource, autoconvert_api_HostSubnetList_To_v1_HostSubnetList, autoconvert_api_HostSubnet_To_v1_HostSubnet, + autoconvert_api_ISCSIVolumeSource_To_v1_ISCSIVolumeSource, autoconvert_api_IdentityList_To_v1_IdentityList, autoconvert_api_Identity_To_v1_Identity, autoconvert_api_ImageChangeTrigger_To_v1_ImageChangeTrigger, @@ -5299,9 +7836,12 @@ func init() { autoconvert_api_ImageStream_To_v1_ImageStream, autoconvert_api_Image_To_v1_Image, autoconvert_api_IsPersonalSubjectAccessReview_To_v1_IsPersonalSubjectAccessReview, + autoconvert_api_LifecycleHook_To_v1_LifecycleHook, + autoconvert_api_Lifecycle_To_v1_Lifecycle, autoconvert_api_LocalObjectReference_To_v1_LocalObjectReference, autoconvert_api_LocalResourceAccessReview_To_v1_LocalResourceAccessReview, autoconvert_api_LocalSubjectAccessReview_To_v1_LocalSubjectAccessReview, + autoconvert_api_NFSVolumeSource_To_v1_NFSVolumeSource, autoconvert_api_NetNamespaceList_To_v1_NetNamespaceList, autoconvert_api_NetNamespace_To_v1_NetNamespace, autoconvert_api_OAuthAccessTokenList_To_v1_OAuthAccessTokenList, @@ -5316,16 +7856,22 @@ func init() { autoconvert_api_ObjectMeta_To_v1_ObjectMeta, autoconvert_api_ObjectReference_To_v1_ObjectReference, autoconvert_api_Parameter_To_v1_Parameter, + autoconvert_api_PersistentVolumeClaimVolumeSource_To_v1_PersistentVolumeClaimVolumeSource, + autoconvert_api_PodSpec_To_v1_PodSpec, + autoconvert_api_PodTemplateSpec_To_v1_PodTemplateSpec, autoconvert_api_PolicyBindingList_To_v1_PolicyBindingList, autoconvert_api_PolicyBinding_To_v1_PolicyBinding, autoconvert_api_PolicyList_To_v1_PolicyList, autoconvert_api_PolicyRule_To_v1_PolicyRule, autoconvert_api_Policy_To_v1_Policy, + autoconvert_api_Probe_To_v1_Probe, autoconvert_api_ProjectList_To_v1_ProjectList, autoconvert_api_ProjectRequest_To_v1_ProjectRequest, autoconvert_api_ProjectSpec_To_v1_ProjectSpec, autoconvert_api_ProjectStatus_To_v1_ProjectStatus, autoconvert_api_Project_To_v1_Project, + autoconvert_api_RBDVolumeSource_To_v1_RBDVolumeSource, + autoconvert_api_RecreateDeploymentStrategyParams_To_v1_RecreateDeploymentStrategyParams, autoconvert_api_ResourceAccessReviewResponse_To_v1_ResourceAccessReviewResponse, autoconvert_api_ResourceAccessReview_To_v1_ResourceAccessReview, autoconvert_api_ResourceRequirements_To_v1_ResourceRequirements, @@ -5333,24 +7879,33 @@ func init() { autoconvert_api_RoleBinding_To_v1_RoleBinding, autoconvert_api_RoleList_To_v1_RoleList, autoconvert_api_Role_To_v1_Role, + autoconvert_api_RollingDeploymentStrategyParams_To_v1_RollingDeploymentStrategyParams, autoconvert_api_RouteList_To_v1_RouteList, autoconvert_api_RoutePort_To_v1_RoutePort, autoconvert_api_RouteSpec_To_v1_RouteSpec, autoconvert_api_RouteStatus_To_v1_RouteStatus, autoconvert_api_Route_To_v1_Route, + autoconvert_api_SELinuxOptions_To_v1_SELinuxOptions, autoconvert_api_SecretSpec_To_v1_SecretSpec, + autoconvert_api_SecretVolumeSource_To_v1_SecretVolumeSource, + autoconvert_api_SecurityContext_To_v1_SecurityContext, autoconvert_api_SourceBuildStrategy_To_v1_SourceBuildStrategy, autoconvert_api_SourceControlUser_To_v1_SourceControlUser, autoconvert_api_SourceRevision_To_v1_SourceRevision, autoconvert_api_SubjectAccessReviewResponse_To_v1_SubjectAccessReviewResponse, autoconvert_api_SubjectAccessReview_To_v1_SubjectAccessReview, + autoconvert_api_TCPSocketAction_To_v1_TCPSocketAction, autoconvert_api_TLSConfig_To_v1_TLSConfig, autoconvert_api_TemplateList_To_v1_TemplateList, autoconvert_api_Template_To_v1_Template, autoconvert_api_UserIdentityMapping_To_v1_UserIdentityMapping, autoconvert_api_UserList_To_v1_UserList, autoconvert_api_User_To_v1_User, + autoconvert_api_VolumeMount_To_v1_VolumeMount, + autoconvert_api_VolumeSource_To_v1_VolumeSource, + autoconvert_api_Volume_To_v1_Volume, autoconvert_api_WebHookTrigger_To_v1_WebHookTrigger, + autoconvert_v1_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource, autoconvert_v1_BinaryBuildRequestOptions_To_api_BinaryBuildRequestOptions, autoconvert_v1_BinaryBuildSource_To_api_BinaryBuildSource, autoconvert_v1_BuildConfigList_To_api_BuildConfigList, @@ -5368,6 +7923,9 @@ func init() { autoconvert_v1_BuildStrategy_To_api_BuildStrategy, autoconvert_v1_BuildTriggerPolicy_To_api_BuildTriggerPolicy, autoconvert_v1_Build_To_api_Build, + autoconvert_v1_Capabilities_To_api_Capabilities, + autoconvert_v1_CephFSVolumeSource_To_api_CephFSVolumeSource, + autoconvert_v1_CinderVolumeSource_To_api_CinderVolumeSource, autoconvert_v1_ClusterNetworkList_To_api_ClusterNetworkList, autoconvert_v1_ClusterNetwork_To_api_ClusterNetwork, autoconvert_v1_ClusterPolicyBindingList_To_api_ClusterPolicyBindingList, @@ -5378,22 +7936,47 @@ func init() { autoconvert_v1_ClusterRoleBinding_To_api_ClusterRoleBinding, autoconvert_v1_ClusterRoleList_To_api_ClusterRoleList, autoconvert_v1_ClusterRole_To_api_ClusterRole, + autoconvert_v1_ContainerPort_To_api_ContainerPort, + autoconvert_v1_Container_To_api_Container, autoconvert_v1_CustomBuildStrategy_To_api_CustomBuildStrategy, + autoconvert_v1_CustomDeploymentStrategyParams_To_api_CustomDeploymentStrategyParams, + autoconvert_v1_DeploymentCauseImageTrigger_To_api_DeploymentCauseImageTrigger, + autoconvert_v1_DeploymentCause_To_api_DeploymentCause, autoconvert_v1_DeploymentConfigList_To_api_DeploymentConfigList, autoconvert_v1_DeploymentConfigRollbackSpec_To_api_DeploymentConfigRollbackSpec, autoconvert_v1_DeploymentConfigRollback_To_api_DeploymentConfigRollback, + autoconvert_v1_DeploymentConfigSpec_To_api_DeploymentConfigSpec, + autoconvert_v1_DeploymentConfigStatus_To_api_DeploymentConfigStatus, autoconvert_v1_DeploymentConfig_To_api_DeploymentConfig, + autoconvert_v1_DeploymentDetails_To_api_DeploymentDetails, autoconvert_v1_DeploymentLogOptions_To_api_DeploymentLogOptions, autoconvert_v1_DeploymentLog_To_api_DeploymentLog, + autoconvert_v1_DeploymentStrategy_To_api_DeploymentStrategy, + autoconvert_v1_DeploymentTriggerImageChangeParams_To_api_DeploymentTriggerImageChangeParams, + autoconvert_v1_DeploymentTriggerPolicy_To_api_DeploymentTriggerPolicy, autoconvert_v1_DockerBuildStrategy_To_api_DockerBuildStrategy, + autoconvert_v1_DownwardAPIVolumeFile_To_api_DownwardAPIVolumeFile, + autoconvert_v1_DownwardAPIVolumeSource_To_api_DownwardAPIVolumeSource, + autoconvert_v1_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource, autoconvert_v1_EnvVarSource_To_api_EnvVarSource, autoconvert_v1_EnvVar_To_api_EnvVar, + autoconvert_v1_ExecAction_To_api_ExecAction, + autoconvert_v1_ExecNewPodHook_To_api_ExecNewPodHook, + autoconvert_v1_FCVolumeSource_To_api_FCVolumeSource, + autoconvert_v1_FlockerVolumeSource_To_api_FlockerVolumeSource, + autoconvert_v1_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSource, autoconvert_v1_GitBuildSource_To_api_GitBuildSource, + autoconvert_v1_GitRepoVolumeSource_To_api_GitRepoVolumeSource, autoconvert_v1_GitSourceRevision_To_api_GitSourceRevision, + autoconvert_v1_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource, autoconvert_v1_GroupList_To_api_GroupList, autoconvert_v1_Group_To_api_Group, + autoconvert_v1_HTTPGetAction_To_api_HTTPGetAction, + autoconvert_v1_Handler_To_api_Handler, + autoconvert_v1_HostPathVolumeSource_To_api_HostPathVolumeSource, autoconvert_v1_HostSubnetList_To_api_HostSubnetList, autoconvert_v1_HostSubnet_To_api_HostSubnet, + autoconvert_v1_ISCSIVolumeSource_To_api_ISCSIVolumeSource, autoconvert_v1_IdentityList_To_api_IdentityList, autoconvert_v1_Identity_To_api_Identity, autoconvert_v1_ImageChangeTrigger_To_api_ImageChangeTrigger, @@ -5408,9 +7991,12 @@ func init() { autoconvert_v1_ImageStream_To_api_ImageStream, autoconvert_v1_Image_To_api_Image, autoconvert_v1_IsPersonalSubjectAccessReview_To_api_IsPersonalSubjectAccessReview, + autoconvert_v1_LifecycleHook_To_api_LifecycleHook, + autoconvert_v1_Lifecycle_To_api_Lifecycle, autoconvert_v1_LocalObjectReference_To_api_LocalObjectReference, autoconvert_v1_LocalResourceAccessReview_To_api_LocalResourceAccessReview, autoconvert_v1_LocalSubjectAccessReview_To_api_LocalSubjectAccessReview, + autoconvert_v1_NFSVolumeSource_To_api_NFSVolumeSource, autoconvert_v1_NetNamespaceList_To_api_NetNamespaceList, autoconvert_v1_NetNamespace_To_api_NetNamespace, autoconvert_v1_OAuthAccessTokenList_To_api_OAuthAccessTokenList, @@ -5425,16 +8011,22 @@ func init() { autoconvert_v1_ObjectMeta_To_api_ObjectMeta, autoconvert_v1_ObjectReference_To_api_ObjectReference, autoconvert_v1_Parameter_To_api_Parameter, + autoconvert_v1_PersistentVolumeClaimVolumeSource_To_api_PersistentVolumeClaimVolumeSource, + autoconvert_v1_PodSpec_To_api_PodSpec, + autoconvert_v1_PodTemplateSpec_To_api_PodTemplateSpec, autoconvert_v1_PolicyBindingList_To_api_PolicyBindingList, autoconvert_v1_PolicyBinding_To_api_PolicyBinding, autoconvert_v1_PolicyList_To_api_PolicyList, autoconvert_v1_PolicyRule_To_api_PolicyRule, autoconvert_v1_Policy_To_api_Policy, + autoconvert_v1_Probe_To_api_Probe, autoconvert_v1_ProjectList_To_api_ProjectList, autoconvert_v1_ProjectRequest_To_api_ProjectRequest, autoconvert_v1_ProjectSpec_To_api_ProjectSpec, autoconvert_v1_ProjectStatus_To_api_ProjectStatus, autoconvert_v1_Project_To_api_Project, + autoconvert_v1_RBDVolumeSource_To_api_RBDVolumeSource, + autoconvert_v1_RecreateDeploymentStrategyParams_To_api_RecreateDeploymentStrategyParams, autoconvert_v1_ResourceAccessReviewResponse_To_api_ResourceAccessReviewResponse, autoconvert_v1_ResourceAccessReview_To_api_ResourceAccessReview, autoconvert_v1_ResourceRequirements_To_api_ResourceRequirements, @@ -5442,23 +8034,31 @@ func init() { autoconvert_v1_RoleBinding_To_api_RoleBinding, autoconvert_v1_RoleList_To_api_RoleList, autoconvert_v1_Role_To_api_Role, + autoconvert_v1_RollingDeploymentStrategyParams_To_api_RollingDeploymentStrategyParams, autoconvert_v1_RouteList_To_api_RouteList, autoconvert_v1_RoutePort_To_api_RoutePort, autoconvert_v1_RouteSpec_To_api_RouteSpec, autoconvert_v1_RouteStatus_To_api_RouteStatus, autoconvert_v1_Route_To_api_Route, + autoconvert_v1_SELinuxOptions_To_api_SELinuxOptions, autoconvert_v1_SecretSpec_To_api_SecretSpec, + autoconvert_v1_SecretVolumeSource_To_api_SecretVolumeSource, + autoconvert_v1_SecurityContext_To_api_SecurityContext, autoconvert_v1_SourceBuildStrategy_To_api_SourceBuildStrategy, autoconvert_v1_SourceControlUser_To_api_SourceControlUser, autoconvert_v1_SourceRevision_To_api_SourceRevision, autoconvert_v1_SubjectAccessReviewResponse_To_api_SubjectAccessReviewResponse, autoconvert_v1_SubjectAccessReview_To_api_SubjectAccessReview, + autoconvert_v1_TCPSocketAction_To_api_TCPSocketAction, autoconvert_v1_TLSConfig_To_api_TLSConfig, autoconvert_v1_TemplateList_To_api_TemplateList, autoconvert_v1_Template_To_api_Template, autoconvert_v1_UserIdentityMapping_To_api_UserIdentityMapping, autoconvert_v1_UserList_To_api_UserList, autoconvert_v1_User_To_api_User, + autoconvert_v1_VolumeMount_To_api_VolumeMount, + autoconvert_v1_VolumeSource_To_api_VolumeSource, + autoconvert_v1_Volume_To_api_Volume, autoconvert_v1_WebHookTrigger_To_api_WebHookTrigger, ) if err != nil { diff --git a/pkg/api/v1beta3/conversion_generated.go b/pkg/api/v1beta3/conversion_generated.go index 174e84d7be1a..7f71e71e11ff 100644 --- a/pkg/api/v1beta3/conversion_generated.go +++ b/pkg/api/v1beta3/conversion_generated.go @@ -2507,6 +2507,70 @@ func convert_v1beta3_WebHookTrigger_To_api_WebHookTrigger(in *apiv1beta3.WebHook return autoconvert_v1beta3_WebHookTrigger_To_api_WebHookTrigger(in, out, s) } +func autoconvert_api_CustomDeploymentStrategyParams_To_v1beta3_CustomDeploymentStrategyParams(in *deployapi.CustomDeploymentStrategyParams, out *deployapiv1beta3.CustomDeploymentStrategyParams, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*deployapi.CustomDeploymentStrategyParams))(in) + } + out.Image = in.Image + if in.Environment != nil { + out.Environment = make([]pkgapiv1beta3.EnvVar, len(in.Environment)) + for i := range in.Environment { + if err := convert_api_EnvVar_To_v1beta3_EnvVar(&in.Environment[i], &out.Environment[i], s); err != nil { + return err + } + } + } else { + out.Environment = nil + } + if in.Command != nil { + out.Command = make([]string, len(in.Command)) + for i := range in.Command { + out.Command[i] = in.Command[i] + } + } else { + out.Command = nil + } + return nil +} + +func convert_api_CustomDeploymentStrategyParams_To_v1beta3_CustomDeploymentStrategyParams(in *deployapi.CustomDeploymentStrategyParams, out *deployapiv1beta3.CustomDeploymentStrategyParams, s conversion.Scope) error { + return autoconvert_api_CustomDeploymentStrategyParams_To_v1beta3_CustomDeploymentStrategyParams(in, out, s) +} + +func autoconvert_api_DeploymentCause_To_v1beta3_DeploymentCause(in *deployapi.DeploymentCause, out *deployapiv1beta3.DeploymentCause, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*deployapi.DeploymentCause))(in) + } + out.Type = deployapiv1beta3.DeploymentTriggerType(in.Type) + if in.ImageTrigger != nil { + out.ImageTrigger = new(deployapiv1beta3.DeploymentCauseImageTrigger) + if err := convert_api_DeploymentCauseImageTrigger_To_v1beta3_DeploymentCauseImageTrigger(in.ImageTrigger, out.ImageTrigger, s); err != nil { + return err + } + } else { + out.ImageTrigger = nil + } + return nil +} + +func convert_api_DeploymentCause_To_v1beta3_DeploymentCause(in *deployapi.DeploymentCause, out *deployapiv1beta3.DeploymentCause, s conversion.Scope) error { + return autoconvert_api_DeploymentCause_To_v1beta3_DeploymentCause(in, out, s) +} + +func autoconvert_api_DeploymentCauseImageTrigger_To_v1beta3_DeploymentCauseImageTrigger(in *deployapi.DeploymentCauseImageTrigger, out *deployapiv1beta3.DeploymentCauseImageTrigger, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*deployapi.DeploymentCauseImageTrigger))(in) + } + if err := convert_api_ObjectReference_To_v1beta3_ObjectReference(&in.From, &out.From, s); err != nil { + return err + } + return nil +} + +func convert_api_DeploymentCauseImageTrigger_To_v1beta3_DeploymentCauseImageTrigger(in *deployapi.DeploymentCauseImageTrigger, out *deployapiv1beta3.DeploymentCauseImageTrigger, s conversion.Scope) error { + return autoconvert_api_DeploymentCauseImageTrigger_To_v1beta3_DeploymentCauseImageTrigger(in, out, s) +} + func autoconvert_api_DeploymentConfig_To_v1beta3_DeploymentConfig(in *deployapi.DeploymentConfig, out *deployapiv1beta3.DeploymentConfig, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*deployapi.DeploymentConfig))(in) @@ -2517,13 +2581,19 @@ func autoconvert_api_DeploymentConfig_To_v1beta3_DeploymentConfig(in *deployapi. if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - // in.Triggers has no peer in out - // in.Template has no peer in out - // in.LatestVersion has no peer in out - // in.Details has no peer in out + if err := convert_api_DeploymentConfigSpec_To_v1beta3_DeploymentConfigSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := convert_api_DeploymentConfigStatus_To_v1beta3_DeploymentConfigStatus(&in.Status, &out.Status, s); err != nil { + return err + } return nil } +func convert_api_DeploymentConfig_To_v1beta3_DeploymentConfig(in *deployapi.DeploymentConfig, out *deployapiv1beta3.DeploymentConfig, s conversion.Scope) error { + return autoconvert_api_DeploymentConfig_To_v1beta3_DeploymentConfig(in, out, s) +} + func autoconvert_api_DeploymentConfigList_To_v1beta3_DeploymentConfigList(in *deployapi.DeploymentConfigList, out *deployapiv1beta3.DeploymentConfigList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*deployapi.DeploymentConfigList))(in) @@ -2537,7 +2607,7 @@ func autoconvert_api_DeploymentConfigList_To_v1beta3_DeploymentConfigList(in *de if in.Items != nil { out.Items = make([]deployapiv1beta3.DeploymentConfig, len(in.Items)) for i := range in.Items { - if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { + if err := convert_api_DeploymentConfig_To_v1beta3_DeploymentConfig(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -2586,6 +2656,89 @@ func convert_api_DeploymentConfigRollbackSpec_To_v1beta3_DeploymentConfigRollbac return autoconvert_api_DeploymentConfigRollbackSpec_To_v1beta3_DeploymentConfigRollbackSpec(in, out, s) } +func autoconvert_api_DeploymentConfigSpec_To_v1beta3_DeploymentConfigSpec(in *deployapi.DeploymentConfigSpec, out *deployapiv1beta3.DeploymentConfigSpec, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*deployapi.DeploymentConfigSpec))(in) + } + if err := convert_api_DeploymentStrategy_To_v1beta3_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { + return err + } + if in.Triggers != nil { + out.Triggers = make([]deployapiv1beta3.DeploymentTriggerPolicy, len(in.Triggers)) + for i := range in.Triggers { + if err := convert_api_DeploymentTriggerPolicy_To_v1beta3_DeploymentTriggerPolicy(&in.Triggers[i], &out.Triggers[i], s); err != nil { + return err + } + } + } else { + out.Triggers = nil + } + out.Replicas = in.Replicas + if in.Selector != nil { + out.Selector = make(map[string]string) + for key, val := range in.Selector { + out.Selector[key] = val + } + } else { + out.Selector = nil + } + if in.Template != nil { + out.Template = new(pkgapiv1beta3.PodTemplateSpec) + if err := convert_api_PodTemplateSpec_To_v1beta3_PodTemplateSpec(in.Template, out.Template, s); err != nil { + return err + } + } else { + out.Template = nil + } + return nil +} + +func convert_api_DeploymentConfigSpec_To_v1beta3_DeploymentConfigSpec(in *deployapi.DeploymentConfigSpec, out *deployapiv1beta3.DeploymentConfigSpec, s conversion.Scope) error { + return autoconvert_api_DeploymentConfigSpec_To_v1beta3_DeploymentConfigSpec(in, out, s) +} + +func autoconvert_api_DeploymentConfigStatus_To_v1beta3_DeploymentConfigStatus(in *deployapi.DeploymentConfigStatus, out *deployapiv1beta3.DeploymentConfigStatus, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*deployapi.DeploymentConfigStatus))(in) + } + out.LatestVersion = in.LatestVersion + if in.Details != nil { + out.Details = new(deployapiv1beta3.DeploymentDetails) + if err := convert_api_DeploymentDetails_To_v1beta3_DeploymentDetails(in.Details, out.Details, s); err != nil { + return err + } + } else { + out.Details = nil + } + return nil +} + +func convert_api_DeploymentConfigStatus_To_v1beta3_DeploymentConfigStatus(in *deployapi.DeploymentConfigStatus, out *deployapiv1beta3.DeploymentConfigStatus, s conversion.Scope) error { + return autoconvert_api_DeploymentConfigStatus_To_v1beta3_DeploymentConfigStatus(in, out, s) +} + +func autoconvert_api_DeploymentDetails_To_v1beta3_DeploymentDetails(in *deployapi.DeploymentDetails, out *deployapiv1beta3.DeploymentDetails, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*deployapi.DeploymentDetails))(in) + } + out.Message = in.Message + if in.Causes != nil { + out.Causes = make([]*deployapiv1beta3.DeploymentCause, len(in.Causes)) + for i := range in.Causes { + if err := s.Convert(&in.Causes[i], &out.Causes[i], 0); err != nil { + return err + } + } + } else { + out.Causes = nil + } + return nil +} + +func convert_api_DeploymentDetails_To_v1beta3_DeploymentDetails(in *deployapi.DeploymentDetails, out *deployapiv1beta3.DeploymentDetails, s conversion.Scope) error { + return autoconvert_api_DeploymentDetails_To_v1beta3_DeploymentDetails(in, out, s) +} + func autoconvert_api_DeploymentLog_To_v1beta3_DeploymentLog(in *deployapi.DeploymentLog, out *deployapiv1beta3.DeploymentLog, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*deployapi.DeploymentLog))(in) @@ -2650,231 +2803,327 @@ func convert_api_DeploymentLogOptions_To_v1beta3_DeploymentLogOptions(in *deploy return autoconvert_api_DeploymentLogOptions_To_v1beta3_DeploymentLogOptions(in, out, s) } -func autoconvert_v1beta3_DeploymentConfig_To_api_DeploymentConfig(in *deployapiv1beta3.DeploymentConfig, out *deployapi.DeploymentConfig, s conversion.Scope) error { +func autoconvert_api_DeploymentStrategy_To_v1beta3_DeploymentStrategy(in *deployapi.DeploymentStrategy, out *deployapiv1beta3.DeploymentStrategy, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*deployapiv1beta3.DeploymentConfig))(in) + defaulting.(func(*deployapi.DeploymentStrategy))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + out.Type = deployapiv1beta3.DeploymentStrategyType(in.Type) + if in.CustomParams != nil { + out.CustomParams = new(deployapiv1beta3.CustomDeploymentStrategyParams) + if err := convert_api_CustomDeploymentStrategyParams_To_v1beta3_CustomDeploymentStrategyParams(in.CustomParams, out.CustomParams, s); err != nil { + return err + } + } else { + out.CustomParams = nil } - if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if in.RecreateParams != nil { + out.RecreateParams = new(deployapiv1beta3.RecreateDeploymentStrategyParams) + if err := convert_api_RecreateDeploymentStrategyParams_To_v1beta3_RecreateDeploymentStrategyParams(in.RecreateParams, out.RecreateParams, s); err != nil { + return err + } + } else { + out.RecreateParams = nil + } + if in.RollingParams != nil { + if err := s.Convert(&in.RollingParams, &out.RollingParams, 0); err != nil { + return err + } + } else { + out.RollingParams = nil + } + if err := convert_api_ResourceRequirements_To_v1beta3_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { return err } - // in.Spec has no peer in out - // in.Status has no peer in out + if in.Labels != nil { + out.Labels = make(map[string]string) + for key, val := range in.Labels { + out.Labels[key] = val + } + } else { + out.Labels = nil + } + if in.Annotations != nil { + out.Annotations = make(map[string]string) + for key, val := range in.Annotations { + out.Annotations[key] = val + } + } else { + out.Annotations = nil + } return nil } -func autoconvert_v1beta3_DeploymentConfigList_To_api_DeploymentConfigList(in *deployapiv1beta3.DeploymentConfigList, out *deployapi.DeploymentConfigList, s conversion.Scope) error { +func convert_api_DeploymentStrategy_To_v1beta3_DeploymentStrategy(in *deployapi.DeploymentStrategy, out *deployapiv1beta3.DeploymentStrategy, s conversion.Scope) error { + return autoconvert_api_DeploymentStrategy_To_v1beta3_DeploymentStrategy(in, out, s) +} + +func autoconvert_api_DeploymentTriggerImageChangeParams_To_v1beta3_DeploymentTriggerImageChangeParams(in *deployapi.DeploymentTriggerImageChangeParams, out *deployapiv1beta3.DeploymentTriggerImageChangeParams, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*deployapiv1beta3.DeploymentConfigList))(in) + defaulting.(func(*deployapi.DeploymentTriggerImageChangeParams))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + out.Automatic = in.Automatic + if in.ContainerNames != nil { + out.ContainerNames = make([]string, len(in.ContainerNames)) + for i := range in.ContainerNames { + out.ContainerNames[i] = in.ContainerNames[i] + } + } else { + out.ContainerNames = nil } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + if err := convert_api_ObjectReference_To_v1beta3_ObjectReference(&in.From, &out.From, s); err != nil { return err } - if in.Items != nil { - out.Items = make([]deployapi.DeploymentConfig, len(in.Items)) - for i := range in.Items { - if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { - return err - } + out.LastTriggeredImage = in.LastTriggeredImage + return nil +} + +func autoconvert_api_DeploymentTriggerPolicy_To_v1beta3_DeploymentTriggerPolicy(in *deployapi.DeploymentTriggerPolicy, out *deployapiv1beta3.DeploymentTriggerPolicy, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*deployapi.DeploymentTriggerPolicy))(in) + } + out.Type = deployapiv1beta3.DeploymentTriggerType(in.Type) + if in.ImageChangeParams != nil { + if err := s.Convert(&in.ImageChangeParams, &out.ImageChangeParams, 0); err != nil { + return err } } else { - out.Items = nil + out.ImageChangeParams = nil } return nil } -func convert_v1beta3_DeploymentConfigList_To_api_DeploymentConfigList(in *deployapiv1beta3.DeploymentConfigList, out *deployapi.DeploymentConfigList, s conversion.Scope) error { - return autoconvert_v1beta3_DeploymentConfigList_To_api_DeploymentConfigList(in, out, s) +func convert_api_DeploymentTriggerPolicy_To_v1beta3_DeploymentTriggerPolicy(in *deployapi.DeploymentTriggerPolicy, out *deployapiv1beta3.DeploymentTriggerPolicy, s conversion.Scope) error { + return autoconvert_api_DeploymentTriggerPolicy_To_v1beta3_DeploymentTriggerPolicy(in, out, s) } -func autoconvert_v1beta3_DeploymentConfigRollback_To_api_DeploymentConfigRollback(in *deployapiv1beta3.DeploymentConfigRollback, out *deployapi.DeploymentConfigRollback, s conversion.Scope) error { +func autoconvert_api_ExecNewPodHook_To_v1beta3_ExecNewPodHook(in *deployapi.ExecNewPodHook, out *deployapiv1beta3.ExecNewPodHook, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*deployapiv1beta3.DeploymentConfigRollback))(in) + defaulting.(func(*deployapi.ExecNewPodHook))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + if in.Command != nil { + out.Command = make([]string, len(in.Command)) + for i := range in.Command { + out.Command[i] = in.Command[i] + } + } else { + out.Command = nil } - if err := convert_v1beta3_DeploymentConfigRollbackSpec_To_api_DeploymentConfigRollbackSpec(&in.Spec, &out.Spec, s); err != nil { - return err + if in.Env != nil { + out.Env = make([]pkgapiv1beta3.EnvVar, len(in.Env)) + for i := range in.Env { + if err := convert_api_EnvVar_To_v1beta3_EnvVar(&in.Env[i], &out.Env[i], s); err != nil { + return err + } + } + } else { + out.Env = nil + } + out.ContainerName = in.ContainerName + if in.Volumes != nil { + out.Volumes = make([]string, len(in.Volumes)) + for i := range in.Volumes { + out.Volumes[i] = in.Volumes[i] + } + } else { + out.Volumes = nil } return nil } -func convert_v1beta3_DeploymentConfigRollback_To_api_DeploymentConfigRollback(in *deployapiv1beta3.DeploymentConfigRollback, out *deployapi.DeploymentConfigRollback, s conversion.Scope) error { - return autoconvert_v1beta3_DeploymentConfigRollback_To_api_DeploymentConfigRollback(in, out, s) +func convert_api_ExecNewPodHook_To_v1beta3_ExecNewPodHook(in *deployapi.ExecNewPodHook, out *deployapiv1beta3.ExecNewPodHook, s conversion.Scope) error { + return autoconvert_api_ExecNewPodHook_To_v1beta3_ExecNewPodHook(in, out, s) } -func autoconvert_v1beta3_DeploymentConfigRollbackSpec_To_api_DeploymentConfigRollbackSpec(in *deployapiv1beta3.DeploymentConfigRollbackSpec, out *deployapi.DeploymentConfigRollbackSpec, s conversion.Scope) error { +func autoconvert_api_LifecycleHook_To_v1beta3_LifecycleHook(in *deployapi.LifecycleHook, out *deployapiv1beta3.LifecycleHook, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*deployapiv1beta3.DeploymentConfigRollbackSpec))(in) + defaulting.(func(*deployapi.LifecycleHook))(in) } - if err := convert_v1beta3_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil { - return err + out.FailurePolicy = deployapiv1beta3.LifecycleHookFailurePolicy(in.FailurePolicy) + if in.ExecNewPod != nil { + out.ExecNewPod = new(deployapiv1beta3.ExecNewPodHook) + if err := convert_api_ExecNewPodHook_To_v1beta3_ExecNewPodHook(in.ExecNewPod, out.ExecNewPod, s); err != nil { + return err + } + } else { + out.ExecNewPod = nil } - out.IncludeTriggers = in.IncludeTriggers - out.IncludeTemplate = in.IncludeTemplate - out.IncludeReplicationMeta = in.IncludeReplicationMeta - out.IncludeStrategy = in.IncludeStrategy return nil } -func convert_v1beta3_DeploymentConfigRollbackSpec_To_api_DeploymentConfigRollbackSpec(in *deployapiv1beta3.DeploymentConfigRollbackSpec, out *deployapi.DeploymentConfigRollbackSpec, s conversion.Scope) error { - return autoconvert_v1beta3_DeploymentConfigRollbackSpec_To_api_DeploymentConfigRollbackSpec(in, out, s) +func convert_api_LifecycleHook_To_v1beta3_LifecycleHook(in *deployapi.LifecycleHook, out *deployapiv1beta3.LifecycleHook, s conversion.Scope) error { + return autoconvert_api_LifecycleHook_To_v1beta3_LifecycleHook(in, out, s) } -func autoconvert_v1beta3_DeploymentLog_To_api_DeploymentLog(in *deployapiv1beta3.DeploymentLog, out *deployapi.DeploymentLog, s conversion.Scope) error { +func autoconvert_api_RecreateDeploymentStrategyParams_To_v1beta3_RecreateDeploymentStrategyParams(in *deployapi.RecreateDeploymentStrategyParams, out *deployapiv1beta3.RecreateDeploymentStrategyParams, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*deployapiv1beta3.DeploymentLog))(in) + defaulting.(func(*deployapi.RecreateDeploymentStrategyParams))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + if in.Pre != nil { + out.Pre = new(deployapiv1beta3.LifecycleHook) + if err := convert_api_LifecycleHook_To_v1beta3_LifecycleHook(in.Pre, out.Pre, s); err != nil { + return err + } + } else { + out.Pre = nil + } + if in.Post != nil { + out.Post = new(deployapiv1beta3.LifecycleHook) + if err := convert_api_LifecycleHook_To_v1beta3_LifecycleHook(in.Post, out.Post, s); err != nil { + return err + } + } else { + out.Post = nil } return nil } -func convert_v1beta3_DeploymentLog_To_api_DeploymentLog(in *deployapiv1beta3.DeploymentLog, out *deployapi.DeploymentLog, s conversion.Scope) error { - return autoconvert_v1beta3_DeploymentLog_To_api_DeploymentLog(in, out, s) +func convert_api_RecreateDeploymentStrategyParams_To_v1beta3_RecreateDeploymentStrategyParams(in *deployapi.RecreateDeploymentStrategyParams, out *deployapiv1beta3.RecreateDeploymentStrategyParams, s conversion.Scope) error { + return autoconvert_api_RecreateDeploymentStrategyParams_To_v1beta3_RecreateDeploymentStrategyParams(in, out, s) } -func autoconvert_v1beta3_DeploymentLogOptions_To_api_DeploymentLogOptions(in *deployapiv1beta3.DeploymentLogOptions, out *deployapi.DeploymentLogOptions, s conversion.Scope) error { +func autoconvert_api_RollingDeploymentStrategyParams_To_v1beta3_RollingDeploymentStrategyParams(in *deployapi.RollingDeploymentStrategyParams, out *deployapiv1beta3.RollingDeploymentStrategyParams, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*deployapiv1beta3.DeploymentLogOptions))(in) + defaulting.(func(*deployapi.RollingDeploymentStrategyParams))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + if in.UpdatePeriodSeconds != nil { + out.UpdatePeriodSeconds = new(int64) + *out.UpdatePeriodSeconds = *in.UpdatePeriodSeconds + } else { + out.UpdatePeriodSeconds = nil + } + if in.IntervalSeconds != nil { + out.IntervalSeconds = new(int64) + *out.IntervalSeconds = *in.IntervalSeconds + } else { + out.IntervalSeconds = nil + } + if in.TimeoutSeconds != nil { + out.TimeoutSeconds = new(int64) + *out.TimeoutSeconds = *in.TimeoutSeconds + } else { + out.TimeoutSeconds = nil + } + if err := s.Convert(&in.MaxUnavailable, &out.MaxUnavailable, 0); err != nil { return err } - out.Container = in.Container - out.Follow = in.Follow - out.Previous = in.Previous - if in.SinceSeconds != nil { - out.SinceSeconds = new(int64) - *out.SinceSeconds = *in.SinceSeconds + if err := s.Convert(&in.MaxSurge, &out.MaxSurge, 0); err != nil { + return err + } + if in.UpdatePercent != nil { + out.UpdatePercent = new(int) + *out.UpdatePercent = *in.UpdatePercent } else { - out.SinceSeconds = nil + out.UpdatePercent = nil } - if in.SinceTime != nil { - if err := s.Convert(&in.SinceTime, &out.SinceTime, 0); err != nil { + if in.Pre != nil { + out.Pre = new(deployapiv1beta3.LifecycleHook) + if err := convert_api_LifecycleHook_To_v1beta3_LifecycleHook(in.Pre, out.Pre, s); err != nil { return err } } else { - out.SinceTime = nil + out.Pre = nil } - out.Timestamps = in.Timestamps - if in.TailLines != nil { - out.TailLines = new(int64) - *out.TailLines = *in.TailLines + if in.Post != nil { + out.Post = new(deployapiv1beta3.LifecycleHook) + if err := convert_api_LifecycleHook_To_v1beta3_LifecycleHook(in.Post, out.Post, s); err != nil { + return err + } } else { - out.TailLines = nil + out.Post = nil } - if in.LimitBytes != nil { - out.LimitBytes = new(int64) - *out.LimitBytes = *in.LimitBytes + return nil +} + +func autoconvert_v1beta3_CustomDeploymentStrategyParams_To_api_CustomDeploymentStrategyParams(in *deployapiv1beta3.CustomDeploymentStrategyParams, out *deployapi.CustomDeploymentStrategyParams, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*deployapiv1beta3.CustomDeploymentStrategyParams))(in) + } + out.Image = in.Image + if in.Environment != nil { + out.Environment = make([]pkgapi.EnvVar, len(in.Environment)) + for i := range in.Environment { + if err := convert_v1beta3_EnvVar_To_api_EnvVar(&in.Environment[i], &out.Environment[i], s); err != nil { + return err + } + } } else { - out.LimitBytes = nil + out.Environment = nil } - out.NoWait = in.NoWait - if in.Version != nil { - out.Version = new(int64) - *out.Version = *in.Version + if in.Command != nil { + out.Command = make([]string, len(in.Command)) + for i := range in.Command { + out.Command[i] = in.Command[i] + } } else { - out.Version = nil + out.Command = nil } return nil } -func convert_v1beta3_DeploymentLogOptions_To_api_DeploymentLogOptions(in *deployapiv1beta3.DeploymentLogOptions, out *deployapi.DeploymentLogOptions, s conversion.Scope) error { - return autoconvert_v1beta3_DeploymentLogOptions_To_api_DeploymentLogOptions(in, out, s) +func convert_v1beta3_CustomDeploymentStrategyParams_To_api_CustomDeploymentStrategyParams(in *deployapiv1beta3.CustomDeploymentStrategyParams, out *deployapi.CustomDeploymentStrategyParams, s conversion.Scope) error { + return autoconvert_v1beta3_CustomDeploymentStrategyParams_To_api_CustomDeploymentStrategyParams(in, out, s) } -func autoconvert_api_Image_To_v1beta3_Image(in *imageapi.Image, out *imageapiv1beta3.Image, s conversion.Scope) error { +func autoconvert_v1beta3_DeploymentCause_To_api_DeploymentCause(in *deployapiv1beta3.DeploymentCause, out *deployapi.DeploymentCause, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.Image))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + defaulting.(func(*deployapiv1beta3.DeploymentCause))(in) } - if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err + out.Type = deployapi.DeploymentTriggerType(in.Type) + if in.ImageTrigger != nil { + out.ImageTrigger = new(deployapi.DeploymentCauseImageTrigger) + if err := convert_v1beta3_DeploymentCauseImageTrigger_To_api_DeploymentCauseImageTrigger(in.ImageTrigger, out.ImageTrigger, s); err != nil { + return err + } + } else { + out.ImageTrigger = nil } - out.DockerImageReference = in.DockerImageReference - if err := s.Convert(&in.DockerImageMetadata, &out.DockerImageMetadata, 0); err != nil { - return err - } - out.DockerImageMetadataVersion = in.DockerImageMetadataVersion - out.DockerImageManifest = in.DockerImageManifest return nil } -func autoconvert_api_ImageList_To_v1beta3_ImageList(in *imageapi.ImageList, out *imageapiv1beta3.ImageList, s conversion.Scope) error { +func convert_v1beta3_DeploymentCause_To_api_DeploymentCause(in *deployapiv1beta3.DeploymentCause, out *deployapi.DeploymentCause, s conversion.Scope) error { + return autoconvert_v1beta3_DeploymentCause_To_api_DeploymentCause(in, out, s) +} + +func autoconvert_v1beta3_DeploymentCauseImageTrigger_To_api_DeploymentCauseImageTrigger(in *deployapiv1beta3.DeploymentCauseImageTrigger, out *deployapi.DeploymentCauseImageTrigger, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.ImageList))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + defaulting.(func(*deployapiv1beta3.DeploymentCauseImageTrigger))(in) } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + if err := convert_v1beta3_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil { return err } - if in.Items != nil { - out.Items = make([]imageapiv1beta3.Image, len(in.Items)) - for i := range in.Items { - if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { - return err - } - } - } else { - out.Items = nil - } return nil } -func convert_api_ImageList_To_v1beta3_ImageList(in *imageapi.ImageList, out *imageapiv1beta3.ImageList, s conversion.Scope) error { - return autoconvert_api_ImageList_To_v1beta3_ImageList(in, out, s) +func convert_v1beta3_DeploymentCauseImageTrigger_To_api_DeploymentCauseImageTrigger(in *deployapiv1beta3.DeploymentCauseImageTrigger, out *deployapi.DeploymentCauseImageTrigger, s conversion.Scope) error { + return autoconvert_v1beta3_DeploymentCauseImageTrigger_To_api_DeploymentCauseImageTrigger(in, out, s) } -func autoconvert_api_ImageStream_To_v1beta3_ImageStream(in *imageapi.ImageStream, out *imageapiv1beta3.ImageStream, s conversion.Scope) error { +func autoconvert_v1beta3_DeploymentConfig_To_api_DeploymentConfig(in *deployapiv1beta3.DeploymentConfig, out *deployapi.DeploymentConfig, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.ImageStream))(in) + defaulting.(func(*deployapiv1beta3.DeploymentConfig))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil { + if err := convert_v1beta3_DeploymentConfigSpec_To_api_DeploymentConfigSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := s.Convert(&in.Status, &out.Status, 0); err != nil { + if err := convert_v1beta3_DeploymentConfigStatus_To_api_DeploymentConfigStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -func autoconvert_api_ImageStreamImage_To_v1beta3_ImageStreamImage(in *imageapi.ImageStreamImage, out *imageapiv1beta3.ImageStreamImage, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.ImageStreamImage))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err - } - if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - if err := s.Convert(&in.Image, &out.Image, 0); err != nil { - return err - } - return nil +func convert_v1beta3_DeploymentConfig_To_api_DeploymentConfig(in *deployapiv1beta3.DeploymentConfig, out *deployapi.DeploymentConfig, s conversion.Scope) error { + return autoconvert_v1beta3_DeploymentConfig_To_api_DeploymentConfig(in, out, s) } -func autoconvert_api_ImageStreamList_To_v1beta3_ImageStreamList(in *imageapi.ImageStreamList, out *imageapiv1beta3.ImageStreamList, s conversion.Scope) error { +func autoconvert_v1beta3_DeploymentConfigList_To_api_DeploymentConfigList(in *deployapiv1beta3.DeploymentConfigList, out *deployapi.DeploymentConfigList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.ImageStreamList))(in) + defaulting.(func(*deployapiv1beta3.DeploymentConfigList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -2883,9 +3132,9 @@ func autoconvert_api_ImageStreamList_To_v1beta3_ImageStreamList(in *imageapi.Ima return err } if in.Items != nil { - out.Items = make([]imageapiv1beta3.ImageStream, len(in.Items)) + out.Items = make([]deployapi.DeploymentConfig, len(in.Items)) for i := range in.Items { - if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { + if err := convert_v1beta3_DeploymentConfig_To_api_DeploymentConfig(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -2895,335 +3144,422 @@ func autoconvert_api_ImageStreamList_To_v1beta3_ImageStreamList(in *imageapi.Ima return nil } -func convert_api_ImageStreamList_To_v1beta3_ImageStreamList(in *imageapi.ImageStreamList, out *imageapiv1beta3.ImageStreamList, s conversion.Scope) error { - return autoconvert_api_ImageStreamList_To_v1beta3_ImageStreamList(in, out, s) +func convert_v1beta3_DeploymentConfigList_To_api_DeploymentConfigList(in *deployapiv1beta3.DeploymentConfigList, out *deployapi.DeploymentConfigList, s conversion.Scope) error { + return autoconvert_v1beta3_DeploymentConfigList_To_api_DeploymentConfigList(in, out, s) } -func autoconvert_api_ImageStreamMapping_To_v1beta3_ImageStreamMapping(in *imageapi.ImageStreamMapping, out *imageapiv1beta3.ImageStreamMapping, s conversion.Scope) error { +func autoconvert_v1beta3_DeploymentConfigRollback_To_api_DeploymentConfigRollback(in *deployapiv1beta3.DeploymentConfigRollback, out *deployapi.DeploymentConfigRollback, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.ImageStreamMapping))(in) + defaulting.(func(*deployapiv1beta3.DeploymentConfigRollback))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - // in.DockerImageRepository has no peer in out - if err := s.Convert(&in.Image, &out.Image, 0); err != nil { + if err := convert_v1beta3_DeploymentConfigRollbackSpec_To_api_DeploymentConfigRollbackSpec(&in.Spec, &out.Spec, s); err != nil { return err } - out.Tag = in.Tag return nil } -func autoconvert_api_ImageStreamSpec_To_v1beta3_ImageStreamSpec(in *imageapi.ImageStreamSpec, out *imageapiv1beta3.ImageStreamSpec, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.ImageStreamSpec))(in) - } - out.DockerImageRepository = in.DockerImageRepository - if err := s.Convert(&in.Tags, &out.Tags, 0); err != nil { - return err - } - return nil +func convert_v1beta3_DeploymentConfigRollback_To_api_DeploymentConfigRollback(in *deployapiv1beta3.DeploymentConfigRollback, out *deployapi.DeploymentConfigRollback, s conversion.Scope) error { + return autoconvert_v1beta3_DeploymentConfigRollback_To_api_DeploymentConfigRollback(in, out, s) } -func autoconvert_api_ImageStreamStatus_To_v1beta3_ImageStreamStatus(in *imageapi.ImageStreamStatus, out *imageapiv1beta3.ImageStreamStatus, s conversion.Scope) error { +func autoconvert_v1beta3_DeploymentConfigRollbackSpec_To_api_DeploymentConfigRollbackSpec(in *deployapiv1beta3.DeploymentConfigRollbackSpec, out *deployapi.DeploymentConfigRollbackSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.ImageStreamStatus))(in) + defaulting.(func(*deployapiv1beta3.DeploymentConfigRollbackSpec))(in) } - out.DockerImageRepository = in.DockerImageRepository - if err := s.Convert(&in.Tags, &out.Tags, 0); err != nil { + if err := convert_v1beta3_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil { return err } + out.IncludeTriggers = in.IncludeTriggers + out.IncludeTemplate = in.IncludeTemplate + out.IncludeReplicationMeta = in.IncludeReplicationMeta + out.IncludeStrategy = in.IncludeStrategy return nil } -func autoconvert_api_ImageStreamTag_To_v1beta3_ImageStreamTag(in *imageapi.ImageStreamTag, out *imageapiv1beta3.ImageStreamTag, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.ImageStreamTag))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err - } - if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - if err := s.Convert(&in.Image, &out.Image, 0); err != nil { - return err - } - return nil +func convert_v1beta3_DeploymentConfigRollbackSpec_To_api_DeploymentConfigRollbackSpec(in *deployapiv1beta3.DeploymentConfigRollbackSpec, out *deployapi.DeploymentConfigRollbackSpec, s conversion.Scope) error { + return autoconvert_v1beta3_DeploymentConfigRollbackSpec_To_api_DeploymentConfigRollbackSpec(in, out, s) } -func autoconvert_api_ImageStreamTagList_To_v1beta3_ImageStreamTagList(in *imageapi.ImageStreamTagList, out *imageapiv1beta3.ImageStreamTagList, s conversion.Scope) error { +func autoconvert_v1beta3_DeploymentConfigSpec_To_api_DeploymentConfigSpec(in *deployapiv1beta3.DeploymentConfigSpec, out *deployapi.DeploymentConfigSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapi.ImageStreamTagList))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + defaulting.(func(*deployapiv1beta3.DeploymentConfigSpec))(in) } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + if err := convert_v1beta3_DeploymentStrategy_To_api_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { return err } - if in.Items != nil { - out.Items = make([]imageapiv1beta3.ImageStreamTag, len(in.Items)) - for i := range in.Items { - if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { + if in.Triggers != nil { + out.Triggers = make([]deployapi.DeploymentTriggerPolicy, len(in.Triggers)) + for i := range in.Triggers { + if err := convert_v1beta3_DeploymentTriggerPolicy_To_api_DeploymentTriggerPolicy(&in.Triggers[i], &out.Triggers[i], s); err != nil { return err } } } else { - out.Items = nil + out.Triggers = nil + } + out.Replicas = in.Replicas + if in.Selector != nil { + out.Selector = make(map[string]string) + for key, val := range in.Selector { + out.Selector[key] = val + } + } else { + out.Selector = nil + } + if in.Template != nil { + out.Template = new(pkgapi.PodTemplateSpec) + if err := convert_v1beta3_PodTemplateSpec_To_api_PodTemplateSpec(in.Template, out.Template, s); err != nil { + return err + } + } else { + out.Template = nil } return nil } -func convert_api_ImageStreamTagList_To_v1beta3_ImageStreamTagList(in *imageapi.ImageStreamTagList, out *imageapiv1beta3.ImageStreamTagList, s conversion.Scope) error { - return autoconvert_api_ImageStreamTagList_To_v1beta3_ImageStreamTagList(in, out, s) +func convert_v1beta3_DeploymentConfigSpec_To_api_DeploymentConfigSpec(in *deployapiv1beta3.DeploymentConfigSpec, out *deployapi.DeploymentConfigSpec, s conversion.Scope) error { + return autoconvert_v1beta3_DeploymentConfigSpec_To_api_DeploymentConfigSpec(in, out, s) } -func autoconvert_v1beta3_Image_To_api_Image(in *imageapiv1beta3.Image, out *imageapi.Image, s conversion.Scope) error { +func autoconvert_v1beta3_DeploymentConfigStatus_To_api_DeploymentConfigStatus(in *deployapiv1beta3.DeploymentConfigStatus, out *deployapi.DeploymentConfigStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1beta3.Image))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + defaulting.(func(*deployapiv1beta3.DeploymentConfigStatus))(in) } - if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - out.DockerImageReference = in.DockerImageReference - if err := s.Convert(&in.DockerImageMetadata, &out.DockerImageMetadata, 0); err != nil { - return err + out.LatestVersion = in.LatestVersion + if in.Details != nil { + out.Details = new(deployapi.DeploymentDetails) + if err := convert_v1beta3_DeploymentDetails_To_api_DeploymentDetails(in.Details, out.Details, s); err != nil { + return err + } + } else { + out.Details = nil } - out.DockerImageMetadataVersion = in.DockerImageMetadataVersion - out.DockerImageManifest = in.DockerImageManifest return nil } -func autoconvert_v1beta3_ImageList_To_api_ImageList(in *imageapiv1beta3.ImageList, out *imageapi.ImageList, s conversion.Scope) error { +func convert_v1beta3_DeploymentConfigStatus_To_api_DeploymentConfigStatus(in *deployapiv1beta3.DeploymentConfigStatus, out *deployapi.DeploymentConfigStatus, s conversion.Scope) error { + return autoconvert_v1beta3_DeploymentConfigStatus_To_api_DeploymentConfigStatus(in, out, s) +} + +func autoconvert_v1beta3_DeploymentDetails_To_api_DeploymentDetails(in *deployapiv1beta3.DeploymentDetails, out *deployapi.DeploymentDetails, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1beta3.ImageList))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err - } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { - return err + defaulting.(func(*deployapiv1beta3.DeploymentDetails))(in) } - if in.Items != nil { - out.Items = make([]imageapi.Image, len(in.Items)) - for i := range in.Items { - if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { + out.Message = in.Message + if in.Causes != nil { + out.Causes = make([]*deployapi.DeploymentCause, len(in.Causes)) + for i := range in.Causes { + if err := s.Convert(&in.Causes[i], &out.Causes[i], 0); err != nil { return err } } } else { - out.Items = nil + out.Causes = nil } return nil } -func convert_v1beta3_ImageList_To_api_ImageList(in *imageapiv1beta3.ImageList, out *imageapi.ImageList, s conversion.Scope) error { - return autoconvert_v1beta3_ImageList_To_api_ImageList(in, out, s) +func convert_v1beta3_DeploymentDetails_To_api_DeploymentDetails(in *deployapiv1beta3.DeploymentDetails, out *deployapi.DeploymentDetails, s conversion.Scope) error { + return autoconvert_v1beta3_DeploymentDetails_To_api_DeploymentDetails(in, out, s) } -func autoconvert_v1beta3_ImageStream_To_api_ImageStream(in *imageapiv1beta3.ImageStream, out *imageapi.ImageStream, s conversion.Scope) error { +func autoconvert_v1beta3_DeploymentLog_To_api_DeploymentLog(in *deployapiv1beta3.DeploymentLog, out *deployapi.DeploymentLog, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1beta3.ImageStream))(in) + defaulting.(func(*deployapiv1beta3.DeploymentLog))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil { - return err - } - if err := s.Convert(&in.Status, &out.Status, 0); err != nil { - return err - } return nil } -func autoconvert_v1beta3_ImageStreamImage_To_api_ImageStreamImage(in *imageapiv1beta3.ImageStreamImage, out *imageapi.ImageStreamImage, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1beta3.ImageStreamImage))(in) - } - if err := s.Convert(&in.Image, &out.Image, 0); err != nil { - return err - } - // in.ImageName has no peer in out - return nil +func convert_v1beta3_DeploymentLog_To_api_DeploymentLog(in *deployapiv1beta3.DeploymentLog, out *deployapi.DeploymentLog, s conversion.Scope) error { + return autoconvert_v1beta3_DeploymentLog_To_api_DeploymentLog(in, out, s) } -func autoconvert_v1beta3_ImageStreamList_To_api_ImageStreamList(in *imageapiv1beta3.ImageStreamList, out *imageapi.ImageStreamList, s conversion.Scope) error { +func autoconvert_v1beta3_DeploymentLogOptions_To_api_DeploymentLogOptions(in *deployapiv1beta3.DeploymentLogOptions, out *deployapi.DeploymentLogOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1beta3.ImageStreamList))(in) + defaulting.(func(*deployapiv1beta3.DeploymentLogOptions))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { - return err + out.Container = in.Container + out.Follow = in.Follow + out.Previous = in.Previous + if in.SinceSeconds != nil { + out.SinceSeconds = new(int64) + *out.SinceSeconds = *in.SinceSeconds + } else { + out.SinceSeconds = nil } - if in.Items != nil { - out.Items = make([]imageapi.ImageStream, len(in.Items)) - for i := range in.Items { - if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { - return err - } + if in.SinceTime != nil { + if err := s.Convert(&in.SinceTime, &out.SinceTime, 0); err != nil { + return err } } else { - out.Items = nil + out.SinceTime = nil + } + out.Timestamps = in.Timestamps + if in.TailLines != nil { + out.TailLines = new(int64) + *out.TailLines = *in.TailLines + } else { + out.TailLines = nil + } + if in.LimitBytes != nil { + out.LimitBytes = new(int64) + *out.LimitBytes = *in.LimitBytes + } else { + out.LimitBytes = nil + } + out.NoWait = in.NoWait + if in.Version != nil { + out.Version = new(int64) + *out.Version = *in.Version + } else { + out.Version = nil } return nil } -func convert_v1beta3_ImageStreamList_To_api_ImageStreamList(in *imageapiv1beta3.ImageStreamList, out *imageapi.ImageStreamList, s conversion.Scope) error { - return autoconvert_v1beta3_ImageStreamList_To_api_ImageStreamList(in, out, s) +func convert_v1beta3_DeploymentLogOptions_To_api_DeploymentLogOptions(in *deployapiv1beta3.DeploymentLogOptions, out *deployapi.DeploymentLogOptions, s conversion.Scope) error { + return autoconvert_v1beta3_DeploymentLogOptions_To_api_DeploymentLogOptions(in, out, s) } -func autoconvert_v1beta3_ImageStreamMapping_To_api_ImageStreamMapping(in *imageapiv1beta3.ImageStreamMapping, out *imageapi.ImageStreamMapping, s conversion.Scope) error { +func autoconvert_v1beta3_DeploymentStrategy_To_api_DeploymentStrategy(in *deployapiv1beta3.DeploymentStrategy, out *deployapi.DeploymentStrategy, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1beta3.ImageStreamMapping))(in) + defaulting.(func(*deployapiv1beta3.DeploymentStrategy))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + out.Type = deployapi.DeploymentStrategyType(in.Type) + if in.CustomParams != nil { + out.CustomParams = new(deployapi.CustomDeploymentStrategyParams) + if err := convert_v1beta3_CustomDeploymentStrategyParams_To_api_CustomDeploymentStrategyParams(in.CustomParams, out.CustomParams, s); err != nil { + return err + } + } else { + out.CustomParams = nil } - if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err + if in.RecreateParams != nil { + out.RecreateParams = new(deployapi.RecreateDeploymentStrategyParams) + if err := convert_v1beta3_RecreateDeploymentStrategyParams_To_api_RecreateDeploymentStrategyParams(in.RecreateParams, out.RecreateParams, s); err != nil { + return err + } + } else { + out.RecreateParams = nil } - if err := s.Convert(&in.Image, &out.Image, 0); err != nil { + if in.RollingParams != nil { + if err := s.Convert(&in.RollingParams, &out.RollingParams, 0); err != nil { + return err + } + } else { + out.RollingParams = nil + } + if err := convert_v1beta3_ResourceRequirements_To_api_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { return err } - out.Tag = in.Tag - return nil -} - -func autoconvert_v1beta3_ImageStreamSpec_To_api_ImageStreamSpec(in *imageapiv1beta3.ImageStreamSpec, out *imageapi.ImageStreamSpec, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1beta3.ImageStreamSpec))(in) + if in.Labels != nil { + out.Labels = make(map[string]string) + for key, val := range in.Labels { + out.Labels[key] = val + } + } else { + out.Labels = nil } - out.DockerImageRepository = in.DockerImageRepository - if err := s.Convert(&in.Tags, &out.Tags, 0); err != nil { - return err + if in.Annotations != nil { + out.Annotations = make(map[string]string) + for key, val := range in.Annotations { + out.Annotations[key] = val + } + } else { + out.Annotations = nil } return nil } -func autoconvert_v1beta3_ImageStreamStatus_To_api_ImageStreamStatus(in *imageapiv1beta3.ImageStreamStatus, out *imageapi.ImageStreamStatus, s conversion.Scope) error { +func convert_v1beta3_DeploymentStrategy_To_api_DeploymentStrategy(in *deployapiv1beta3.DeploymentStrategy, out *deployapi.DeploymentStrategy, s conversion.Scope) error { + return autoconvert_v1beta3_DeploymentStrategy_To_api_DeploymentStrategy(in, out, s) +} + +func autoconvert_v1beta3_DeploymentTriggerImageChangeParams_To_api_DeploymentTriggerImageChangeParams(in *deployapiv1beta3.DeploymentTriggerImageChangeParams, out *deployapi.DeploymentTriggerImageChangeParams, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1beta3.ImageStreamStatus))(in) + defaulting.(func(*deployapiv1beta3.DeploymentTriggerImageChangeParams))(in) } - out.DockerImageRepository = in.DockerImageRepository - if err := s.Convert(&in.Tags, &out.Tags, 0); err != nil { + out.Automatic = in.Automatic + if in.ContainerNames != nil { + out.ContainerNames = make([]string, len(in.ContainerNames)) + for i := range in.ContainerNames { + out.ContainerNames[i] = in.ContainerNames[i] + } + } else { + out.ContainerNames = nil + } + if err := convert_v1beta3_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil { return err } + out.LastTriggeredImage = in.LastTriggeredImage return nil } -func autoconvert_v1beta3_ImageStreamTag_To_api_ImageStreamTag(in *imageapiv1beta3.ImageStreamTag, out *imageapi.ImageStreamTag, s conversion.Scope) error { +func autoconvert_v1beta3_DeploymentTriggerPolicy_To_api_DeploymentTriggerPolicy(in *deployapiv1beta3.DeploymentTriggerPolicy, out *deployapi.DeploymentTriggerPolicy, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1beta3.ImageStreamTag))(in) + defaulting.(func(*deployapiv1beta3.DeploymentTriggerPolicy))(in) } - if err := s.Convert(&in.Image, &out.Image, 0); err != nil { - return err + out.Type = deployapi.DeploymentTriggerType(in.Type) + if in.ImageChangeParams != nil { + if err := s.Convert(&in.ImageChangeParams, &out.ImageChangeParams, 0); err != nil { + return err + } + } else { + out.ImageChangeParams = nil } - // in.ImageName has no peer in out return nil } -func autoconvert_v1beta3_ImageStreamTagList_To_api_ImageStreamTagList(in *imageapiv1beta3.ImageStreamTagList, out *imageapi.ImageStreamTagList, s conversion.Scope) error { +func convert_v1beta3_DeploymentTriggerPolicy_To_api_DeploymentTriggerPolicy(in *deployapiv1beta3.DeploymentTriggerPolicy, out *deployapi.DeploymentTriggerPolicy, s conversion.Scope) error { + return autoconvert_v1beta3_DeploymentTriggerPolicy_To_api_DeploymentTriggerPolicy(in, out, s) +} + +func autoconvert_v1beta3_ExecNewPodHook_To_api_ExecNewPodHook(in *deployapiv1beta3.ExecNewPodHook, out *deployapi.ExecNewPodHook, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*imageapiv1beta3.ImageStreamTagList))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + defaulting.(func(*deployapiv1beta3.ExecNewPodHook))(in) } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { - return err + if in.Command != nil { + out.Command = make([]string, len(in.Command)) + for i := range in.Command { + out.Command[i] = in.Command[i] + } + } else { + out.Command = nil } - if in.Items != nil { - out.Items = make([]imageapi.ImageStreamTag, len(in.Items)) - for i := range in.Items { - if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { + if in.Env != nil { + out.Env = make([]pkgapi.EnvVar, len(in.Env)) + for i := range in.Env { + if err := convert_v1beta3_EnvVar_To_api_EnvVar(&in.Env[i], &out.Env[i], s); err != nil { return err } } } else { - out.Items = nil + out.Env = nil + } + out.ContainerName = in.ContainerName + if in.Volumes != nil { + out.Volumes = make([]string, len(in.Volumes)) + for i := range in.Volumes { + out.Volumes[i] = in.Volumes[i] + } + } else { + out.Volumes = nil } return nil } -func convert_v1beta3_ImageStreamTagList_To_api_ImageStreamTagList(in *imageapiv1beta3.ImageStreamTagList, out *imageapi.ImageStreamTagList, s conversion.Scope) error { - return autoconvert_v1beta3_ImageStreamTagList_To_api_ImageStreamTagList(in, out, s) +func convert_v1beta3_ExecNewPodHook_To_api_ExecNewPodHook(in *deployapiv1beta3.ExecNewPodHook, out *deployapi.ExecNewPodHook, s conversion.Scope) error { + return autoconvert_v1beta3_ExecNewPodHook_To_api_ExecNewPodHook(in, out, s) } -func autoconvert_api_OAuthAccessToken_To_v1beta3_OAuthAccessToken(in *oauthapi.OAuthAccessToken, out *oauthapiv1beta3.OAuthAccessToken, s conversion.Scope) error { +func autoconvert_v1beta3_LifecycleHook_To_api_LifecycleHook(in *deployapiv1beta3.LifecycleHook, out *deployapi.LifecycleHook, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapi.OAuthAccessToken))(in) + defaulting.(func(*deployapiv1beta3.LifecycleHook))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + out.FailurePolicy = deployapi.LifecycleHookFailurePolicy(in.FailurePolicy) + if in.ExecNewPod != nil { + out.ExecNewPod = new(deployapi.ExecNewPodHook) + if err := convert_v1beta3_ExecNewPodHook_To_api_ExecNewPodHook(in.ExecNewPod, out.ExecNewPod, s); err != nil { + return err + } + } else { + out.ExecNewPod = nil } - if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err + return nil +} + +func convert_v1beta3_LifecycleHook_To_api_LifecycleHook(in *deployapiv1beta3.LifecycleHook, out *deployapi.LifecycleHook, s conversion.Scope) error { + return autoconvert_v1beta3_LifecycleHook_To_api_LifecycleHook(in, out, s) +} + +func autoconvert_v1beta3_RecreateDeploymentStrategyParams_To_api_RecreateDeploymentStrategyParams(in *deployapiv1beta3.RecreateDeploymentStrategyParams, out *deployapi.RecreateDeploymentStrategyParams, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*deployapiv1beta3.RecreateDeploymentStrategyParams))(in) } - out.ClientName = in.ClientName - out.ExpiresIn = in.ExpiresIn - if in.Scopes != nil { - out.Scopes = make([]string, len(in.Scopes)) - for i := range in.Scopes { - out.Scopes[i] = in.Scopes[i] + if in.Pre != nil { + out.Pre = new(deployapi.LifecycleHook) + if err := convert_v1beta3_LifecycleHook_To_api_LifecycleHook(in.Pre, out.Pre, s); err != nil { + return err } } else { - out.Scopes = nil + out.Pre = nil + } + if in.Post != nil { + out.Post = new(deployapi.LifecycleHook) + if err := convert_v1beta3_LifecycleHook_To_api_LifecycleHook(in.Post, out.Post, s); err != nil { + return err + } + } else { + out.Post = nil } - out.RedirectURI = in.RedirectURI - out.UserName = in.UserName - out.UserUID = in.UserUID - out.AuthorizeToken = in.AuthorizeToken - out.RefreshToken = in.RefreshToken return nil } -func convert_api_OAuthAccessToken_To_v1beta3_OAuthAccessToken(in *oauthapi.OAuthAccessToken, out *oauthapiv1beta3.OAuthAccessToken, s conversion.Scope) error { - return autoconvert_api_OAuthAccessToken_To_v1beta3_OAuthAccessToken(in, out, s) +func convert_v1beta3_RecreateDeploymentStrategyParams_To_api_RecreateDeploymentStrategyParams(in *deployapiv1beta3.RecreateDeploymentStrategyParams, out *deployapi.RecreateDeploymentStrategyParams, s conversion.Scope) error { + return autoconvert_v1beta3_RecreateDeploymentStrategyParams_To_api_RecreateDeploymentStrategyParams(in, out, s) } -func autoconvert_api_OAuthAccessTokenList_To_v1beta3_OAuthAccessTokenList(in *oauthapi.OAuthAccessTokenList, out *oauthapiv1beta3.OAuthAccessTokenList, s conversion.Scope) error { +func autoconvert_v1beta3_RollingDeploymentStrategyParams_To_api_RollingDeploymentStrategyParams(in *deployapiv1beta3.RollingDeploymentStrategyParams, out *deployapi.RollingDeploymentStrategyParams, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapi.OAuthAccessTokenList))(in) + defaulting.(func(*deployapiv1beta3.RollingDeploymentStrategyParams))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + if in.UpdatePeriodSeconds != nil { + out.UpdatePeriodSeconds = new(int64) + *out.UpdatePeriodSeconds = *in.UpdatePeriodSeconds + } else { + out.UpdatePeriodSeconds = nil } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { - return err + if in.IntervalSeconds != nil { + out.IntervalSeconds = new(int64) + *out.IntervalSeconds = *in.IntervalSeconds + } else { + out.IntervalSeconds = nil } - if in.Items != nil { - out.Items = make([]oauthapiv1beta3.OAuthAccessToken, len(in.Items)) - for i := range in.Items { - if err := convert_api_OAuthAccessToken_To_v1beta3_OAuthAccessToken(&in.Items[i], &out.Items[i], s); err != nil { - return err - } + if in.TimeoutSeconds != nil { + out.TimeoutSeconds = new(int64) + *out.TimeoutSeconds = *in.TimeoutSeconds + } else { + out.TimeoutSeconds = nil + } + // in.MaxUnavailable has no peer in out + // in.MaxSurge has no peer in out + if in.UpdatePercent != nil { + out.UpdatePercent = new(int) + *out.UpdatePercent = *in.UpdatePercent + } else { + out.UpdatePercent = nil + } + if in.Pre != nil { + out.Pre = new(deployapi.LifecycleHook) + if err := convert_v1beta3_LifecycleHook_To_api_LifecycleHook(in.Pre, out.Pre, s); err != nil { + return err } } else { - out.Items = nil + out.Pre = nil + } + if in.Post != nil { + out.Post = new(deployapi.LifecycleHook) + if err := convert_v1beta3_LifecycleHook_To_api_LifecycleHook(in.Post, out.Post, s); err != nil { + return err + } + } else { + out.Post = nil } return nil } -func convert_api_OAuthAccessTokenList_To_v1beta3_OAuthAccessTokenList(in *oauthapi.OAuthAccessTokenList, out *oauthapiv1beta3.OAuthAccessTokenList, s conversion.Scope) error { - return autoconvert_api_OAuthAccessTokenList_To_v1beta3_OAuthAccessTokenList(in, out, s) -} - -func autoconvert_api_OAuthAuthorizeToken_To_v1beta3_OAuthAuthorizeToken(in *oauthapi.OAuthAuthorizeToken, out *oauthapiv1beta3.OAuthAuthorizeToken, s conversion.Scope) error { +func autoconvert_api_Image_To_v1beta3_Image(in *imageapi.Image, out *imageapiv1beta3.Image, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapi.OAuthAuthorizeToken))(in) + defaulting.(func(*imageapi.Image))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3231,30 +3567,18 @@ func autoconvert_api_OAuthAuthorizeToken_To_v1beta3_OAuthAuthorizeToken(in *oaut if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.ClientName = in.ClientName - out.ExpiresIn = in.ExpiresIn - if in.Scopes != nil { - out.Scopes = make([]string, len(in.Scopes)) - for i := range in.Scopes { - out.Scopes[i] = in.Scopes[i] - } - } else { - out.Scopes = nil + out.DockerImageReference = in.DockerImageReference + if err := s.Convert(&in.DockerImageMetadata, &out.DockerImageMetadata, 0); err != nil { + return err } - out.RedirectURI = in.RedirectURI - out.State = in.State - out.UserName = in.UserName - out.UserUID = in.UserUID + out.DockerImageMetadataVersion = in.DockerImageMetadataVersion + out.DockerImageManifest = in.DockerImageManifest return nil } -func convert_api_OAuthAuthorizeToken_To_v1beta3_OAuthAuthorizeToken(in *oauthapi.OAuthAuthorizeToken, out *oauthapiv1beta3.OAuthAuthorizeToken, s conversion.Scope) error { - return autoconvert_api_OAuthAuthorizeToken_To_v1beta3_OAuthAuthorizeToken(in, out, s) -} - -func autoconvert_api_OAuthAuthorizeTokenList_To_v1beta3_OAuthAuthorizeTokenList(in *oauthapi.OAuthAuthorizeTokenList, out *oauthapiv1beta3.OAuthAuthorizeTokenList, s conversion.Scope) error { +func autoconvert_api_ImageList_To_v1beta3_ImageList(in *imageapi.ImageList, out *imageapiv1beta3.ImageList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapi.OAuthAuthorizeTokenList))(in) + defaulting.(func(*imageapi.ImageList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3263,9 +3587,9 @@ func autoconvert_api_OAuthAuthorizeTokenList_To_v1beta3_OAuthAuthorizeTokenList( return err } if in.Items != nil { - out.Items = make([]oauthapiv1beta3.OAuthAuthorizeToken, len(in.Items)) + out.Items = make([]imageapiv1beta3.Image, len(in.Items)) for i := range in.Items { - if err := convert_api_OAuthAuthorizeToken_To_v1beta3_OAuthAuthorizeToken(&in.Items[i], &out.Items[i], s); err != nil { + if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { return err } } @@ -3275,13 +3599,13 @@ func autoconvert_api_OAuthAuthorizeTokenList_To_v1beta3_OAuthAuthorizeTokenList( return nil } -func convert_api_OAuthAuthorizeTokenList_To_v1beta3_OAuthAuthorizeTokenList(in *oauthapi.OAuthAuthorizeTokenList, out *oauthapiv1beta3.OAuthAuthorizeTokenList, s conversion.Scope) error { - return autoconvert_api_OAuthAuthorizeTokenList_To_v1beta3_OAuthAuthorizeTokenList(in, out, s) +func convert_api_ImageList_To_v1beta3_ImageList(in *imageapi.ImageList, out *imageapiv1beta3.ImageList, s conversion.Scope) error { + return autoconvert_api_ImageList_To_v1beta3_ImageList(in, out, s) } -func autoconvert_api_OAuthClient_To_v1beta3_OAuthClient(in *oauthapi.OAuthClient, out *oauthapiv1beta3.OAuthClient, s conversion.Scope) error { +func autoconvert_api_ImageStream_To_v1beta3_ImageStream(in *imageapi.ImageStream, out *imageapiv1beta3.ImageStream, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapi.OAuthClient))(in) + defaulting.(func(*imageapi.ImageStream))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3289,26 +3613,18 @@ func autoconvert_api_OAuthClient_To_v1beta3_OAuthClient(in *oauthapi.OAuthClient if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.Secret = in.Secret - out.RespondWithChallenges = in.RespondWithChallenges - if in.RedirectURIs != nil { - out.RedirectURIs = make([]string, len(in.RedirectURIs)) - for i := range in.RedirectURIs { - out.RedirectURIs[i] = in.RedirectURIs[i] - } - } else { - out.RedirectURIs = nil + if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil { + return err + } + if err := s.Convert(&in.Status, &out.Status, 0); err != nil { + return err } return nil } -func convert_api_OAuthClient_To_v1beta3_OAuthClient(in *oauthapi.OAuthClient, out *oauthapiv1beta3.OAuthClient, s conversion.Scope) error { - return autoconvert_api_OAuthClient_To_v1beta3_OAuthClient(in, out, s) -} - -func autoconvert_api_OAuthClientAuthorization_To_v1beta3_OAuthClientAuthorization(in *oauthapi.OAuthClientAuthorization, out *oauthapiv1beta3.OAuthClientAuthorization, s conversion.Scope) error { +func autoconvert_api_ImageStreamImage_To_v1beta3_ImageStreamImage(in *imageapi.ImageStreamImage, out *imageapiv1beta3.ImageStreamImage, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapi.OAuthClientAuthorization))(in) + defaulting.(func(*imageapi.ImageStreamImage))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3316,27 +3632,15 @@ func autoconvert_api_OAuthClientAuthorization_To_v1beta3_OAuthClientAuthorizatio if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.ClientName = in.ClientName - out.UserName = in.UserName - out.UserUID = in.UserUID - if in.Scopes != nil { - out.Scopes = make([]string, len(in.Scopes)) - for i := range in.Scopes { - out.Scopes[i] = in.Scopes[i] - } - } else { - out.Scopes = nil + if err := s.Convert(&in.Image, &out.Image, 0); err != nil { + return err } return nil } -func convert_api_OAuthClientAuthorization_To_v1beta3_OAuthClientAuthorization(in *oauthapi.OAuthClientAuthorization, out *oauthapiv1beta3.OAuthClientAuthorization, s conversion.Scope) error { - return autoconvert_api_OAuthClientAuthorization_To_v1beta3_OAuthClientAuthorization(in, out, s) -} - -func autoconvert_api_OAuthClientAuthorizationList_To_v1beta3_OAuthClientAuthorizationList(in *oauthapi.OAuthClientAuthorizationList, out *oauthapiv1beta3.OAuthClientAuthorizationList, s conversion.Scope) error { +func autoconvert_api_ImageStreamList_To_v1beta3_ImageStreamList(in *imageapi.ImageStreamList, out *imageapiv1beta3.ImageStreamList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapi.OAuthClientAuthorizationList))(in) + defaulting.(func(*imageapi.ImageStreamList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3345,9 +3649,9 @@ func autoconvert_api_OAuthClientAuthorizationList_To_v1beta3_OAuthClientAuthoriz return err } if in.Items != nil { - out.Items = make([]oauthapiv1beta3.OAuthClientAuthorization, len(in.Items)) + out.Items = make([]imageapiv1beta3.ImageStream, len(in.Items)) for i := range in.Items { - if err := convert_api_OAuthClientAuthorization_To_v1beta3_OAuthClientAuthorization(&in.Items[i], &out.Items[i], s); err != nil { + if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { return err } } @@ -3357,72 +3661,69 @@ func autoconvert_api_OAuthClientAuthorizationList_To_v1beta3_OAuthClientAuthoriz return nil } -func convert_api_OAuthClientAuthorizationList_To_v1beta3_OAuthClientAuthorizationList(in *oauthapi.OAuthClientAuthorizationList, out *oauthapiv1beta3.OAuthClientAuthorizationList, s conversion.Scope) error { - return autoconvert_api_OAuthClientAuthorizationList_To_v1beta3_OAuthClientAuthorizationList(in, out, s) +func convert_api_ImageStreamList_To_v1beta3_ImageStreamList(in *imageapi.ImageStreamList, out *imageapiv1beta3.ImageStreamList, s conversion.Scope) error { + return autoconvert_api_ImageStreamList_To_v1beta3_ImageStreamList(in, out, s) } -func autoconvert_api_OAuthClientList_To_v1beta3_OAuthClientList(in *oauthapi.OAuthClientList, out *oauthapiv1beta3.OAuthClientList, s conversion.Scope) error { +func autoconvert_api_ImageStreamMapping_To_v1beta3_ImageStreamMapping(in *imageapi.ImageStreamMapping, out *imageapiv1beta3.ImageStreamMapping, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapi.OAuthClientList))(in) + defaulting.(func(*imageapi.ImageStreamMapping))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if in.Items != nil { - out.Items = make([]oauthapiv1beta3.OAuthClient, len(in.Items)) - for i := range in.Items { - if err := convert_api_OAuthClient_To_v1beta3_OAuthClient(&in.Items[i], &out.Items[i], s); err != nil { - return err - } - } - } else { - out.Items = nil + // in.DockerImageRepository has no peer in out + if err := s.Convert(&in.Image, &out.Image, 0); err != nil { + return err } + out.Tag = in.Tag return nil } -func convert_api_OAuthClientList_To_v1beta3_OAuthClientList(in *oauthapi.OAuthClientList, out *oauthapiv1beta3.OAuthClientList, s conversion.Scope) error { - return autoconvert_api_OAuthClientList_To_v1beta3_OAuthClientList(in, out, s) -} - -func autoconvert_v1beta3_OAuthAccessToken_To_api_OAuthAccessToken(in *oauthapiv1beta3.OAuthAccessToken, out *oauthapi.OAuthAccessToken, s conversion.Scope) error { +func autoconvert_api_ImageStreamSpec_To_v1beta3_ImageStreamSpec(in *imageapi.ImageStreamSpec, out *imageapiv1beta3.ImageStreamSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapiv1beta3.OAuthAccessToken))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + defaulting.(func(*imageapi.ImageStreamSpec))(in) } - if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + out.DockerImageRepository = in.DockerImageRepository + if err := s.Convert(&in.Tags, &out.Tags, 0); err != nil { return err } - out.ClientName = in.ClientName - out.ExpiresIn = in.ExpiresIn - if in.Scopes != nil { - out.Scopes = make([]string, len(in.Scopes)) - for i := range in.Scopes { - out.Scopes[i] = in.Scopes[i] - } - } else { - out.Scopes = nil + return nil +} + +func autoconvert_api_ImageStreamStatus_To_v1beta3_ImageStreamStatus(in *imageapi.ImageStreamStatus, out *imageapiv1beta3.ImageStreamStatus, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*imageapi.ImageStreamStatus))(in) + } + out.DockerImageRepository = in.DockerImageRepository + if err := s.Convert(&in.Tags, &out.Tags, 0); err != nil { + return err } - out.RedirectURI = in.RedirectURI - out.UserName = in.UserName - out.UserUID = in.UserUID - out.AuthorizeToken = in.AuthorizeToken - out.RefreshToken = in.RefreshToken return nil } -func convert_v1beta3_OAuthAccessToken_To_api_OAuthAccessToken(in *oauthapiv1beta3.OAuthAccessToken, out *oauthapi.OAuthAccessToken, s conversion.Scope) error { - return autoconvert_v1beta3_OAuthAccessToken_To_api_OAuthAccessToken(in, out, s) +func autoconvert_api_ImageStreamTag_To_v1beta3_ImageStreamTag(in *imageapi.ImageStreamTag, out *imageapiv1beta3.ImageStreamTag, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*imageapi.ImageStreamTag))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if err := s.Convert(&in.Image, &out.Image, 0); err != nil { + return err + } + return nil } -func autoconvert_v1beta3_OAuthAccessTokenList_To_api_OAuthAccessTokenList(in *oauthapiv1beta3.OAuthAccessTokenList, out *oauthapi.OAuthAccessTokenList, s conversion.Scope) error { +func autoconvert_api_ImageStreamTagList_To_v1beta3_ImageStreamTagList(in *imageapi.ImageStreamTagList, out *imageapiv1beta3.ImageStreamTagList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapiv1beta3.OAuthAccessTokenList))(in) + defaulting.(func(*imageapi.ImageStreamTagList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3431,9 +3732,9 @@ func autoconvert_v1beta3_OAuthAccessTokenList_To_api_OAuthAccessTokenList(in *oa return err } if in.Items != nil { - out.Items = make([]oauthapi.OAuthAccessToken, len(in.Items)) + out.Items = make([]imageapiv1beta3.ImageStreamTag, len(in.Items)) for i := range in.Items { - if err := convert_v1beta3_OAuthAccessToken_To_api_OAuthAccessToken(&in.Items[i], &out.Items[i], s); err != nil { + if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { return err } } @@ -3443,13 +3744,13 @@ func autoconvert_v1beta3_OAuthAccessTokenList_To_api_OAuthAccessTokenList(in *oa return nil } -func convert_v1beta3_OAuthAccessTokenList_To_api_OAuthAccessTokenList(in *oauthapiv1beta3.OAuthAccessTokenList, out *oauthapi.OAuthAccessTokenList, s conversion.Scope) error { - return autoconvert_v1beta3_OAuthAccessTokenList_To_api_OAuthAccessTokenList(in, out, s) +func convert_api_ImageStreamTagList_To_v1beta3_ImageStreamTagList(in *imageapi.ImageStreamTagList, out *imageapiv1beta3.ImageStreamTagList, s conversion.Scope) error { + return autoconvert_api_ImageStreamTagList_To_v1beta3_ImageStreamTagList(in, out, s) } -func autoconvert_v1beta3_OAuthAuthorizeToken_To_api_OAuthAuthorizeToken(in *oauthapiv1beta3.OAuthAuthorizeToken, out *oauthapi.OAuthAuthorizeToken, s conversion.Scope) error { +func autoconvert_v1beta3_Image_To_api_Image(in *imageapiv1beta3.Image, out *imageapi.Image, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapiv1beta3.OAuthAuthorizeToken))(in) + defaulting.(func(*imageapiv1beta3.Image))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3457,30 +3758,18 @@ func autoconvert_v1beta3_OAuthAuthorizeToken_To_api_OAuthAuthorizeToken(in *oaut if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.ClientName = in.ClientName - out.ExpiresIn = in.ExpiresIn - if in.Scopes != nil { - out.Scopes = make([]string, len(in.Scopes)) - for i := range in.Scopes { - out.Scopes[i] = in.Scopes[i] - } - } else { - out.Scopes = nil + out.DockerImageReference = in.DockerImageReference + if err := s.Convert(&in.DockerImageMetadata, &out.DockerImageMetadata, 0); err != nil { + return err } - out.RedirectURI = in.RedirectURI - out.State = in.State - out.UserName = in.UserName - out.UserUID = in.UserUID + out.DockerImageMetadataVersion = in.DockerImageMetadataVersion + out.DockerImageManifest = in.DockerImageManifest return nil } -func convert_v1beta3_OAuthAuthorizeToken_To_api_OAuthAuthorizeToken(in *oauthapiv1beta3.OAuthAuthorizeToken, out *oauthapi.OAuthAuthorizeToken, s conversion.Scope) error { - return autoconvert_v1beta3_OAuthAuthorizeToken_To_api_OAuthAuthorizeToken(in, out, s) -} - -func autoconvert_v1beta3_OAuthAuthorizeTokenList_To_api_OAuthAuthorizeTokenList(in *oauthapiv1beta3.OAuthAuthorizeTokenList, out *oauthapi.OAuthAuthorizeTokenList, s conversion.Scope) error { +func autoconvert_v1beta3_ImageList_To_api_ImageList(in *imageapiv1beta3.ImageList, out *imageapi.ImageList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapiv1beta3.OAuthAuthorizeTokenList))(in) + defaulting.(func(*imageapiv1beta3.ImageList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3489,9 +3778,9 @@ func autoconvert_v1beta3_OAuthAuthorizeTokenList_To_api_OAuthAuthorizeTokenList( return err } if in.Items != nil { - out.Items = make([]oauthapi.OAuthAuthorizeToken, len(in.Items)) + out.Items = make([]imageapi.Image, len(in.Items)) for i := range in.Items { - if err := convert_v1beta3_OAuthAuthorizeToken_To_api_OAuthAuthorizeToken(&in.Items[i], &out.Items[i], s); err != nil { + if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { return err } } @@ -3501,13 +3790,13 @@ func autoconvert_v1beta3_OAuthAuthorizeTokenList_To_api_OAuthAuthorizeTokenList( return nil } -func convert_v1beta3_OAuthAuthorizeTokenList_To_api_OAuthAuthorizeTokenList(in *oauthapiv1beta3.OAuthAuthorizeTokenList, out *oauthapi.OAuthAuthorizeTokenList, s conversion.Scope) error { - return autoconvert_v1beta3_OAuthAuthorizeTokenList_To_api_OAuthAuthorizeTokenList(in, out, s) +func convert_v1beta3_ImageList_To_api_ImageList(in *imageapiv1beta3.ImageList, out *imageapi.ImageList, s conversion.Scope) error { + return autoconvert_v1beta3_ImageList_To_api_ImageList(in, out, s) } -func autoconvert_v1beta3_OAuthClient_To_api_OAuthClient(in *oauthapiv1beta3.OAuthClient, out *oauthapi.OAuthClient, s conversion.Scope) error { +func autoconvert_v1beta3_ImageStream_To_api_ImageStream(in *imageapiv1beta3.ImageStream, out *imageapi.ImageStream, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapiv1beta3.OAuthClient))(in) + defaulting.(func(*imageapiv1beta3.ImageStream))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3515,81 +3804,106 @@ func autoconvert_v1beta3_OAuthClient_To_api_OAuthClient(in *oauthapiv1beta3.OAut if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.Secret = in.Secret - out.RespondWithChallenges = in.RespondWithChallenges - if in.RedirectURIs != nil { - out.RedirectURIs = make([]string, len(in.RedirectURIs)) - for i := range in.RedirectURIs { - out.RedirectURIs[i] = in.RedirectURIs[i] - } - } else { - out.RedirectURIs = nil + if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil { + return err + } + if err := s.Convert(&in.Status, &out.Status, 0); err != nil { + return err } return nil } -func convert_v1beta3_OAuthClient_To_api_OAuthClient(in *oauthapiv1beta3.OAuthClient, out *oauthapi.OAuthClient, s conversion.Scope) error { - return autoconvert_v1beta3_OAuthClient_To_api_OAuthClient(in, out, s) +func autoconvert_v1beta3_ImageStreamImage_To_api_ImageStreamImage(in *imageapiv1beta3.ImageStreamImage, out *imageapi.ImageStreamImage, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*imageapiv1beta3.ImageStreamImage))(in) + } + if err := s.Convert(&in.Image, &out.Image, 0); err != nil { + return err + } + // in.ImageName has no peer in out + return nil } -func autoconvert_v1beta3_OAuthClientAuthorization_To_api_OAuthClientAuthorization(in *oauthapiv1beta3.OAuthClientAuthorization, out *oauthapi.OAuthClientAuthorization, s conversion.Scope) error { +func autoconvert_v1beta3_ImageStreamList_To_api_ImageStreamList(in *imageapiv1beta3.ImageStreamList, out *imageapi.ImageStreamList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapiv1beta3.OAuthClientAuthorization))(in) + defaulting.(func(*imageapiv1beta3.ImageStreamList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { return err } - out.ClientName = in.ClientName - out.UserName = in.UserName - out.UserUID = in.UserUID - if in.Scopes != nil { - out.Scopes = make([]string, len(in.Scopes)) - for i := range in.Scopes { - out.Scopes[i] = in.Scopes[i] + if in.Items != nil { + out.Items = make([]imageapi.ImageStream, len(in.Items)) + for i := range in.Items { + if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { + return err + } } } else { - out.Scopes = nil + out.Items = nil } return nil } -func convert_v1beta3_OAuthClientAuthorization_To_api_OAuthClientAuthorization(in *oauthapiv1beta3.OAuthClientAuthorization, out *oauthapi.OAuthClientAuthorization, s conversion.Scope) error { - return autoconvert_v1beta3_OAuthClientAuthorization_To_api_OAuthClientAuthorization(in, out, s) +func convert_v1beta3_ImageStreamList_To_api_ImageStreamList(in *imageapiv1beta3.ImageStreamList, out *imageapi.ImageStreamList, s conversion.Scope) error { + return autoconvert_v1beta3_ImageStreamList_To_api_ImageStreamList(in, out, s) } -func autoconvert_v1beta3_OAuthClientAuthorizationList_To_api_OAuthClientAuthorizationList(in *oauthapiv1beta3.OAuthClientAuthorizationList, out *oauthapi.OAuthClientAuthorizationList, s conversion.Scope) error { +func autoconvert_v1beta3_ImageStreamMapping_To_api_ImageStreamMapping(in *imageapiv1beta3.ImageStreamMapping, out *imageapi.ImageStreamMapping, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapiv1beta3.OAuthClientAuthorizationList))(in) + defaulting.(func(*imageapiv1beta3.ImageStreamMapping))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if in.Items != nil { - out.Items = make([]oauthapi.OAuthClientAuthorization, len(in.Items)) - for i := range in.Items { - if err := convert_v1beta3_OAuthClientAuthorization_To_api_OAuthClientAuthorization(&in.Items[i], &out.Items[i], s); err != nil { - return err - } - } - } else { - out.Items = nil + if err := s.Convert(&in.Image, &out.Image, 0); err != nil { + return err } + out.Tag = in.Tag return nil } -func convert_v1beta3_OAuthClientAuthorizationList_To_api_OAuthClientAuthorizationList(in *oauthapiv1beta3.OAuthClientAuthorizationList, out *oauthapi.OAuthClientAuthorizationList, s conversion.Scope) error { - return autoconvert_v1beta3_OAuthClientAuthorizationList_To_api_OAuthClientAuthorizationList(in, out, s) +func autoconvert_v1beta3_ImageStreamSpec_To_api_ImageStreamSpec(in *imageapiv1beta3.ImageStreamSpec, out *imageapi.ImageStreamSpec, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*imageapiv1beta3.ImageStreamSpec))(in) + } + out.DockerImageRepository = in.DockerImageRepository + if err := s.Convert(&in.Tags, &out.Tags, 0); err != nil { + return err + } + return nil } -func autoconvert_v1beta3_OAuthClientList_To_api_OAuthClientList(in *oauthapiv1beta3.OAuthClientList, out *oauthapi.OAuthClientList, s conversion.Scope) error { +func autoconvert_v1beta3_ImageStreamStatus_To_api_ImageStreamStatus(in *imageapiv1beta3.ImageStreamStatus, out *imageapi.ImageStreamStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*oauthapiv1beta3.OAuthClientList))(in) + defaulting.(func(*imageapiv1beta3.ImageStreamStatus))(in) + } + out.DockerImageRepository = in.DockerImageRepository + if err := s.Convert(&in.Tags, &out.Tags, 0); err != nil { + return err + } + return nil +} + +func autoconvert_v1beta3_ImageStreamTag_To_api_ImageStreamTag(in *imageapiv1beta3.ImageStreamTag, out *imageapi.ImageStreamTag, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*imageapiv1beta3.ImageStreamTag))(in) + } + if err := s.Convert(&in.Image, &out.Image, 0); err != nil { + return err + } + // in.ImageName has no peer in out + return nil +} + +func autoconvert_v1beta3_ImageStreamTagList_To_api_ImageStreamTagList(in *imageapiv1beta3.ImageStreamTagList, out *imageapi.ImageStreamTagList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*imageapiv1beta3.ImageStreamTagList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3598,9 +3912,9 @@ func autoconvert_v1beta3_OAuthClientList_To_api_OAuthClientList(in *oauthapiv1be return err } if in.Items != nil { - out.Items = make([]oauthapi.OAuthClient, len(in.Items)) + out.Items = make([]imageapi.ImageStreamTag, len(in.Items)) for i := range in.Items { - if err := convert_v1beta3_OAuthClient_To_api_OAuthClient(&in.Items[i], &out.Items[i], s); err != nil { + if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { return err } } @@ -3610,13 +3924,13 @@ func autoconvert_v1beta3_OAuthClientList_To_api_OAuthClientList(in *oauthapiv1be return nil } -func convert_v1beta3_OAuthClientList_To_api_OAuthClientList(in *oauthapiv1beta3.OAuthClientList, out *oauthapi.OAuthClientList, s conversion.Scope) error { - return autoconvert_v1beta3_OAuthClientList_To_api_OAuthClientList(in, out, s) +func convert_v1beta3_ImageStreamTagList_To_api_ImageStreamTagList(in *imageapiv1beta3.ImageStreamTagList, out *imageapi.ImageStreamTagList, s conversion.Scope) error { + return autoconvert_v1beta3_ImageStreamTagList_To_api_ImageStreamTagList(in, out, s) } -func autoconvert_api_Project_To_v1beta3_Project(in *projectapi.Project, out *projectapiv1beta3.Project, s conversion.Scope) error { +func autoconvert_api_OAuthAccessToken_To_v1beta3_OAuthAccessToken(in *oauthapi.OAuthAccessToken, out *oauthapiv1beta3.OAuthAccessToken, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapi.Project))(in) + defaulting.(func(*oauthapi.OAuthAccessToken))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3624,22 +3938,31 @@ func autoconvert_api_Project_To_v1beta3_Project(in *projectapi.Project, out *pro if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_api_ProjectSpec_To_v1beta3_ProjectSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := convert_api_ProjectStatus_To_v1beta3_ProjectStatus(&in.Status, &out.Status, s); err != nil { - return err + out.ClientName = in.ClientName + out.ExpiresIn = in.ExpiresIn + if in.Scopes != nil { + out.Scopes = make([]string, len(in.Scopes)) + for i := range in.Scopes { + out.Scopes[i] = in.Scopes[i] + } + } else { + out.Scopes = nil } + out.RedirectURI = in.RedirectURI + out.UserName = in.UserName + out.UserUID = in.UserUID + out.AuthorizeToken = in.AuthorizeToken + out.RefreshToken = in.RefreshToken return nil } -func convert_api_Project_To_v1beta3_Project(in *projectapi.Project, out *projectapiv1beta3.Project, s conversion.Scope) error { - return autoconvert_api_Project_To_v1beta3_Project(in, out, s) +func convert_api_OAuthAccessToken_To_v1beta3_OAuthAccessToken(in *oauthapi.OAuthAccessToken, out *oauthapiv1beta3.OAuthAccessToken, s conversion.Scope) error { + return autoconvert_api_OAuthAccessToken_To_v1beta3_OAuthAccessToken(in, out, s) } -func autoconvert_api_ProjectList_To_v1beta3_ProjectList(in *projectapi.ProjectList, out *projectapiv1beta3.ProjectList, s conversion.Scope) error { +func autoconvert_api_OAuthAccessTokenList_To_v1beta3_OAuthAccessTokenList(in *oauthapi.OAuthAccessTokenList, out *oauthapiv1beta3.OAuthAccessTokenList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapi.ProjectList))(in) + defaulting.(func(*oauthapi.OAuthAccessTokenList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3648,9 +3971,9 @@ func autoconvert_api_ProjectList_To_v1beta3_ProjectList(in *projectapi.ProjectLi return err } if in.Items != nil { - out.Items = make([]projectapiv1beta3.Project, len(in.Items)) + out.Items = make([]oauthapiv1beta3.OAuthAccessToken, len(in.Items)) for i := range in.Items { - if err := convert_api_Project_To_v1beta3_Project(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_api_OAuthAccessToken_To_v1beta3_OAuthAccessToken(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3660,13 +3983,13 @@ func autoconvert_api_ProjectList_To_v1beta3_ProjectList(in *projectapi.ProjectLi return nil } -func convert_api_ProjectList_To_v1beta3_ProjectList(in *projectapi.ProjectList, out *projectapiv1beta3.ProjectList, s conversion.Scope) error { - return autoconvert_api_ProjectList_To_v1beta3_ProjectList(in, out, s) +func convert_api_OAuthAccessTokenList_To_v1beta3_OAuthAccessTokenList(in *oauthapi.OAuthAccessTokenList, out *oauthapiv1beta3.OAuthAccessTokenList, s conversion.Scope) error { + return autoconvert_api_OAuthAccessTokenList_To_v1beta3_OAuthAccessTokenList(in, out, s) } -func autoconvert_api_ProjectRequest_To_v1beta3_ProjectRequest(in *projectapi.ProjectRequest, out *projectapiv1beta3.ProjectRequest, s conversion.Scope) error { +func autoconvert_api_OAuthAuthorizeToken_To_v1beta3_OAuthAuthorizeToken(in *oauthapi.OAuthAuthorizeToken, out *oauthapiv1beta3.OAuthAuthorizeToken, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapi.ProjectRequest))(in) + defaulting.(func(*oauthapi.OAuthAuthorizeToken))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3674,72 +3997,112 @@ func autoconvert_api_ProjectRequest_To_v1beta3_ProjectRequest(in *projectapi.Pro if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.DisplayName = in.DisplayName - out.Description = in.Description - return nil -} - -func convert_api_ProjectRequest_To_v1beta3_ProjectRequest(in *projectapi.ProjectRequest, out *projectapiv1beta3.ProjectRequest, s conversion.Scope) error { - return autoconvert_api_ProjectRequest_To_v1beta3_ProjectRequest(in, out, s) + out.ClientName = in.ClientName + out.ExpiresIn = in.ExpiresIn + if in.Scopes != nil { + out.Scopes = make([]string, len(in.Scopes)) + for i := range in.Scopes { + out.Scopes[i] = in.Scopes[i] + } + } else { + out.Scopes = nil + } + out.RedirectURI = in.RedirectURI + out.State = in.State + out.UserName = in.UserName + out.UserUID = in.UserUID + return nil } -func autoconvert_api_ProjectSpec_To_v1beta3_ProjectSpec(in *projectapi.ProjectSpec, out *projectapiv1beta3.ProjectSpec, s conversion.Scope) error { +func convert_api_OAuthAuthorizeToken_To_v1beta3_OAuthAuthorizeToken(in *oauthapi.OAuthAuthorizeToken, out *oauthapiv1beta3.OAuthAuthorizeToken, s conversion.Scope) error { + return autoconvert_api_OAuthAuthorizeToken_To_v1beta3_OAuthAuthorizeToken(in, out, s) +} + +func autoconvert_api_OAuthAuthorizeTokenList_To_v1beta3_OAuthAuthorizeTokenList(in *oauthapi.OAuthAuthorizeTokenList, out *oauthapiv1beta3.OAuthAuthorizeTokenList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapi.ProjectSpec))(in) + defaulting.(func(*oauthapi.OAuthAuthorizeTokenList))(in) } - if in.Finalizers != nil { - out.Finalizers = make([]pkgapiv1beta3.FinalizerName, len(in.Finalizers)) - for i := range in.Finalizers { - out.Finalizers[i] = pkgapiv1beta3.FinalizerName(in.Finalizers[i]) + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]oauthapiv1beta3.OAuthAuthorizeToken, len(in.Items)) + for i := range in.Items { + if err := convert_api_OAuthAuthorizeToken_To_v1beta3_OAuthAuthorizeToken(&in.Items[i], &out.Items[i], s); err != nil { + return err + } } } else { - out.Finalizers = nil + out.Items = nil } return nil } -func convert_api_ProjectSpec_To_v1beta3_ProjectSpec(in *projectapi.ProjectSpec, out *projectapiv1beta3.ProjectSpec, s conversion.Scope) error { - return autoconvert_api_ProjectSpec_To_v1beta3_ProjectSpec(in, out, s) +func convert_api_OAuthAuthorizeTokenList_To_v1beta3_OAuthAuthorizeTokenList(in *oauthapi.OAuthAuthorizeTokenList, out *oauthapiv1beta3.OAuthAuthorizeTokenList, s conversion.Scope) error { + return autoconvert_api_OAuthAuthorizeTokenList_To_v1beta3_OAuthAuthorizeTokenList(in, out, s) } -func autoconvert_api_ProjectStatus_To_v1beta3_ProjectStatus(in *projectapi.ProjectStatus, out *projectapiv1beta3.ProjectStatus, s conversion.Scope) error { +func autoconvert_api_OAuthClient_To_v1beta3_OAuthClient(in *oauthapi.OAuthClient, out *oauthapiv1beta3.OAuthClient, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapi.ProjectStatus))(in) + defaulting.(func(*oauthapi.OAuthClient))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + out.Secret = in.Secret + out.RespondWithChallenges = in.RespondWithChallenges + if in.RedirectURIs != nil { + out.RedirectURIs = make([]string, len(in.RedirectURIs)) + for i := range in.RedirectURIs { + out.RedirectURIs[i] = in.RedirectURIs[i] + } + } else { + out.RedirectURIs = nil } - out.Phase = pkgapiv1beta3.NamespacePhase(in.Phase) return nil } -func convert_api_ProjectStatus_To_v1beta3_ProjectStatus(in *projectapi.ProjectStatus, out *projectapiv1beta3.ProjectStatus, s conversion.Scope) error { - return autoconvert_api_ProjectStatus_To_v1beta3_ProjectStatus(in, out, s) +func convert_api_OAuthClient_To_v1beta3_OAuthClient(in *oauthapi.OAuthClient, out *oauthapiv1beta3.OAuthClient, s conversion.Scope) error { + return autoconvert_api_OAuthClient_To_v1beta3_OAuthClient(in, out, s) } -func autoconvert_v1beta3_Project_To_api_Project(in *projectapiv1beta3.Project, out *projectapi.Project, s conversion.Scope) error { +func autoconvert_api_OAuthClientAuthorization_To_v1beta3_OAuthClientAuthorization(in *oauthapi.OAuthClientAuthorization, out *oauthapiv1beta3.OAuthClientAuthorization, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapiv1beta3.Project))(in) + defaulting.(func(*oauthapi.OAuthClientAuthorization))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - if err := convert_v1beta3_ProjectSpec_To_api_ProjectSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_v1beta3_ProjectStatus_To_api_ProjectStatus(&in.Status, &out.Status, s); err != nil { - return err + out.ClientName = in.ClientName + out.UserName = in.UserName + out.UserUID = in.UserUID + if in.Scopes != nil { + out.Scopes = make([]string, len(in.Scopes)) + for i := range in.Scopes { + out.Scopes[i] = in.Scopes[i] + } + } else { + out.Scopes = nil } return nil } -func convert_v1beta3_Project_To_api_Project(in *projectapiv1beta3.Project, out *projectapi.Project, s conversion.Scope) error { - return autoconvert_v1beta3_Project_To_api_Project(in, out, s) +func convert_api_OAuthClientAuthorization_To_v1beta3_OAuthClientAuthorization(in *oauthapi.OAuthClientAuthorization, out *oauthapiv1beta3.OAuthClientAuthorization, s conversion.Scope) error { + return autoconvert_api_OAuthClientAuthorization_To_v1beta3_OAuthClientAuthorization(in, out, s) } -func autoconvert_v1beta3_ProjectList_To_api_ProjectList(in *projectapiv1beta3.ProjectList, out *projectapi.ProjectList, s conversion.Scope) error { +func autoconvert_api_OAuthClientAuthorizationList_To_v1beta3_OAuthClientAuthorizationList(in *oauthapi.OAuthClientAuthorizationList, out *oauthapiv1beta3.OAuthClientAuthorizationList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapiv1beta3.ProjectList))(in) + defaulting.(func(*oauthapi.OAuthClientAuthorizationList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3748,9 +4111,9 @@ func autoconvert_v1beta3_ProjectList_To_api_ProjectList(in *projectapiv1beta3.Pr return err } if in.Items != nil { - out.Items = make([]projectapi.Project, len(in.Items)) + out.Items = make([]oauthapiv1beta3.OAuthClientAuthorization, len(in.Items)) for i := range in.Items { - if err := convert_v1beta3_Project_To_api_Project(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_api_OAuthClientAuthorization_To_v1beta3_OAuthClientAuthorization(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3760,86 +4123,130 @@ func autoconvert_v1beta3_ProjectList_To_api_ProjectList(in *projectapiv1beta3.Pr return nil } -func convert_v1beta3_ProjectList_To_api_ProjectList(in *projectapiv1beta3.ProjectList, out *projectapi.ProjectList, s conversion.Scope) error { - return autoconvert_v1beta3_ProjectList_To_api_ProjectList(in, out, s) +func convert_api_OAuthClientAuthorizationList_To_v1beta3_OAuthClientAuthorizationList(in *oauthapi.OAuthClientAuthorizationList, out *oauthapiv1beta3.OAuthClientAuthorizationList, s conversion.Scope) error { + return autoconvert_api_OAuthClientAuthorizationList_To_v1beta3_OAuthClientAuthorizationList(in, out, s) } -func autoconvert_v1beta3_ProjectRequest_To_api_ProjectRequest(in *projectapiv1beta3.ProjectRequest, out *projectapi.ProjectRequest, s conversion.Scope) error { +func autoconvert_api_OAuthClientList_To_v1beta3_OAuthClientList(in *oauthapi.OAuthClientList, out *oauthapiv1beta3.OAuthClientList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapiv1beta3.ProjectRequest))(in) + defaulting.(func(*oauthapi.OAuthClientList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { return err } - out.DisplayName = in.DisplayName - out.Description = in.Description + if in.Items != nil { + out.Items = make([]oauthapiv1beta3.OAuthClient, len(in.Items)) + for i := range in.Items { + if err := convert_api_OAuthClient_To_v1beta3_OAuthClient(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } return nil } -func convert_v1beta3_ProjectRequest_To_api_ProjectRequest(in *projectapiv1beta3.ProjectRequest, out *projectapi.ProjectRequest, s conversion.Scope) error { - return autoconvert_v1beta3_ProjectRequest_To_api_ProjectRequest(in, out, s) +func convert_api_OAuthClientList_To_v1beta3_OAuthClientList(in *oauthapi.OAuthClientList, out *oauthapiv1beta3.OAuthClientList, s conversion.Scope) error { + return autoconvert_api_OAuthClientList_To_v1beta3_OAuthClientList(in, out, s) } -func autoconvert_v1beta3_ProjectSpec_To_api_ProjectSpec(in *projectapiv1beta3.ProjectSpec, out *projectapi.ProjectSpec, s conversion.Scope) error { +func autoconvert_v1beta3_OAuthAccessToken_To_api_OAuthAccessToken(in *oauthapiv1beta3.OAuthAccessToken, out *oauthapi.OAuthAccessToken, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapiv1beta3.ProjectSpec))(in) + defaulting.(func(*oauthapiv1beta3.OAuthAccessToken))(in) } - if in.Finalizers != nil { - out.Finalizers = make([]pkgapi.FinalizerName, len(in.Finalizers)) - for i := range in.Finalizers { - out.Finalizers[i] = pkgapi.FinalizerName(in.Finalizers[i]) + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + out.ClientName = in.ClientName + out.ExpiresIn = in.ExpiresIn + if in.Scopes != nil { + out.Scopes = make([]string, len(in.Scopes)) + for i := range in.Scopes { + out.Scopes[i] = in.Scopes[i] } } else { - out.Finalizers = nil + out.Scopes = nil } + out.RedirectURI = in.RedirectURI + out.UserName = in.UserName + out.UserUID = in.UserUID + out.AuthorizeToken = in.AuthorizeToken + out.RefreshToken = in.RefreshToken return nil } -func convert_v1beta3_ProjectSpec_To_api_ProjectSpec(in *projectapiv1beta3.ProjectSpec, out *projectapi.ProjectSpec, s conversion.Scope) error { - return autoconvert_v1beta3_ProjectSpec_To_api_ProjectSpec(in, out, s) +func convert_v1beta3_OAuthAccessToken_To_api_OAuthAccessToken(in *oauthapiv1beta3.OAuthAccessToken, out *oauthapi.OAuthAccessToken, s conversion.Scope) error { + return autoconvert_v1beta3_OAuthAccessToken_To_api_OAuthAccessToken(in, out, s) } -func autoconvert_v1beta3_ProjectStatus_To_api_ProjectStatus(in *projectapiv1beta3.ProjectStatus, out *projectapi.ProjectStatus, s conversion.Scope) error { +func autoconvert_v1beta3_OAuthAccessTokenList_To_api_OAuthAccessTokenList(in *oauthapiv1beta3.OAuthAccessTokenList, out *oauthapi.OAuthAccessTokenList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*projectapiv1beta3.ProjectStatus))(in) + defaulting.(func(*oauthapiv1beta3.OAuthAccessTokenList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]oauthapi.OAuthAccessToken, len(in.Items)) + for i := range in.Items { + if err := convert_v1beta3_OAuthAccessToken_To_api_OAuthAccessToken(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil } - out.Phase = pkgapi.NamespacePhase(in.Phase) return nil } -func convert_v1beta3_ProjectStatus_To_api_ProjectStatus(in *projectapiv1beta3.ProjectStatus, out *projectapi.ProjectStatus, s conversion.Scope) error { - return autoconvert_v1beta3_ProjectStatus_To_api_ProjectStatus(in, out, s) +func convert_v1beta3_OAuthAccessTokenList_To_api_OAuthAccessTokenList(in *oauthapiv1beta3.OAuthAccessTokenList, out *oauthapi.OAuthAccessTokenList, s conversion.Scope) error { + return autoconvert_v1beta3_OAuthAccessTokenList_To_api_OAuthAccessTokenList(in, out, s) } -func autoconvert_api_Route_To_v1beta3_Route(in *routeapi.Route, out *routeapiv1beta3.Route, s conversion.Scope) error { +func autoconvert_v1beta3_OAuthAuthorizeToken_To_api_OAuthAuthorizeToken(in *oauthapiv1beta3.OAuthAuthorizeToken, out *oauthapi.OAuthAuthorizeToken, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapi.Route))(in) + defaulting.(func(*oauthapiv1beta3.OAuthAuthorizeToken))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - if err := convert_api_RouteSpec_To_v1beta3_RouteSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_api_RouteStatus_To_v1beta3_RouteStatus(&in.Status, &out.Status, s); err != nil { - return err + out.ClientName = in.ClientName + out.ExpiresIn = in.ExpiresIn + if in.Scopes != nil { + out.Scopes = make([]string, len(in.Scopes)) + for i := range in.Scopes { + out.Scopes[i] = in.Scopes[i] + } + } else { + out.Scopes = nil } + out.RedirectURI = in.RedirectURI + out.State = in.State + out.UserName = in.UserName + out.UserUID = in.UserUID return nil } -func convert_api_Route_To_v1beta3_Route(in *routeapi.Route, out *routeapiv1beta3.Route, s conversion.Scope) error { - return autoconvert_api_Route_To_v1beta3_Route(in, out, s) +func convert_v1beta3_OAuthAuthorizeToken_To_api_OAuthAuthorizeToken(in *oauthapiv1beta3.OAuthAuthorizeToken, out *oauthapi.OAuthAuthorizeToken, s conversion.Scope) error { + return autoconvert_v1beta3_OAuthAuthorizeToken_To_api_OAuthAuthorizeToken(in, out, s) } -func autoconvert_api_RouteList_To_v1beta3_RouteList(in *routeapi.RouteList, out *routeapiv1beta3.RouteList, s conversion.Scope) error { +func autoconvert_v1beta3_OAuthAuthorizeTokenList_To_api_OAuthAuthorizeTokenList(in *oauthapiv1beta3.OAuthAuthorizeTokenList, out *oauthapi.OAuthAuthorizeTokenList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapi.RouteList))(in) + defaulting.(func(*oauthapiv1beta3.OAuthAuthorizeTokenList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3848,9 +4255,9 @@ func autoconvert_api_RouteList_To_v1beta3_RouteList(in *routeapi.RouteList, out return err } if in.Items != nil { - out.Items = make([]routeapiv1beta3.Route, len(in.Items)) + out.Items = make([]oauthapi.OAuthAuthorizeToken, len(in.Items)) for i := range in.Items { - if err := convert_api_Route_To_v1beta3_Route(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1beta3_OAuthAuthorizeToken_To_api_OAuthAuthorizeToken(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3860,110 +4267,145 @@ func autoconvert_api_RouteList_To_v1beta3_RouteList(in *routeapi.RouteList, out return nil } -func convert_api_RouteList_To_v1beta3_RouteList(in *routeapi.RouteList, out *routeapiv1beta3.RouteList, s conversion.Scope) error { - return autoconvert_api_RouteList_To_v1beta3_RouteList(in, out, s) +func convert_v1beta3_OAuthAuthorizeTokenList_To_api_OAuthAuthorizeTokenList(in *oauthapiv1beta3.OAuthAuthorizeTokenList, out *oauthapi.OAuthAuthorizeTokenList, s conversion.Scope) error { + return autoconvert_v1beta3_OAuthAuthorizeTokenList_To_api_OAuthAuthorizeTokenList(in, out, s) } -func autoconvert_api_RoutePort_To_v1beta3_RoutePort(in *routeapi.RoutePort, out *routeapiv1beta3.RoutePort, s conversion.Scope) error { +func autoconvert_v1beta3_OAuthClient_To_api_OAuthClient(in *oauthapiv1beta3.OAuthClient, out *oauthapi.OAuthClient, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapi.RoutePort))(in) + defaulting.(func(*oauthapiv1beta3.OAuthClient))(in) } - if err := s.Convert(&in.TargetPort, &out.TargetPort, 0); err != nil { + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } + out.Secret = in.Secret + out.RespondWithChallenges = in.RespondWithChallenges + if in.RedirectURIs != nil { + out.RedirectURIs = make([]string, len(in.RedirectURIs)) + for i := range in.RedirectURIs { + out.RedirectURIs[i] = in.RedirectURIs[i] + } + } else { + out.RedirectURIs = nil + } return nil } -func convert_api_RoutePort_To_v1beta3_RoutePort(in *routeapi.RoutePort, out *routeapiv1beta3.RoutePort, s conversion.Scope) error { - return autoconvert_api_RoutePort_To_v1beta3_RoutePort(in, out, s) +func convert_v1beta3_OAuthClient_To_api_OAuthClient(in *oauthapiv1beta3.OAuthClient, out *oauthapi.OAuthClient, s conversion.Scope) error { + return autoconvert_v1beta3_OAuthClient_To_api_OAuthClient(in, out, s) } -func autoconvert_api_RouteSpec_To_v1beta3_RouteSpec(in *routeapi.RouteSpec, out *routeapiv1beta3.RouteSpec, s conversion.Scope) error { +func autoconvert_v1beta3_OAuthClientAuthorization_To_api_OAuthClientAuthorization(in *oauthapiv1beta3.OAuthClientAuthorization, out *oauthapi.OAuthClientAuthorization, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapi.RouteSpec))(in) + defaulting.(func(*oauthapiv1beta3.OAuthClientAuthorization))(in) } - out.Host = in.Host - out.Path = in.Path - if err := convert_api_ObjectReference_To_v1beta3_ObjectReference(&in.To, &out.To, s); err != nil { + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if in.Port != nil { - out.Port = new(routeapiv1beta3.RoutePort) - if err := convert_api_RoutePort_To_v1beta3_RoutePort(in.Port, out.Port, s); err != nil { - return err - } - } else { - out.Port = nil + if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err } - if in.TLS != nil { - out.TLS = new(routeapiv1beta3.TLSConfig) - if err := convert_api_TLSConfig_To_v1beta3_TLSConfig(in.TLS, out.TLS, s); err != nil { - return err + out.ClientName = in.ClientName + out.UserName = in.UserName + out.UserUID = in.UserUID + if in.Scopes != nil { + out.Scopes = make([]string, len(in.Scopes)) + for i := range in.Scopes { + out.Scopes[i] = in.Scopes[i] } } else { - out.TLS = nil + out.Scopes = nil } return nil } -func convert_api_RouteSpec_To_v1beta3_RouteSpec(in *routeapi.RouteSpec, out *routeapiv1beta3.RouteSpec, s conversion.Scope) error { - return autoconvert_api_RouteSpec_To_v1beta3_RouteSpec(in, out, s) +func convert_v1beta3_OAuthClientAuthorization_To_api_OAuthClientAuthorization(in *oauthapiv1beta3.OAuthClientAuthorization, out *oauthapi.OAuthClientAuthorization, s conversion.Scope) error { + return autoconvert_v1beta3_OAuthClientAuthorization_To_api_OAuthClientAuthorization(in, out, s) } -func autoconvert_api_RouteStatus_To_v1beta3_RouteStatus(in *routeapi.RouteStatus, out *routeapiv1beta3.RouteStatus, s conversion.Scope) error { +func autoconvert_v1beta3_OAuthClientAuthorizationList_To_api_OAuthClientAuthorizationList(in *oauthapiv1beta3.OAuthClientAuthorizationList, out *oauthapi.OAuthClientAuthorizationList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapi.RouteStatus))(in) + defaulting.(func(*oauthapiv1beta3.OAuthClientAuthorizationList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]oauthapi.OAuthClientAuthorization, len(in.Items)) + for i := range in.Items { + if err := convert_v1beta3_OAuthClientAuthorization_To_api_OAuthClientAuthorization(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil } return nil } -func convert_api_RouteStatus_To_v1beta3_RouteStatus(in *routeapi.RouteStatus, out *routeapiv1beta3.RouteStatus, s conversion.Scope) error { - return autoconvert_api_RouteStatus_To_v1beta3_RouteStatus(in, out, s) +func convert_v1beta3_OAuthClientAuthorizationList_To_api_OAuthClientAuthorizationList(in *oauthapiv1beta3.OAuthClientAuthorizationList, out *oauthapi.OAuthClientAuthorizationList, s conversion.Scope) error { + return autoconvert_v1beta3_OAuthClientAuthorizationList_To_api_OAuthClientAuthorizationList(in, out, s) } -func autoconvert_api_TLSConfig_To_v1beta3_TLSConfig(in *routeapi.TLSConfig, out *routeapiv1beta3.TLSConfig, s conversion.Scope) error { +func autoconvert_v1beta3_OAuthClientList_To_api_OAuthClientList(in *oauthapiv1beta3.OAuthClientList, out *oauthapi.OAuthClientList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapi.TLSConfig))(in) + defaulting.(func(*oauthapiv1beta3.OAuthClientList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]oauthapi.OAuthClient, len(in.Items)) + for i := range in.Items { + if err := convert_v1beta3_OAuthClient_To_api_OAuthClient(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil } - out.Termination = routeapiv1beta3.TLSTerminationType(in.Termination) - out.Certificate = in.Certificate - out.Key = in.Key - out.CACertificate = in.CACertificate - out.DestinationCACertificate = in.DestinationCACertificate - out.InsecureEdgeTerminationPolicy = routeapiv1beta3.InsecureEdgeTerminationPolicyType(in.InsecureEdgeTerminationPolicy) return nil } -func convert_api_TLSConfig_To_v1beta3_TLSConfig(in *routeapi.TLSConfig, out *routeapiv1beta3.TLSConfig, s conversion.Scope) error { - return autoconvert_api_TLSConfig_To_v1beta3_TLSConfig(in, out, s) +func convert_v1beta3_OAuthClientList_To_api_OAuthClientList(in *oauthapiv1beta3.OAuthClientList, out *oauthapi.OAuthClientList, s conversion.Scope) error { + return autoconvert_v1beta3_OAuthClientList_To_api_OAuthClientList(in, out, s) } -func autoconvert_v1beta3_Route_To_api_Route(in *routeapiv1beta3.Route, out *routeapi.Route, s conversion.Scope) error { +func autoconvert_api_Project_To_v1beta3_Project(in *projectapi.Project, out *projectapiv1beta3.Project, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapiv1beta3.Route))(in) + defaulting.(func(*projectapi.Project))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_v1beta3_RouteSpec_To_api_RouteSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_api_ProjectSpec_To_v1beta3_ProjectSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := convert_v1beta3_RouteStatus_To_api_RouteStatus(&in.Status, &out.Status, s); err != nil { + if err := convert_api_ProjectStatus_To_v1beta3_ProjectStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -func convert_v1beta3_Route_To_api_Route(in *routeapiv1beta3.Route, out *routeapi.Route, s conversion.Scope) error { - return autoconvert_v1beta3_Route_To_api_Route(in, out, s) +func convert_api_Project_To_v1beta3_Project(in *projectapi.Project, out *projectapiv1beta3.Project, s conversion.Scope) error { + return autoconvert_api_Project_To_v1beta3_Project(in, out, s) } -func autoconvert_v1beta3_RouteList_To_api_RouteList(in *routeapiv1beta3.RouteList, out *routeapi.RouteList, s conversion.Scope) error { +func autoconvert_api_ProjectList_To_v1beta3_ProjectList(in *projectapi.ProjectList, out *projectapiv1beta3.ProjectList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapiv1beta3.RouteList))(in) + defaulting.(func(*projectapi.ProjectList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3972,9 +4414,9 @@ func autoconvert_v1beta3_RouteList_To_api_RouteList(in *routeapiv1beta3.RouteLis return err } if in.Items != nil { - out.Items = make([]routeapi.Route, len(in.Items)) + out.Items = make([]projectapiv1beta3.Project, len(in.Items)) for i := range in.Items { - if err := convert_v1beta3_Route_To_api_Route(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_api_Project_To_v1beta3_Project(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3984,107 +4426,86 @@ func autoconvert_v1beta3_RouteList_To_api_RouteList(in *routeapiv1beta3.RouteLis return nil } -func convert_v1beta3_RouteList_To_api_RouteList(in *routeapiv1beta3.RouteList, out *routeapi.RouteList, s conversion.Scope) error { - return autoconvert_v1beta3_RouteList_To_api_RouteList(in, out, s) +func convert_api_ProjectList_To_v1beta3_ProjectList(in *projectapi.ProjectList, out *projectapiv1beta3.ProjectList, s conversion.Scope) error { + return autoconvert_api_ProjectList_To_v1beta3_ProjectList(in, out, s) } -func autoconvert_v1beta3_RoutePort_To_api_RoutePort(in *routeapiv1beta3.RoutePort, out *routeapi.RoutePort, s conversion.Scope) error { +func autoconvert_api_ProjectRequest_To_v1beta3_ProjectRequest(in *projectapi.ProjectRequest, out *projectapiv1beta3.ProjectRequest, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapiv1beta3.RoutePort))(in) + defaulting.(func(*projectapi.ProjectRequest))(in) } - if err := s.Convert(&in.TargetPort, &out.TargetPort, 0); err != nil { + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } + if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + out.DisplayName = in.DisplayName + out.Description = in.Description return nil } -func convert_v1beta3_RoutePort_To_api_RoutePort(in *routeapiv1beta3.RoutePort, out *routeapi.RoutePort, s conversion.Scope) error { - return autoconvert_v1beta3_RoutePort_To_api_RoutePort(in, out, s) +func convert_api_ProjectRequest_To_v1beta3_ProjectRequest(in *projectapi.ProjectRequest, out *projectapiv1beta3.ProjectRequest, s conversion.Scope) error { + return autoconvert_api_ProjectRequest_To_v1beta3_ProjectRequest(in, out, s) } -func autoconvert_v1beta3_RouteSpec_To_api_RouteSpec(in *routeapiv1beta3.RouteSpec, out *routeapi.RouteSpec, s conversion.Scope) error { +func autoconvert_api_ProjectSpec_To_v1beta3_ProjectSpec(in *projectapi.ProjectSpec, out *projectapiv1beta3.ProjectSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapiv1beta3.RouteSpec))(in) - } - out.Host = in.Host - out.Path = in.Path - if err := convert_v1beta3_ObjectReference_To_api_ObjectReference(&in.To, &out.To, s); err != nil { - return err - } - if in.Port != nil { - out.Port = new(routeapi.RoutePort) - if err := convert_v1beta3_RoutePort_To_api_RoutePort(in.Port, out.Port, s); err != nil { - return err - } - } else { - out.Port = nil + defaulting.(func(*projectapi.ProjectSpec))(in) } - if in.TLS != nil { - out.TLS = new(routeapi.TLSConfig) - if err := convert_v1beta3_TLSConfig_To_api_TLSConfig(in.TLS, out.TLS, s); err != nil { - return err + if in.Finalizers != nil { + out.Finalizers = make([]pkgapiv1beta3.FinalizerName, len(in.Finalizers)) + for i := range in.Finalizers { + out.Finalizers[i] = pkgapiv1beta3.FinalizerName(in.Finalizers[i]) } } else { - out.TLS = nil - } - return nil -} - -func convert_v1beta3_RouteSpec_To_api_RouteSpec(in *routeapiv1beta3.RouteSpec, out *routeapi.RouteSpec, s conversion.Scope) error { - return autoconvert_v1beta3_RouteSpec_To_api_RouteSpec(in, out, s) -} - -func autoconvert_v1beta3_RouteStatus_To_api_RouteStatus(in *routeapiv1beta3.RouteStatus, out *routeapi.RouteStatus, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapiv1beta3.RouteStatus))(in) + out.Finalizers = nil } return nil } -func convert_v1beta3_RouteStatus_To_api_RouteStatus(in *routeapiv1beta3.RouteStatus, out *routeapi.RouteStatus, s conversion.Scope) error { - return autoconvert_v1beta3_RouteStatus_To_api_RouteStatus(in, out, s) +func convert_api_ProjectSpec_To_v1beta3_ProjectSpec(in *projectapi.ProjectSpec, out *projectapiv1beta3.ProjectSpec, s conversion.Scope) error { + return autoconvert_api_ProjectSpec_To_v1beta3_ProjectSpec(in, out, s) } -func autoconvert_v1beta3_TLSConfig_To_api_TLSConfig(in *routeapiv1beta3.TLSConfig, out *routeapi.TLSConfig, s conversion.Scope) error { +func autoconvert_api_ProjectStatus_To_v1beta3_ProjectStatus(in *projectapi.ProjectStatus, out *projectapiv1beta3.ProjectStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*routeapiv1beta3.TLSConfig))(in) + defaulting.(func(*projectapi.ProjectStatus))(in) } - out.Termination = routeapi.TLSTerminationType(in.Termination) - out.Certificate = in.Certificate - out.Key = in.Key - out.CACertificate = in.CACertificate - out.DestinationCACertificate = in.DestinationCACertificate - out.InsecureEdgeTerminationPolicy = routeapi.InsecureEdgeTerminationPolicyType(in.InsecureEdgeTerminationPolicy) + out.Phase = pkgapiv1beta3.NamespacePhase(in.Phase) return nil } -func convert_v1beta3_TLSConfig_To_api_TLSConfig(in *routeapiv1beta3.TLSConfig, out *routeapi.TLSConfig, s conversion.Scope) error { - return autoconvert_v1beta3_TLSConfig_To_api_TLSConfig(in, out, s) +func convert_api_ProjectStatus_To_v1beta3_ProjectStatus(in *projectapi.ProjectStatus, out *projectapiv1beta3.ProjectStatus, s conversion.Scope) error { + return autoconvert_api_ProjectStatus_To_v1beta3_ProjectStatus(in, out, s) } -func autoconvert_api_ClusterNetwork_To_v1beta3_ClusterNetwork(in *sdnapi.ClusterNetwork, out *sdnapiv1beta3.ClusterNetwork, s conversion.Scope) error { +func autoconvert_v1beta3_Project_To_api_Project(in *projectapiv1beta3.Project, out *projectapi.Project, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapi.ClusterNetwork))(in) + defaulting.(func(*projectapiv1beta3.Project))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if err := convert_v1beta3_ProjectSpec_To_api_ProjectSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := convert_v1beta3_ProjectStatus_To_api_ProjectStatus(&in.Status, &out.Status, s); err != nil { return err } - out.Network = in.Network - out.HostSubnetLength = in.HostSubnetLength - out.ServiceNetwork = in.ServiceNetwork return nil } -func convert_api_ClusterNetwork_To_v1beta3_ClusterNetwork(in *sdnapi.ClusterNetwork, out *sdnapiv1beta3.ClusterNetwork, s conversion.Scope) error { - return autoconvert_api_ClusterNetwork_To_v1beta3_ClusterNetwork(in, out, s) +func convert_v1beta3_Project_To_api_Project(in *projectapiv1beta3.Project, out *projectapi.Project, s conversion.Scope) error { + return autoconvert_v1beta3_Project_To_api_Project(in, out, s) } -func autoconvert_api_ClusterNetworkList_To_v1beta3_ClusterNetworkList(in *sdnapi.ClusterNetworkList, out *sdnapiv1beta3.ClusterNetworkList, s conversion.Scope) error { +func autoconvert_v1beta3_ProjectList_To_api_ProjectList(in *projectapiv1beta3.ProjectList, out *projectapi.ProjectList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapi.ClusterNetworkList))(in) + defaulting.(func(*projectapiv1beta3.ProjectList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4093,9 +4514,9 @@ func autoconvert_api_ClusterNetworkList_To_v1beta3_ClusterNetworkList(in *sdnapi return err } if in.Items != nil { - out.Items = make([]sdnapiv1beta3.ClusterNetwork, len(in.Items)) + out.Items = make([]projectapi.Project, len(in.Items)) for i := range in.Items { - if err := convert_api_ClusterNetwork_To_v1beta3_ClusterNetwork(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1beta3_Project_To_api_Project(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4105,79 +4526,86 @@ func autoconvert_api_ClusterNetworkList_To_v1beta3_ClusterNetworkList(in *sdnapi return nil } -func convert_api_ClusterNetworkList_To_v1beta3_ClusterNetworkList(in *sdnapi.ClusterNetworkList, out *sdnapiv1beta3.ClusterNetworkList, s conversion.Scope) error { - return autoconvert_api_ClusterNetworkList_To_v1beta3_ClusterNetworkList(in, out, s) +func convert_v1beta3_ProjectList_To_api_ProjectList(in *projectapiv1beta3.ProjectList, out *projectapi.ProjectList, s conversion.Scope) error { + return autoconvert_v1beta3_ProjectList_To_api_ProjectList(in, out, s) } -func autoconvert_api_HostSubnet_To_v1beta3_HostSubnet(in *sdnapi.HostSubnet, out *sdnapiv1beta3.HostSubnet, s conversion.Scope) error { +func autoconvert_v1beta3_ProjectRequest_To_api_ProjectRequest(in *projectapiv1beta3.ProjectRequest, out *projectapi.ProjectRequest, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapi.HostSubnet))(in) + defaulting.(func(*projectapiv1beta3.ProjectRequest))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.Host = in.Host - out.HostIP = in.HostIP - out.Subnet = in.Subnet + out.DisplayName = in.DisplayName + out.Description = in.Description return nil } -func convert_api_HostSubnet_To_v1beta3_HostSubnet(in *sdnapi.HostSubnet, out *sdnapiv1beta3.HostSubnet, s conversion.Scope) error { - return autoconvert_api_HostSubnet_To_v1beta3_HostSubnet(in, out, s) +func convert_v1beta3_ProjectRequest_To_api_ProjectRequest(in *projectapiv1beta3.ProjectRequest, out *projectapi.ProjectRequest, s conversion.Scope) error { + return autoconvert_v1beta3_ProjectRequest_To_api_ProjectRequest(in, out, s) } -func autoconvert_api_HostSubnetList_To_v1beta3_HostSubnetList(in *sdnapi.HostSubnetList, out *sdnapiv1beta3.HostSubnetList, s conversion.Scope) error { +func autoconvert_v1beta3_ProjectSpec_To_api_ProjectSpec(in *projectapiv1beta3.ProjectSpec, out *projectapi.ProjectSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapi.HostSubnetList))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err - } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { - return err + defaulting.(func(*projectapiv1beta3.ProjectSpec))(in) } - if in.Items != nil { - out.Items = make([]sdnapiv1beta3.HostSubnet, len(in.Items)) - for i := range in.Items { - if err := convert_api_HostSubnet_To_v1beta3_HostSubnet(&in.Items[i], &out.Items[i], s); err != nil { - return err - } + if in.Finalizers != nil { + out.Finalizers = make([]pkgapi.FinalizerName, len(in.Finalizers)) + for i := range in.Finalizers { + out.Finalizers[i] = pkgapi.FinalizerName(in.Finalizers[i]) } } else { - out.Items = nil + out.Finalizers = nil } return nil } -func convert_api_HostSubnetList_To_v1beta3_HostSubnetList(in *sdnapi.HostSubnetList, out *sdnapiv1beta3.HostSubnetList, s conversion.Scope) error { - return autoconvert_api_HostSubnetList_To_v1beta3_HostSubnetList(in, out, s) +func convert_v1beta3_ProjectSpec_To_api_ProjectSpec(in *projectapiv1beta3.ProjectSpec, out *projectapi.ProjectSpec, s conversion.Scope) error { + return autoconvert_v1beta3_ProjectSpec_To_api_ProjectSpec(in, out, s) } -func autoconvert_api_NetNamespace_To_v1beta3_NetNamespace(in *sdnapi.NetNamespace, out *sdnapiv1beta3.NetNamespace, s conversion.Scope) error { +func autoconvert_v1beta3_ProjectStatus_To_api_ProjectStatus(in *projectapiv1beta3.ProjectStatus, out *projectapi.ProjectStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapi.NetNamespace))(in) + defaulting.(func(*projectapiv1beta3.ProjectStatus))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + out.Phase = pkgapi.NamespacePhase(in.Phase) + return nil +} + +func convert_v1beta3_ProjectStatus_To_api_ProjectStatus(in *projectapiv1beta3.ProjectStatus, out *projectapi.ProjectStatus, s conversion.Scope) error { + return autoconvert_v1beta3_ProjectStatus_To_api_ProjectStatus(in, out, s) +} + +func autoconvert_api_Route_To_v1beta3_Route(in *routeapi.Route, out *routeapiv1beta3.Route, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*routeapi.Route))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err } if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.NetName = in.NetName - out.NetID = in.NetID + if err := convert_api_RouteSpec_To_v1beta3_RouteSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := convert_api_RouteStatus_To_v1beta3_RouteStatus(&in.Status, &out.Status, s); err != nil { + return err + } return nil } -func convert_api_NetNamespace_To_v1beta3_NetNamespace(in *sdnapi.NetNamespace, out *sdnapiv1beta3.NetNamespace, s conversion.Scope) error { - return autoconvert_api_NetNamespace_To_v1beta3_NetNamespace(in, out, s) +func convert_api_Route_To_v1beta3_Route(in *routeapi.Route, out *routeapiv1beta3.Route, s conversion.Scope) error { + return autoconvert_api_Route_To_v1beta3_Route(in, out, s) } -func autoconvert_api_NetNamespaceList_To_v1beta3_NetNamespaceList(in *sdnapi.NetNamespaceList, out *sdnapiv1beta3.NetNamespaceList, s conversion.Scope) error { +func autoconvert_api_RouteList_To_v1beta3_RouteList(in *routeapi.RouteList, out *routeapiv1beta3.RouteList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapi.NetNamespaceList))(in) + defaulting.(func(*routeapi.RouteList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4186,9 +4614,9 @@ func autoconvert_api_NetNamespaceList_To_v1beta3_NetNamespaceList(in *sdnapi.Net return err } if in.Items != nil { - out.Items = make([]sdnapiv1beta3.NetNamespace, len(in.Items)) + out.Items = make([]routeapiv1beta3.Route, len(in.Items)) for i := range in.Items { - if err := convert_api_NetNamespace_To_v1beta3_NetNamespace(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_api_Route_To_v1beta3_Route(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4198,60 +4626,87 @@ func autoconvert_api_NetNamespaceList_To_v1beta3_NetNamespaceList(in *sdnapi.Net return nil } -func convert_api_NetNamespaceList_To_v1beta3_NetNamespaceList(in *sdnapi.NetNamespaceList, out *sdnapiv1beta3.NetNamespaceList, s conversion.Scope) error { - return autoconvert_api_NetNamespaceList_To_v1beta3_NetNamespaceList(in, out, s) +func convert_api_RouteList_To_v1beta3_RouteList(in *routeapi.RouteList, out *routeapiv1beta3.RouteList, s conversion.Scope) error { + return autoconvert_api_RouteList_To_v1beta3_RouteList(in, out, s) } -func autoconvert_v1beta3_ClusterNetwork_To_api_ClusterNetwork(in *sdnapiv1beta3.ClusterNetwork, out *sdnapi.ClusterNetwork, s conversion.Scope) error { +func autoconvert_api_RoutePort_To_v1beta3_RoutePort(in *routeapi.RoutePort, out *routeapiv1beta3.RoutePort, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapiv1beta3.ClusterNetwork))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + defaulting.(func(*routeapi.RoutePort))(in) } - if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if err := s.Convert(&in.TargetPort, &out.TargetPort, 0); err != nil { return err } - out.Network = in.Network - out.HostSubnetLength = in.HostSubnetLength - out.ServiceNetwork = in.ServiceNetwork return nil } -func convert_v1beta3_ClusterNetwork_To_api_ClusterNetwork(in *sdnapiv1beta3.ClusterNetwork, out *sdnapi.ClusterNetwork, s conversion.Scope) error { - return autoconvert_v1beta3_ClusterNetwork_To_api_ClusterNetwork(in, out, s) +func convert_api_RoutePort_To_v1beta3_RoutePort(in *routeapi.RoutePort, out *routeapiv1beta3.RoutePort, s conversion.Scope) error { + return autoconvert_api_RoutePort_To_v1beta3_RoutePort(in, out, s) } -func autoconvert_v1beta3_ClusterNetworkList_To_api_ClusterNetworkList(in *sdnapiv1beta3.ClusterNetworkList, out *sdnapi.ClusterNetworkList, s conversion.Scope) error { +func autoconvert_api_RouteSpec_To_v1beta3_RouteSpec(in *routeapi.RouteSpec, out *routeapiv1beta3.RouteSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapiv1beta3.ClusterNetworkList))(in) + defaulting.(func(*routeapi.RouteSpec))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + out.Host = in.Host + out.Path = in.Path + if err := convert_api_ObjectReference_To_v1beta3_ObjectReference(&in.To, &out.To, s); err != nil { return err } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { - return err + if in.Port != nil { + out.Port = new(routeapiv1beta3.RoutePort) + if err := convert_api_RoutePort_To_v1beta3_RoutePort(in.Port, out.Port, s); err != nil { + return err + } + } else { + out.Port = nil } - if in.Items != nil { - out.Items = make([]sdnapi.ClusterNetwork, len(in.Items)) - for i := range in.Items { - if err := convert_v1beta3_ClusterNetwork_To_api_ClusterNetwork(&in.Items[i], &out.Items[i], s); err != nil { - return err - } + if in.TLS != nil { + out.TLS = new(routeapiv1beta3.TLSConfig) + if err := convert_api_TLSConfig_To_v1beta3_TLSConfig(in.TLS, out.TLS, s); err != nil { + return err } } else { - out.Items = nil + out.TLS = nil } return nil } -func convert_v1beta3_ClusterNetworkList_To_api_ClusterNetworkList(in *sdnapiv1beta3.ClusterNetworkList, out *sdnapi.ClusterNetworkList, s conversion.Scope) error { - return autoconvert_v1beta3_ClusterNetworkList_To_api_ClusterNetworkList(in, out, s) +func convert_api_RouteSpec_To_v1beta3_RouteSpec(in *routeapi.RouteSpec, out *routeapiv1beta3.RouteSpec, s conversion.Scope) error { + return autoconvert_api_RouteSpec_To_v1beta3_RouteSpec(in, out, s) } -func autoconvert_v1beta3_HostSubnet_To_api_HostSubnet(in *sdnapiv1beta3.HostSubnet, out *sdnapi.HostSubnet, s conversion.Scope) error { +func autoconvert_api_RouteStatus_To_v1beta3_RouteStatus(in *routeapi.RouteStatus, out *routeapiv1beta3.RouteStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapiv1beta3.HostSubnet))(in) + defaulting.(func(*routeapi.RouteStatus))(in) + } + return nil +} + +func convert_api_RouteStatus_To_v1beta3_RouteStatus(in *routeapi.RouteStatus, out *routeapiv1beta3.RouteStatus, s conversion.Scope) error { + return autoconvert_api_RouteStatus_To_v1beta3_RouteStatus(in, out, s) +} + +func autoconvert_api_TLSConfig_To_v1beta3_TLSConfig(in *routeapi.TLSConfig, out *routeapiv1beta3.TLSConfig, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*routeapi.TLSConfig))(in) + } + out.Termination = routeapiv1beta3.TLSTerminationType(in.Termination) + out.Certificate = in.Certificate + out.Key = in.Key + out.CACertificate = in.CACertificate + out.DestinationCACertificate = in.DestinationCACertificate + out.InsecureEdgeTerminationPolicy = routeapiv1beta3.InsecureEdgeTerminationPolicyType(in.InsecureEdgeTerminationPolicy) + return nil +} + +func convert_api_TLSConfig_To_v1beta3_TLSConfig(in *routeapi.TLSConfig, out *routeapiv1beta3.TLSConfig, s conversion.Scope) error { + return autoconvert_api_TLSConfig_To_v1beta3_TLSConfig(in, out, s) +} + +func autoconvert_v1beta3_Route_To_api_Route(in *routeapiv1beta3.Route, out *routeapi.Route, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*routeapiv1beta3.Route))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4259,19 +4714,22 @@ func autoconvert_v1beta3_HostSubnet_To_api_HostSubnet(in *sdnapiv1beta3.HostSubn if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - out.Host = in.Host - out.HostIP = in.HostIP - out.Subnet = in.Subnet + if err := convert_v1beta3_RouteSpec_To_api_RouteSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := convert_v1beta3_RouteStatus_To_api_RouteStatus(&in.Status, &out.Status, s); err != nil { + return err + } return nil } -func convert_v1beta3_HostSubnet_To_api_HostSubnet(in *sdnapiv1beta3.HostSubnet, out *sdnapi.HostSubnet, s conversion.Scope) error { - return autoconvert_v1beta3_HostSubnet_To_api_HostSubnet(in, out, s) +func convert_v1beta3_Route_To_api_Route(in *routeapiv1beta3.Route, out *routeapi.Route, s conversion.Scope) error { + return autoconvert_v1beta3_Route_To_api_Route(in, out, s) } -func autoconvert_v1beta3_HostSubnetList_To_api_HostSubnetList(in *sdnapiv1beta3.HostSubnetList, out *sdnapi.HostSubnetList, s conversion.Scope) error { +func autoconvert_v1beta3_RouteList_To_api_RouteList(in *routeapiv1beta3.RouteList, out *routeapi.RouteList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapiv1beta3.HostSubnetList))(in) + defaulting.(func(*routeapiv1beta3.RouteList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4280,9 +4738,9 @@ func autoconvert_v1beta3_HostSubnetList_To_api_HostSubnetList(in *sdnapiv1beta3. return err } if in.Items != nil { - out.Items = make([]sdnapi.HostSubnet, len(in.Items)) + out.Items = make([]routeapi.Route, len(in.Items)) for i := range in.Items { - if err := convert_v1beta3_HostSubnet_To_api_HostSubnet(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1beta3_Route_To_api_Route(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4292,77 +4750,87 @@ func autoconvert_v1beta3_HostSubnetList_To_api_HostSubnetList(in *sdnapiv1beta3. return nil } -func convert_v1beta3_HostSubnetList_To_api_HostSubnetList(in *sdnapiv1beta3.HostSubnetList, out *sdnapi.HostSubnetList, s conversion.Scope) error { - return autoconvert_v1beta3_HostSubnetList_To_api_HostSubnetList(in, out, s) +func convert_v1beta3_RouteList_To_api_RouteList(in *routeapiv1beta3.RouteList, out *routeapi.RouteList, s conversion.Scope) error { + return autoconvert_v1beta3_RouteList_To_api_RouteList(in, out, s) } -func autoconvert_v1beta3_NetNamespace_To_api_NetNamespace(in *sdnapiv1beta3.NetNamespace, out *sdnapi.NetNamespace, s conversion.Scope) error { +func autoconvert_v1beta3_RoutePort_To_api_RoutePort(in *routeapiv1beta3.RoutePort, out *routeapi.RoutePort, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapiv1beta3.NetNamespace))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + defaulting.(func(*routeapiv1beta3.RoutePort))(in) } - if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if err := s.Convert(&in.TargetPort, &out.TargetPort, 0); err != nil { return err } - out.NetName = in.NetName - out.NetID = in.NetID return nil } -func convert_v1beta3_NetNamespace_To_api_NetNamespace(in *sdnapiv1beta3.NetNamespace, out *sdnapi.NetNamespace, s conversion.Scope) error { - return autoconvert_v1beta3_NetNamespace_To_api_NetNamespace(in, out, s) +func convert_v1beta3_RoutePort_To_api_RoutePort(in *routeapiv1beta3.RoutePort, out *routeapi.RoutePort, s conversion.Scope) error { + return autoconvert_v1beta3_RoutePort_To_api_RoutePort(in, out, s) } -func autoconvert_v1beta3_NetNamespaceList_To_api_NetNamespaceList(in *sdnapiv1beta3.NetNamespaceList, out *sdnapi.NetNamespaceList, s conversion.Scope) error { +func autoconvert_v1beta3_RouteSpec_To_api_RouteSpec(in *routeapiv1beta3.RouteSpec, out *routeapi.RouteSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*sdnapiv1beta3.NetNamespaceList))(in) + defaulting.(func(*routeapiv1beta3.RouteSpec))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + out.Host = in.Host + out.Path = in.Path + if err := convert_v1beta3_ObjectReference_To_api_ObjectReference(&in.To, &out.To, s); err != nil { return err } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { - return err + if in.Port != nil { + out.Port = new(routeapi.RoutePort) + if err := convert_v1beta3_RoutePort_To_api_RoutePort(in.Port, out.Port, s); err != nil { + return err + } + } else { + out.Port = nil } - if in.Items != nil { - out.Items = make([]sdnapi.NetNamespace, len(in.Items)) - for i := range in.Items { - if err := convert_v1beta3_NetNamespace_To_api_NetNamespace(&in.Items[i], &out.Items[i], s); err != nil { - return err - } + if in.TLS != nil { + out.TLS = new(routeapi.TLSConfig) + if err := convert_v1beta3_TLSConfig_To_api_TLSConfig(in.TLS, out.TLS, s); err != nil { + return err } } else { - out.Items = nil + out.TLS = nil } return nil } -func convert_v1beta3_NetNamespaceList_To_api_NetNamespaceList(in *sdnapiv1beta3.NetNamespaceList, out *sdnapi.NetNamespaceList, s conversion.Scope) error { - return autoconvert_v1beta3_NetNamespaceList_To_api_NetNamespaceList(in, out, s) +func convert_v1beta3_RouteSpec_To_api_RouteSpec(in *routeapiv1beta3.RouteSpec, out *routeapi.RouteSpec, s conversion.Scope) error { + return autoconvert_v1beta3_RouteSpec_To_api_RouteSpec(in, out, s) } -func autoconvert_api_Parameter_To_v1beta3_Parameter(in *templateapi.Parameter, out *templateapiv1beta3.Parameter, s conversion.Scope) error { +func autoconvert_v1beta3_RouteStatus_To_api_RouteStatus(in *routeapiv1beta3.RouteStatus, out *routeapi.RouteStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*templateapi.Parameter))(in) + defaulting.(func(*routeapiv1beta3.RouteStatus))(in) } - out.Name = in.Name - out.DisplayName = in.DisplayName - out.Description = in.Description - out.Value = in.Value - out.Generate = in.Generate - out.From = in.From - out.Required = in.Required return nil } -func convert_api_Parameter_To_v1beta3_Parameter(in *templateapi.Parameter, out *templateapiv1beta3.Parameter, s conversion.Scope) error { - return autoconvert_api_Parameter_To_v1beta3_Parameter(in, out, s) +func convert_v1beta3_RouteStatus_To_api_RouteStatus(in *routeapiv1beta3.RouteStatus, out *routeapi.RouteStatus, s conversion.Scope) error { + return autoconvert_v1beta3_RouteStatus_To_api_RouteStatus(in, out, s) } -func autoconvert_api_Template_To_v1beta3_Template(in *templateapi.Template, out *templateapiv1beta3.Template, s conversion.Scope) error { +func autoconvert_v1beta3_TLSConfig_To_api_TLSConfig(in *routeapiv1beta3.TLSConfig, out *routeapi.TLSConfig, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*templateapi.Template))(in) + defaulting.(func(*routeapiv1beta3.TLSConfig))(in) + } + out.Termination = routeapi.TLSTerminationType(in.Termination) + out.Certificate = in.Certificate + out.Key = in.Key + out.CACertificate = in.CACertificate + out.DestinationCACertificate = in.DestinationCACertificate + out.InsecureEdgeTerminationPolicy = routeapi.InsecureEdgeTerminationPolicyType(in.InsecureEdgeTerminationPolicy) + return nil +} + +func convert_v1beta3_TLSConfig_To_api_TLSConfig(in *routeapiv1beta3.TLSConfig, out *routeapi.TLSConfig, s conversion.Scope) error { + return autoconvert_v1beta3_TLSConfig_To_api_TLSConfig(in, out, s) +} + +func autoconvert_api_ClusterNetwork_To_v1beta3_ClusterNetwork(in *sdnapi.ClusterNetwork, out *sdnapiv1beta3.ClusterNetwork, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*sdnapi.ClusterNetwork))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4370,26 +4838,19 @@ func autoconvert_api_Template_To_v1beta3_Template(in *templateapi.Template, out if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if in.Parameters != nil { - out.Parameters = make([]templateapiv1beta3.Parameter, len(in.Parameters)) - for i := range in.Parameters { - if err := convert_api_Parameter_To_v1beta3_Parameter(&in.Parameters[i], &out.Parameters[i], s); err != nil { - return err - } - } - } else { - out.Parameters = nil - } - if err := s.Convert(&in.Objects, &out.Objects, 0); err != nil { - return err - } - // in.ObjectLabels has no peer in out + out.Network = in.Network + out.HostSubnetLength = in.HostSubnetLength + out.ServiceNetwork = in.ServiceNetwork return nil } -func autoconvert_api_TemplateList_To_v1beta3_TemplateList(in *templateapi.TemplateList, out *templateapiv1beta3.TemplateList, s conversion.Scope) error { +func convert_api_ClusterNetwork_To_v1beta3_ClusterNetwork(in *sdnapi.ClusterNetwork, out *sdnapiv1beta3.ClusterNetwork, s conversion.Scope) error { + return autoconvert_api_ClusterNetwork_To_v1beta3_ClusterNetwork(in, out, s) +} + +func autoconvert_api_ClusterNetworkList_To_v1beta3_ClusterNetworkList(in *sdnapi.ClusterNetworkList, out *sdnapiv1beta3.ClusterNetworkList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*templateapi.TemplateList))(in) + defaulting.(func(*sdnapi.ClusterNetworkList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4398,9 +4859,9 @@ func autoconvert_api_TemplateList_To_v1beta3_TemplateList(in *templateapi.Templa return err } if in.Items != nil { - out.Items = make([]templateapiv1beta3.Template, len(in.Items)) + out.Items = make([]sdnapiv1beta3.ClusterNetwork, len(in.Items)) for i := range in.Items { - if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { + if err := convert_api_ClusterNetwork_To_v1beta3_ClusterNetwork(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4410,65 +4871,33 @@ func autoconvert_api_TemplateList_To_v1beta3_TemplateList(in *templateapi.Templa return nil } -func convert_api_TemplateList_To_v1beta3_TemplateList(in *templateapi.TemplateList, out *templateapiv1beta3.TemplateList, s conversion.Scope) error { - return autoconvert_api_TemplateList_To_v1beta3_TemplateList(in, out, s) -} - -func autoconvert_v1beta3_Parameter_To_api_Parameter(in *templateapiv1beta3.Parameter, out *templateapi.Parameter, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*templateapiv1beta3.Parameter))(in) - } - out.Name = in.Name - out.DisplayName = in.DisplayName - out.Description = in.Description - out.Value = in.Value - out.Generate = in.Generate - out.From = in.From - out.Required = in.Required - return nil -} - -func convert_v1beta3_Parameter_To_api_Parameter(in *templateapiv1beta3.Parameter, out *templateapi.Parameter, s conversion.Scope) error { - return autoconvert_v1beta3_Parameter_To_api_Parameter(in, out, s) +func convert_api_ClusterNetworkList_To_v1beta3_ClusterNetworkList(in *sdnapi.ClusterNetworkList, out *sdnapiv1beta3.ClusterNetworkList, s conversion.Scope) error { + return autoconvert_api_ClusterNetworkList_To_v1beta3_ClusterNetworkList(in, out, s) } -func autoconvert_v1beta3_Template_To_api_Template(in *templateapiv1beta3.Template, out *templateapi.Template, s conversion.Scope) error { +func autoconvert_api_HostSubnet_To_v1beta3_HostSubnet(in *sdnapi.HostSubnet, out *sdnapiv1beta3.HostSubnet, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*templateapiv1beta3.Template))(in) + defaulting.(func(*sdnapi.HostSubnet))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - if err := s.Convert(&in.Objects, &out.Objects, 0); err != nil { + if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if in.Parameters != nil { - out.Parameters = make([]templateapi.Parameter, len(in.Parameters)) - for i := range in.Parameters { - if err := convert_v1beta3_Parameter_To_api_Parameter(&in.Parameters[i], &out.Parameters[i], s); err != nil { - return err - } - } - } else { - out.Parameters = nil - } - if in.Labels != nil { - out.Labels = make(map[string]string) - for key, val := range in.Labels { - out.Labels[key] = val - } - } else { - out.Labels = nil - } + out.Host = in.Host + out.HostIP = in.HostIP + out.Subnet = in.Subnet return nil } -func autoconvert_v1beta3_TemplateList_To_api_TemplateList(in *templateapiv1beta3.TemplateList, out *templateapi.TemplateList, s conversion.Scope) error { +func convert_api_HostSubnet_To_v1beta3_HostSubnet(in *sdnapi.HostSubnet, out *sdnapiv1beta3.HostSubnet, s conversion.Scope) error { + return autoconvert_api_HostSubnet_To_v1beta3_HostSubnet(in, out, s) +} + +func autoconvert_api_HostSubnetList_To_v1beta3_HostSubnetList(in *sdnapi.HostSubnetList, out *sdnapiv1beta3.HostSubnetList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*templateapiv1beta3.TemplateList))(in) + defaulting.(func(*sdnapi.HostSubnetList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4477,9 +4906,9 @@ func autoconvert_v1beta3_TemplateList_To_api_TemplateList(in *templateapiv1beta3 return err } if in.Items != nil { - out.Items = make([]templateapi.Template, len(in.Items)) + out.Items = make([]sdnapiv1beta3.HostSubnet, len(in.Items)) for i := range in.Items { - if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { + if err := convert_api_HostSubnet_To_v1beta3_HostSubnet(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4489,13 +4918,13 @@ func autoconvert_v1beta3_TemplateList_To_api_TemplateList(in *templateapiv1beta3 return nil } -func convert_v1beta3_TemplateList_To_api_TemplateList(in *templateapiv1beta3.TemplateList, out *templateapi.TemplateList, s conversion.Scope) error { - return autoconvert_v1beta3_TemplateList_To_api_TemplateList(in, out, s) +func convert_api_HostSubnetList_To_v1beta3_HostSubnetList(in *sdnapi.HostSubnetList, out *sdnapiv1beta3.HostSubnetList, s conversion.Scope) error { + return autoconvert_api_HostSubnetList_To_v1beta3_HostSubnetList(in, out, s) } -func autoconvert_api_Group_To_v1beta3_Group(in *userapi.Group, out *userapiv1beta3.Group, s conversion.Scope) error { +func autoconvert_api_NetNamespace_To_v1beta3_NetNamespace(in *sdnapi.NetNamespace, out *sdnapiv1beta3.NetNamespace, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapi.Group))(in) + defaulting.(func(*sdnapi.NetNamespace))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4503,24 +4932,18 @@ func autoconvert_api_Group_To_v1beta3_Group(in *userapi.Group, out *userapiv1bet if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if in.Users != nil { - out.Users = make([]string, len(in.Users)) - for i := range in.Users { - out.Users[i] = in.Users[i] - } - } else { - out.Users = nil - } + out.NetName = in.NetName + out.NetID = in.NetID return nil } -func convert_api_Group_To_v1beta3_Group(in *userapi.Group, out *userapiv1beta3.Group, s conversion.Scope) error { - return autoconvert_api_Group_To_v1beta3_Group(in, out, s) +func convert_api_NetNamespace_To_v1beta3_NetNamespace(in *sdnapi.NetNamespace, out *sdnapiv1beta3.NetNamespace, s conversion.Scope) error { + return autoconvert_api_NetNamespace_To_v1beta3_NetNamespace(in, out, s) } -func autoconvert_api_GroupList_To_v1beta3_GroupList(in *userapi.GroupList, out *userapiv1beta3.GroupList, s conversion.Scope) error { +func autoconvert_api_NetNamespaceList_To_v1beta3_NetNamespaceList(in *sdnapi.NetNamespaceList, out *sdnapiv1beta3.NetNamespaceList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapi.GroupList))(in) + defaulting.(func(*sdnapi.NetNamespaceList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4529,9 +4952,9 @@ func autoconvert_api_GroupList_To_v1beta3_GroupList(in *userapi.GroupList, out * return err } if in.Items != nil { - out.Items = make([]userapiv1beta3.Group, len(in.Items)) + out.Items = make([]sdnapiv1beta3.NetNamespace, len(in.Items)) for i := range in.Items { - if err := convert_api_Group_To_v1beta3_Group(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_api_NetNamespace_To_v1beta3_NetNamespace(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4541,43 +4964,33 @@ func autoconvert_api_GroupList_To_v1beta3_GroupList(in *userapi.GroupList, out * return nil } -func convert_api_GroupList_To_v1beta3_GroupList(in *userapi.GroupList, out *userapiv1beta3.GroupList, s conversion.Scope) error { - return autoconvert_api_GroupList_To_v1beta3_GroupList(in, out, s) +func convert_api_NetNamespaceList_To_v1beta3_NetNamespaceList(in *sdnapi.NetNamespaceList, out *sdnapiv1beta3.NetNamespaceList, s conversion.Scope) error { + return autoconvert_api_NetNamespaceList_To_v1beta3_NetNamespaceList(in, out, s) } -func autoconvert_api_Identity_To_v1beta3_Identity(in *userapi.Identity, out *userapiv1beta3.Identity, s conversion.Scope) error { +func autoconvert_v1beta3_ClusterNetwork_To_api_ClusterNetwork(in *sdnapiv1beta3.ClusterNetwork, out *sdnapi.ClusterNetwork, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapi.Identity))(in) + defaulting.(func(*sdnapiv1beta3.ClusterNetwork))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - out.ProviderName = in.ProviderName - out.ProviderUserName = in.ProviderUserName - if err := convert_api_ObjectReference_To_v1beta3_ObjectReference(&in.User, &out.User, s); err != nil { + if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if in.Extra != nil { - out.Extra = make(map[string]string) - for key, val := range in.Extra { - out.Extra[key] = val - } - } else { - out.Extra = nil - } + out.Network = in.Network + out.HostSubnetLength = in.HostSubnetLength + out.ServiceNetwork = in.ServiceNetwork return nil } -func convert_api_Identity_To_v1beta3_Identity(in *userapi.Identity, out *userapiv1beta3.Identity, s conversion.Scope) error { - return autoconvert_api_Identity_To_v1beta3_Identity(in, out, s) +func convert_v1beta3_ClusterNetwork_To_api_ClusterNetwork(in *sdnapiv1beta3.ClusterNetwork, out *sdnapi.ClusterNetwork, s conversion.Scope) error { + return autoconvert_v1beta3_ClusterNetwork_To_api_ClusterNetwork(in, out, s) } -func autoconvert_api_IdentityList_To_v1beta3_IdentityList(in *userapi.IdentityList, out *userapiv1beta3.IdentityList, s conversion.Scope) error { +func autoconvert_v1beta3_ClusterNetworkList_To_api_ClusterNetworkList(in *sdnapiv1beta3.ClusterNetworkList, out *sdnapi.ClusterNetworkList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapi.IdentityList))(in) + defaulting.(func(*sdnapiv1beta3.ClusterNetworkList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4586,9 +4999,9 @@ func autoconvert_api_IdentityList_To_v1beta3_IdentityList(in *userapi.IdentityLi return err } if in.Items != nil { - out.Items = make([]userapiv1beta3.Identity, len(in.Items)) + out.Items = make([]sdnapi.ClusterNetwork, len(in.Items)) for i := range in.Items { - if err := convert_api_Identity_To_v1beta3_Identity(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1beta3_ClusterNetwork_To_api_ClusterNetwork(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4598,70 +5011,33 @@ func autoconvert_api_IdentityList_To_v1beta3_IdentityList(in *userapi.IdentityLi return nil } -func convert_api_IdentityList_To_v1beta3_IdentityList(in *userapi.IdentityList, out *userapiv1beta3.IdentityList, s conversion.Scope) error { - return autoconvert_api_IdentityList_To_v1beta3_IdentityList(in, out, s) -} - -func autoconvert_api_User_To_v1beta3_User(in *userapi.User, out *userapiv1beta3.User, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapi.User))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err - } - if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - out.FullName = in.FullName - if in.Identities != nil { - out.Identities = make([]string, len(in.Identities)) - for i := range in.Identities { - out.Identities[i] = in.Identities[i] - } - } else { - out.Identities = nil - } - if in.Groups != nil { - out.Groups = make([]string, len(in.Groups)) - for i := range in.Groups { - out.Groups[i] = in.Groups[i] - } - } else { - out.Groups = nil - } - return nil -} - -func convert_api_User_To_v1beta3_User(in *userapi.User, out *userapiv1beta3.User, s conversion.Scope) error { - return autoconvert_api_User_To_v1beta3_User(in, out, s) +func convert_v1beta3_ClusterNetworkList_To_api_ClusterNetworkList(in *sdnapiv1beta3.ClusterNetworkList, out *sdnapi.ClusterNetworkList, s conversion.Scope) error { + return autoconvert_v1beta3_ClusterNetworkList_To_api_ClusterNetworkList(in, out, s) } -func autoconvert_api_UserIdentityMapping_To_v1beta3_UserIdentityMapping(in *userapi.UserIdentityMapping, out *userapiv1beta3.UserIdentityMapping, s conversion.Scope) error { +func autoconvert_v1beta3_HostSubnet_To_api_HostSubnet(in *sdnapiv1beta3.HostSubnet, out *sdnapi.HostSubnet, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapi.UserIdentityMapping))(in) + defaulting.(func(*sdnapiv1beta3.HostSubnet))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err - } - if err := convert_api_ObjectReference_To_v1beta3_ObjectReference(&in.Identity, &out.Identity, s); err != nil { - return err - } - if err := convert_api_ObjectReference_To_v1beta3_ObjectReference(&in.User, &out.User, s); err != nil { + if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } + out.Host = in.Host + out.HostIP = in.HostIP + out.Subnet = in.Subnet return nil } -func convert_api_UserIdentityMapping_To_v1beta3_UserIdentityMapping(in *userapi.UserIdentityMapping, out *userapiv1beta3.UserIdentityMapping, s conversion.Scope) error { - return autoconvert_api_UserIdentityMapping_To_v1beta3_UserIdentityMapping(in, out, s) +func convert_v1beta3_HostSubnet_To_api_HostSubnet(in *sdnapiv1beta3.HostSubnet, out *sdnapi.HostSubnet, s conversion.Scope) error { + return autoconvert_v1beta3_HostSubnet_To_api_HostSubnet(in, out, s) } -func autoconvert_api_UserList_To_v1beta3_UserList(in *userapi.UserList, out *userapiv1beta3.UserList, s conversion.Scope) error { +func autoconvert_v1beta3_HostSubnetList_To_api_HostSubnetList(in *sdnapiv1beta3.HostSubnetList, out *sdnapi.HostSubnetList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapi.UserList))(in) + defaulting.(func(*sdnapiv1beta3.HostSubnetList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4670,9 +5046,9 @@ func autoconvert_api_UserList_To_v1beta3_UserList(in *userapi.UserList, out *use return err } if in.Items != nil { - out.Items = make([]userapiv1beta3.User, len(in.Items)) + out.Items = make([]sdnapi.HostSubnet, len(in.Items)) for i := range in.Items { - if err := convert_api_User_To_v1beta3_User(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1beta3_HostSubnet_To_api_HostSubnet(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4682,13 +5058,13 @@ func autoconvert_api_UserList_To_v1beta3_UserList(in *userapi.UserList, out *use return nil } -func convert_api_UserList_To_v1beta3_UserList(in *userapi.UserList, out *userapiv1beta3.UserList, s conversion.Scope) error { - return autoconvert_api_UserList_To_v1beta3_UserList(in, out, s) +func convert_v1beta3_HostSubnetList_To_api_HostSubnetList(in *sdnapiv1beta3.HostSubnetList, out *sdnapi.HostSubnetList, s conversion.Scope) error { + return autoconvert_v1beta3_HostSubnetList_To_api_HostSubnetList(in, out, s) } -func autoconvert_v1beta3_Group_To_api_Group(in *userapiv1beta3.Group, out *userapi.Group, s conversion.Scope) error { +func autoconvert_v1beta3_NetNamespace_To_api_NetNamespace(in *sdnapiv1beta3.NetNamespace, out *sdnapi.NetNamespace, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapiv1beta3.Group))(in) + defaulting.(func(*sdnapiv1beta3.NetNamespace))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4696,24 +5072,18 @@ func autoconvert_v1beta3_Group_To_api_Group(in *userapiv1beta3.Group, out *usera if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if in.Users != nil { - out.Users = make([]string, len(in.Users)) - for i := range in.Users { - out.Users[i] = in.Users[i] - } - } else { - out.Users = nil - } + out.NetName = in.NetName + out.NetID = in.NetID return nil } -func convert_v1beta3_Group_To_api_Group(in *userapiv1beta3.Group, out *userapi.Group, s conversion.Scope) error { - return autoconvert_v1beta3_Group_To_api_Group(in, out, s) +func convert_v1beta3_NetNamespace_To_api_NetNamespace(in *sdnapiv1beta3.NetNamespace, out *sdnapi.NetNamespace, s conversion.Scope) error { + return autoconvert_v1beta3_NetNamespace_To_api_NetNamespace(in, out, s) } -func autoconvert_v1beta3_GroupList_To_api_GroupList(in *userapiv1beta3.GroupList, out *userapi.GroupList, s conversion.Scope) error { +func autoconvert_v1beta3_NetNamespaceList_To_api_NetNamespaceList(in *sdnapiv1beta3.NetNamespaceList, out *sdnapi.NetNamespaceList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapiv1beta3.GroupList))(in) + defaulting.(func(*sdnapiv1beta3.NetNamespaceList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -4722,9 +5092,9 @@ func autoconvert_v1beta3_GroupList_To_api_GroupList(in *userapiv1beta3.GroupList return err } if in.Items != nil { - out.Items = make([]userapi.Group, len(in.Items)) + out.Items = make([]sdnapi.NetNamespace, len(in.Items)) for i := range in.Items { - if err := convert_v1beta3_Group_To_api_Group(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1beta3_NetNamespace_To_api_NetNamespace(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4734,23 +5104,226 @@ func autoconvert_v1beta3_GroupList_To_api_GroupList(in *userapiv1beta3.GroupList return nil } -func convert_v1beta3_GroupList_To_api_GroupList(in *userapiv1beta3.GroupList, out *userapi.GroupList, s conversion.Scope) error { - return autoconvert_v1beta3_GroupList_To_api_GroupList(in, out, s) +func convert_v1beta3_NetNamespaceList_To_api_NetNamespaceList(in *sdnapiv1beta3.NetNamespaceList, out *sdnapi.NetNamespaceList, s conversion.Scope) error { + return autoconvert_v1beta3_NetNamespaceList_To_api_NetNamespaceList(in, out, s) } -func autoconvert_v1beta3_Identity_To_api_Identity(in *userapiv1beta3.Identity, out *userapi.Identity, s conversion.Scope) error { +func autoconvert_api_Parameter_To_v1beta3_Parameter(in *templateapi.Parameter, out *templateapiv1beta3.Parameter, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapiv1beta3.Identity))(in) + defaulting.(func(*templateapi.Parameter))(in) + } + out.Name = in.Name + out.DisplayName = in.DisplayName + out.Description = in.Description + out.Value = in.Value + out.Generate = in.Generate + out.From = in.From + out.Required = in.Required + return nil +} + +func convert_api_Parameter_To_v1beta3_Parameter(in *templateapi.Parameter, out *templateapiv1beta3.Parameter, s conversion.Scope) error { + return autoconvert_api_Parameter_To_v1beta3_Parameter(in, out, s) +} + +func autoconvert_api_Template_To_v1beta3_Template(in *templateapi.Template, out *templateapiv1beta3.Template, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*templateapi.Template))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err } - if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if in.Parameters != nil { + out.Parameters = make([]templateapiv1beta3.Parameter, len(in.Parameters)) + for i := range in.Parameters { + if err := convert_api_Parameter_To_v1beta3_Parameter(&in.Parameters[i], &out.Parameters[i], s); err != nil { + return err + } + } + } else { + out.Parameters = nil + } + if err := s.Convert(&in.Objects, &out.Objects, 0); err != nil { + return err + } + // in.ObjectLabels has no peer in out + return nil +} + +func autoconvert_api_TemplateList_To_v1beta3_TemplateList(in *templateapi.TemplateList, out *templateapiv1beta3.TemplateList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*templateapi.TemplateList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]templateapiv1beta3.Template, len(in.Items)) + for i := range in.Items { + if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_api_TemplateList_To_v1beta3_TemplateList(in *templateapi.TemplateList, out *templateapiv1beta3.TemplateList, s conversion.Scope) error { + return autoconvert_api_TemplateList_To_v1beta3_TemplateList(in, out, s) +} + +func autoconvert_v1beta3_Parameter_To_api_Parameter(in *templateapiv1beta3.Parameter, out *templateapi.Parameter, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*templateapiv1beta3.Parameter))(in) + } + out.Name = in.Name + out.DisplayName = in.DisplayName + out.Description = in.Description + out.Value = in.Value + out.Generate = in.Generate + out.From = in.From + out.Required = in.Required + return nil +} + +func convert_v1beta3_Parameter_To_api_Parameter(in *templateapiv1beta3.Parameter, out *templateapi.Parameter, s conversion.Scope) error { + return autoconvert_v1beta3_Parameter_To_api_Parameter(in, out, s) +} + +func autoconvert_v1beta3_Template_To_api_Template(in *templateapiv1beta3.Template, out *templateapi.Template, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*templateapiv1beta3.Template))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if err := s.Convert(&in.Objects, &out.Objects, 0); err != nil { + return err + } + if in.Parameters != nil { + out.Parameters = make([]templateapi.Parameter, len(in.Parameters)) + for i := range in.Parameters { + if err := convert_v1beta3_Parameter_To_api_Parameter(&in.Parameters[i], &out.Parameters[i], s); err != nil { + return err + } + } + } else { + out.Parameters = nil + } + if in.Labels != nil { + out.Labels = make(map[string]string) + for key, val := range in.Labels { + out.Labels[key] = val + } + } else { + out.Labels = nil + } + return nil +} + +func autoconvert_v1beta3_TemplateList_To_api_TemplateList(in *templateapiv1beta3.TemplateList, out *templateapi.TemplateList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*templateapiv1beta3.TemplateList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]templateapi.Template, len(in.Items)) + for i := range in.Items { + if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_v1beta3_TemplateList_To_api_TemplateList(in *templateapiv1beta3.TemplateList, out *templateapi.TemplateList, s conversion.Scope) error { + return autoconvert_v1beta3_TemplateList_To_api_TemplateList(in, out, s) +} + +func autoconvert_api_Group_To_v1beta3_Group(in *userapi.Group, out *userapiv1beta3.Group, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapi.Group))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if in.Users != nil { + out.Users = make([]string, len(in.Users)) + for i := range in.Users { + out.Users[i] = in.Users[i] + } + } else { + out.Users = nil + } + return nil +} + +func convert_api_Group_To_v1beta3_Group(in *userapi.Group, out *userapiv1beta3.Group, s conversion.Scope) error { + return autoconvert_api_Group_To_v1beta3_Group(in, out, s) +} + +func autoconvert_api_GroupList_To_v1beta3_GroupList(in *userapi.GroupList, out *userapiv1beta3.GroupList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapi.GroupList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]userapiv1beta3.Group, len(in.Items)) + for i := range in.Items { + if err := convert_api_Group_To_v1beta3_Group(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_api_GroupList_To_v1beta3_GroupList(in *userapi.GroupList, out *userapiv1beta3.GroupList, s conversion.Scope) error { + return autoconvert_api_GroupList_To_v1beta3_GroupList(in, out, s) +} + +func autoconvert_api_Identity_To_v1beta3_Identity(in *userapi.Identity, out *userapiv1beta3.Identity, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapi.Identity))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } out.ProviderName = in.ProviderName out.ProviderUserName = in.ProviderUserName - if err := convert_v1beta3_ObjectReference_To_api_ObjectReference(&in.User, &out.User, s); err != nil { + if err := convert_api_ObjectReference_To_v1beta3_ObjectReference(&in.User, &out.User, s); err != nil { return err } if in.Extra != nil { @@ -4759,113 +5332,1574 @@ func autoconvert_v1beta3_Identity_To_api_Identity(in *userapiv1beta3.Identity, o out.Extra[key] = val } } else { - out.Extra = nil + out.Extra = nil + } + return nil +} + +func convert_api_Identity_To_v1beta3_Identity(in *userapi.Identity, out *userapiv1beta3.Identity, s conversion.Scope) error { + return autoconvert_api_Identity_To_v1beta3_Identity(in, out, s) +} + +func autoconvert_api_IdentityList_To_v1beta3_IdentityList(in *userapi.IdentityList, out *userapiv1beta3.IdentityList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapi.IdentityList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]userapiv1beta3.Identity, len(in.Items)) + for i := range in.Items { + if err := convert_api_Identity_To_v1beta3_Identity(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_api_IdentityList_To_v1beta3_IdentityList(in *userapi.IdentityList, out *userapiv1beta3.IdentityList, s conversion.Scope) error { + return autoconvert_api_IdentityList_To_v1beta3_IdentityList(in, out, s) +} + +func autoconvert_api_User_To_v1beta3_User(in *userapi.User, out *userapiv1beta3.User, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapi.User))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + out.FullName = in.FullName + if in.Identities != nil { + out.Identities = make([]string, len(in.Identities)) + for i := range in.Identities { + out.Identities[i] = in.Identities[i] + } + } else { + out.Identities = nil + } + if in.Groups != nil { + out.Groups = make([]string, len(in.Groups)) + for i := range in.Groups { + out.Groups[i] = in.Groups[i] + } + } else { + out.Groups = nil + } + return nil +} + +func convert_api_User_To_v1beta3_User(in *userapi.User, out *userapiv1beta3.User, s conversion.Scope) error { + return autoconvert_api_User_To_v1beta3_User(in, out, s) +} + +func autoconvert_api_UserIdentityMapping_To_v1beta3_UserIdentityMapping(in *userapi.UserIdentityMapping, out *userapiv1beta3.UserIdentityMapping, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapi.UserIdentityMapping))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if err := convert_api_ObjectReference_To_v1beta3_ObjectReference(&in.Identity, &out.Identity, s); err != nil { + return err + } + if err := convert_api_ObjectReference_To_v1beta3_ObjectReference(&in.User, &out.User, s); err != nil { + return err + } + return nil +} + +func convert_api_UserIdentityMapping_To_v1beta3_UserIdentityMapping(in *userapi.UserIdentityMapping, out *userapiv1beta3.UserIdentityMapping, s conversion.Scope) error { + return autoconvert_api_UserIdentityMapping_To_v1beta3_UserIdentityMapping(in, out, s) +} + +func autoconvert_api_UserList_To_v1beta3_UserList(in *userapi.UserList, out *userapiv1beta3.UserList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapi.UserList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]userapiv1beta3.User, len(in.Items)) + for i := range in.Items { + if err := convert_api_User_To_v1beta3_User(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_api_UserList_To_v1beta3_UserList(in *userapi.UserList, out *userapiv1beta3.UserList, s conversion.Scope) error { + return autoconvert_api_UserList_To_v1beta3_UserList(in, out, s) +} + +func autoconvert_v1beta3_Group_To_api_Group(in *userapiv1beta3.Group, out *userapi.Group, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapiv1beta3.Group))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if in.Users != nil { + out.Users = make([]string, len(in.Users)) + for i := range in.Users { + out.Users[i] = in.Users[i] + } + } else { + out.Users = nil + } + return nil +} + +func convert_v1beta3_Group_To_api_Group(in *userapiv1beta3.Group, out *userapi.Group, s conversion.Scope) error { + return autoconvert_v1beta3_Group_To_api_Group(in, out, s) +} + +func autoconvert_v1beta3_GroupList_To_api_GroupList(in *userapiv1beta3.GroupList, out *userapi.GroupList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapiv1beta3.GroupList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]userapi.Group, len(in.Items)) + for i := range in.Items { + if err := convert_v1beta3_Group_To_api_Group(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_v1beta3_GroupList_To_api_GroupList(in *userapiv1beta3.GroupList, out *userapi.GroupList, s conversion.Scope) error { + return autoconvert_v1beta3_GroupList_To_api_GroupList(in, out, s) +} + +func autoconvert_v1beta3_Identity_To_api_Identity(in *userapiv1beta3.Identity, out *userapi.Identity, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapiv1beta3.Identity))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + out.ProviderName = in.ProviderName + out.ProviderUserName = in.ProviderUserName + if err := convert_v1beta3_ObjectReference_To_api_ObjectReference(&in.User, &out.User, s); err != nil { + return err + } + if in.Extra != nil { + out.Extra = make(map[string]string) + for key, val := range in.Extra { + out.Extra[key] = val + } + } else { + out.Extra = nil + } + return nil +} + +func convert_v1beta3_Identity_To_api_Identity(in *userapiv1beta3.Identity, out *userapi.Identity, s conversion.Scope) error { + return autoconvert_v1beta3_Identity_To_api_Identity(in, out, s) +} + +func autoconvert_v1beta3_IdentityList_To_api_IdentityList(in *userapiv1beta3.IdentityList, out *userapi.IdentityList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapiv1beta3.IdentityList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]userapi.Identity, len(in.Items)) + for i := range in.Items { + if err := convert_v1beta3_Identity_To_api_Identity(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_v1beta3_IdentityList_To_api_IdentityList(in *userapiv1beta3.IdentityList, out *userapi.IdentityList, s conversion.Scope) error { + return autoconvert_v1beta3_IdentityList_To_api_IdentityList(in, out, s) +} + +func autoconvert_v1beta3_User_To_api_User(in *userapiv1beta3.User, out *userapi.User, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapiv1beta3.User))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + out.FullName = in.FullName + if in.Identities != nil { + out.Identities = make([]string, len(in.Identities)) + for i := range in.Identities { + out.Identities[i] = in.Identities[i] + } + } else { + out.Identities = nil + } + if in.Groups != nil { + out.Groups = make([]string, len(in.Groups)) + for i := range in.Groups { + out.Groups[i] = in.Groups[i] + } + } else { + out.Groups = nil + } + return nil +} + +func convert_v1beta3_User_To_api_User(in *userapiv1beta3.User, out *userapi.User, s conversion.Scope) error { + return autoconvert_v1beta3_User_To_api_User(in, out, s) +} + +func autoconvert_v1beta3_UserIdentityMapping_To_api_UserIdentityMapping(in *userapiv1beta3.UserIdentityMapping, out *userapi.UserIdentityMapping, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapiv1beta3.UserIdentityMapping))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if err := convert_v1beta3_ObjectReference_To_api_ObjectReference(&in.Identity, &out.Identity, s); err != nil { + return err + } + if err := convert_v1beta3_ObjectReference_To_api_ObjectReference(&in.User, &out.User, s); err != nil { + return err + } + return nil +} + +func convert_v1beta3_UserIdentityMapping_To_api_UserIdentityMapping(in *userapiv1beta3.UserIdentityMapping, out *userapi.UserIdentityMapping, s conversion.Scope) error { + return autoconvert_v1beta3_UserIdentityMapping_To_api_UserIdentityMapping(in, out, s) +} + +func autoconvert_v1beta3_UserList_To_api_UserList(in *userapiv1beta3.UserList, out *userapi.UserList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*userapiv1beta3.UserList))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]userapi.User, len(in.Items)) + for i := range in.Items { + if err := convert_v1beta3_User_To_api_User(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_v1beta3_UserList_To_api_UserList(in *userapiv1beta3.UserList, out *userapi.UserList, s conversion.Scope) error { + return autoconvert_v1beta3_UserList_To_api_UserList(in, out, s) +} + +func autoconvert_api_AWSElasticBlockStoreVolumeSource_To_v1beta3_AWSElasticBlockStoreVolumeSource(in *pkgapi.AWSElasticBlockStoreVolumeSource, out *pkgapiv1beta3.AWSElasticBlockStoreVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.AWSElasticBlockStoreVolumeSource))(in) + } + out.VolumeID = in.VolumeID + out.FSType = in.FSType + out.Partition = in.Partition + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_AWSElasticBlockStoreVolumeSource_To_v1beta3_AWSElasticBlockStoreVolumeSource(in *pkgapi.AWSElasticBlockStoreVolumeSource, out *pkgapiv1beta3.AWSElasticBlockStoreVolumeSource, s conversion.Scope) error { + return autoconvert_api_AWSElasticBlockStoreVolumeSource_To_v1beta3_AWSElasticBlockStoreVolumeSource(in, out, s) +} + +func autoconvert_api_Capabilities_To_v1beta3_Capabilities(in *pkgapi.Capabilities, out *pkgapiv1beta3.Capabilities, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.Capabilities))(in) + } + if in.Add != nil { + out.Add = make([]pkgapiv1beta3.Capability, len(in.Add)) + for i := range in.Add { + out.Add[i] = pkgapiv1beta3.Capability(in.Add[i]) + } + } else { + out.Add = nil + } + if in.Drop != nil { + out.Drop = make([]pkgapiv1beta3.Capability, len(in.Drop)) + for i := range in.Drop { + out.Drop[i] = pkgapiv1beta3.Capability(in.Drop[i]) + } + } else { + out.Drop = nil + } + return nil +} + +func convert_api_Capabilities_To_v1beta3_Capabilities(in *pkgapi.Capabilities, out *pkgapiv1beta3.Capabilities, s conversion.Scope) error { + return autoconvert_api_Capabilities_To_v1beta3_Capabilities(in, out, s) +} + +func autoconvert_api_CephFSVolumeSource_To_v1beta3_CephFSVolumeSource(in *pkgapi.CephFSVolumeSource, out *pkgapiv1beta3.CephFSVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.CephFSVolumeSource))(in) + } + if in.Monitors != nil { + out.Monitors = make([]string, len(in.Monitors)) + for i := range in.Monitors { + out.Monitors[i] = in.Monitors[i] + } + } else { + out.Monitors = nil + } + out.User = in.User + out.SecretFile = in.SecretFile + if in.SecretRef != nil { + out.SecretRef = new(pkgapiv1beta3.LocalObjectReference) + if err := convert_api_LocalObjectReference_To_v1beta3_LocalObjectReference(in.SecretRef, out.SecretRef, s); err != nil { + return err + } + } else { + out.SecretRef = nil + } + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_CephFSVolumeSource_To_v1beta3_CephFSVolumeSource(in *pkgapi.CephFSVolumeSource, out *pkgapiv1beta3.CephFSVolumeSource, s conversion.Scope) error { + return autoconvert_api_CephFSVolumeSource_To_v1beta3_CephFSVolumeSource(in, out, s) +} + +func autoconvert_api_CinderVolumeSource_To_v1beta3_CinderVolumeSource(in *pkgapi.CinderVolumeSource, out *pkgapiv1beta3.CinderVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.CinderVolumeSource))(in) + } + out.VolumeID = in.VolumeID + out.FSType = in.FSType + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_CinderVolumeSource_To_v1beta3_CinderVolumeSource(in *pkgapi.CinderVolumeSource, out *pkgapiv1beta3.CinderVolumeSource, s conversion.Scope) error { + return autoconvert_api_CinderVolumeSource_To_v1beta3_CinderVolumeSource(in, out, s) +} + +func autoconvert_api_Container_To_v1beta3_Container(in *pkgapi.Container, out *pkgapiv1beta3.Container, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.Container))(in) + } + out.Name = in.Name + out.Image = in.Image + if in.Command != nil { + out.Command = make([]string, len(in.Command)) + for i := range in.Command { + out.Command[i] = in.Command[i] + } + } else { + out.Command = nil + } + if in.Args != nil { + out.Args = make([]string, len(in.Args)) + for i := range in.Args { + out.Args[i] = in.Args[i] + } + } else { + out.Args = nil + } + out.WorkingDir = in.WorkingDir + if in.Ports != nil { + out.Ports = make([]pkgapiv1beta3.ContainerPort, len(in.Ports)) + for i := range in.Ports { + if err := convert_api_ContainerPort_To_v1beta3_ContainerPort(&in.Ports[i], &out.Ports[i], s); err != nil { + return err + } + } + } else { + out.Ports = nil + } + if in.Env != nil { + out.Env = make([]pkgapiv1beta3.EnvVar, len(in.Env)) + for i := range in.Env { + if err := convert_api_EnvVar_To_v1beta3_EnvVar(&in.Env[i], &out.Env[i], s); err != nil { + return err + } + } + } else { + out.Env = nil + } + if err := convert_api_ResourceRequirements_To_v1beta3_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { + return err + } + if in.VolumeMounts != nil { + out.VolumeMounts = make([]pkgapiv1beta3.VolumeMount, len(in.VolumeMounts)) + for i := range in.VolumeMounts { + if err := convert_api_VolumeMount_To_v1beta3_VolumeMount(&in.VolumeMounts[i], &out.VolumeMounts[i], s); err != nil { + return err + } + } + } else { + out.VolumeMounts = nil + } + if in.LivenessProbe != nil { + out.LivenessProbe = new(pkgapiv1beta3.Probe) + if err := convert_api_Probe_To_v1beta3_Probe(in.LivenessProbe, out.LivenessProbe, s); err != nil { + return err + } + } else { + out.LivenessProbe = nil + } + if in.ReadinessProbe != nil { + out.ReadinessProbe = new(pkgapiv1beta3.Probe) + if err := convert_api_Probe_To_v1beta3_Probe(in.ReadinessProbe, out.ReadinessProbe, s); err != nil { + return err + } + } else { + out.ReadinessProbe = nil + } + if in.Lifecycle != nil { + out.Lifecycle = new(pkgapiv1beta3.Lifecycle) + if err := convert_api_Lifecycle_To_v1beta3_Lifecycle(in.Lifecycle, out.Lifecycle, s); err != nil { + return err + } + } else { + out.Lifecycle = nil + } + out.TerminationMessagePath = in.TerminationMessagePath + out.ImagePullPolicy = pkgapiv1beta3.PullPolicy(in.ImagePullPolicy) + if in.SecurityContext != nil { + out.SecurityContext = new(pkgapiv1beta3.SecurityContext) + if err := convert_api_SecurityContext_To_v1beta3_SecurityContext(in.SecurityContext, out.SecurityContext, s); err != nil { + return err + } + } else { + out.SecurityContext = nil + } + out.Stdin = in.Stdin + out.StdinOnce = in.StdinOnce + out.TTY = in.TTY + return nil +} + +func autoconvert_api_ContainerPort_To_v1beta3_ContainerPort(in *pkgapi.ContainerPort, out *pkgapiv1beta3.ContainerPort, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.ContainerPort))(in) + } + out.Name = in.Name + out.HostPort = in.HostPort + out.ContainerPort = in.ContainerPort + out.Protocol = pkgapiv1beta3.Protocol(in.Protocol) + out.HostIP = in.HostIP + return nil +} + +func convert_api_ContainerPort_To_v1beta3_ContainerPort(in *pkgapi.ContainerPort, out *pkgapiv1beta3.ContainerPort, s conversion.Scope) error { + return autoconvert_api_ContainerPort_To_v1beta3_ContainerPort(in, out, s) +} + +func autoconvert_api_DownwardAPIVolumeFile_To_v1beta3_DownwardAPIVolumeFile(in *pkgapi.DownwardAPIVolumeFile, out *pkgapiv1beta3.DownwardAPIVolumeFile, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.DownwardAPIVolumeFile))(in) + } + out.Path = in.Path + if err := convert_api_ObjectFieldSelector_To_v1beta3_ObjectFieldSelector(&in.FieldRef, &out.FieldRef, s); err != nil { + return err + } + return nil +} + +func convert_api_DownwardAPIVolumeFile_To_v1beta3_DownwardAPIVolumeFile(in *pkgapi.DownwardAPIVolumeFile, out *pkgapiv1beta3.DownwardAPIVolumeFile, s conversion.Scope) error { + return autoconvert_api_DownwardAPIVolumeFile_To_v1beta3_DownwardAPIVolumeFile(in, out, s) +} + +func autoconvert_api_DownwardAPIVolumeSource_To_v1beta3_DownwardAPIVolumeSource(in *pkgapi.DownwardAPIVolumeSource, out *pkgapiv1beta3.DownwardAPIVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.DownwardAPIVolumeSource))(in) + } + if in.Items != nil { + out.Items = make([]pkgapiv1beta3.DownwardAPIVolumeFile, len(in.Items)) + for i := range in.Items { + if err := convert_api_DownwardAPIVolumeFile_To_v1beta3_DownwardAPIVolumeFile(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_api_DownwardAPIVolumeSource_To_v1beta3_DownwardAPIVolumeSource(in *pkgapi.DownwardAPIVolumeSource, out *pkgapiv1beta3.DownwardAPIVolumeSource, s conversion.Scope) error { + return autoconvert_api_DownwardAPIVolumeSource_To_v1beta3_DownwardAPIVolumeSource(in, out, s) +} + +func autoconvert_api_EmptyDirVolumeSource_To_v1beta3_EmptyDirVolumeSource(in *pkgapi.EmptyDirVolumeSource, out *pkgapiv1beta3.EmptyDirVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.EmptyDirVolumeSource))(in) + } + out.Medium = pkgapiv1beta3.StorageMedium(in.Medium) + return nil +} + +func convert_api_EmptyDirVolumeSource_To_v1beta3_EmptyDirVolumeSource(in *pkgapi.EmptyDirVolumeSource, out *pkgapiv1beta3.EmptyDirVolumeSource, s conversion.Scope) error { + return autoconvert_api_EmptyDirVolumeSource_To_v1beta3_EmptyDirVolumeSource(in, out, s) +} + +func autoconvert_api_EnvVar_To_v1beta3_EnvVar(in *pkgapi.EnvVar, out *pkgapiv1beta3.EnvVar, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.EnvVar))(in) + } + out.Name = in.Name + out.Value = in.Value + if in.ValueFrom != nil { + out.ValueFrom = new(pkgapiv1beta3.EnvVarSource) + if err := convert_api_EnvVarSource_To_v1beta3_EnvVarSource(in.ValueFrom, out.ValueFrom, s); err != nil { + return err + } + } else { + out.ValueFrom = nil + } + return nil +} + +func convert_api_EnvVar_To_v1beta3_EnvVar(in *pkgapi.EnvVar, out *pkgapiv1beta3.EnvVar, s conversion.Scope) error { + return autoconvert_api_EnvVar_To_v1beta3_EnvVar(in, out, s) +} + +func autoconvert_api_EnvVarSource_To_v1beta3_EnvVarSource(in *pkgapi.EnvVarSource, out *pkgapiv1beta3.EnvVarSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.EnvVarSource))(in) + } + if in.FieldRef != nil { + out.FieldRef = new(pkgapiv1beta3.ObjectFieldSelector) + if err := convert_api_ObjectFieldSelector_To_v1beta3_ObjectFieldSelector(in.FieldRef, out.FieldRef, s); err != nil { + return err + } + } else { + out.FieldRef = nil + } + return nil +} + +func convert_api_EnvVarSource_To_v1beta3_EnvVarSource(in *pkgapi.EnvVarSource, out *pkgapiv1beta3.EnvVarSource, s conversion.Scope) error { + return autoconvert_api_EnvVarSource_To_v1beta3_EnvVarSource(in, out, s) +} + +func autoconvert_api_ExecAction_To_v1beta3_ExecAction(in *pkgapi.ExecAction, out *pkgapiv1beta3.ExecAction, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.ExecAction))(in) + } + if in.Command != nil { + out.Command = make([]string, len(in.Command)) + for i := range in.Command { + out.Command[i] = in.Command[i] + } + } else { + out.Command = nil + } + return nil +} + +func convert_api_ExecAction_To_v1beta3_ExecAction(in *pkgapi.ExecAction, out *pkgapiv1beta3.ExecAction, s conversion.Scope) error { + return autoconvert_api_ExecAction_To_v1beta3_ExecAction(in, out, s) +} + +func autoconvert_api_FCVolumeSource_To_v1beta3_FCVolumeSource(in *pkgapi.FCVolumeSource, out *pkgapiv1beta3.FCVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.FCVolumeSource))(in) + } + if in.TargetWWNs != nil { + out.TargetWWNs = make([]string, len(in.TargetWWNs)) + for i := range in.TargetWWNs { + out.TargetWWNs[i] = in.TargetWWNs[i] + } + } else { + out.TargetWWNs = nil + } + if in.Lun != nil { + out.Lun = new(int) + *out.Lun = *in.Lun + } else { + out.Lun = nil + } + out.FSType = in.FSType + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_FCVolumeSource_To_v1beta3_FCVolumeSource(in *pkgapi.FCVolumeSource, out *pkgapiv1beta3.FCVolumeSource, s conversion.Scope) error { + return autoconvert_api_FCVolumeSource_To_v1beta3_FCVolumeSource(in, out, s) +} + +func autoconvert_api_FlockerVolumeSource_To_v1beta3_FlockerVolumeSource(in *pkgapi.FlockerVolumeSource, out *pkgapiv1beta3.FlockerVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.FlockerVolumeSource))(in) + } + out.DatasetName = in.DatasetName + return nil +} + +func convert_api_FlockerVolumeSource_To_v1beta3_FlockerVolumeSource(in *pkgapi.FlockerVolumeSource, out *pkgapiv1beta3.FlockerVolumeSource, s conversion.Scope) error { + return autoconvert_api_FlockerVolumeSource_To_v1beta3_FlockerVolumeSource(in, out, s) +} + +func autoconvert_api_GCEPersistentDiskVolumeSource_To_v1beta3_GCEPersistentDiskVolumeSource(in *pkgapi.GCEPersistentDiskVolumeSource, out *pkgapiv1beta3.GCEPersistentDiskVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.GCEPersistentDiskVolumeSource))(in) + } + out.PDName = in.PDName + out.FSType = in.FSType + out.Partition = in.Partition + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_GCEPersistentDiskVolumeSource_To_v1beta3_GCEPersistentDiskVolumeSource(in *pkgapi.GCEPersistentDiskVolumeSource, out *pkgapiv1beta3.GCEPersistentDiskVolumeSource, s conversion.Scope) error { + return autoconvert_api_GCEPersistentDiskVolumeSource_To_v1beta3_GCEPersistentDiskVolumeSource(in, out, s) +} + +func autoconvert_api_GitRepoVolumeSource_To_v1beta3_GitRepoVolumeSource(in *pkgapi.GitRepoVolumeSource, out *pkgapiv1beta3.GitRepoVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.GitRepoVolumeSource))(in) + } + out.Repository = in.Repository + out.Revision = in.Revision + return nil +} + +func convert_api_GitRepoVolumeSource_To_v1beta3_GitRepoVolumeSource(in *pkgapi.GitRepoVolumeSource, out *pkgapiv1beta3.GitRepoVolumeSource, s conversion.Scope) error { + return autoconvert_api_GitRepoVolumeSource_To_v1beta3_GitRepoVolumeSource(in, out, s) +} + +func autoconvert_api_GlusterfsVolumeSource_To_v1beta3_GlusterfsVolumeSource(in *pkgapi.GlusterfsVolumeSource, out *pkgapiv1beta3.GlusterfsVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.GlusterfsVolumeSource))(in) + } + out.EndpointsName = in.EndpointsName + out.Path = in.Path + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_GlusterfsVolumeSource_To_v1beta3_GlusterfsVolumeSource(in *pkgapi.GlusterfsVolumeSource, out *pkgapiv1beta3.GlusterfsVolumeSource, s conversion.Scope) error { + return autoconvert_api_GlusterfsVolumeSource_To_v1beta3_GlusterfsVolumeSource(in, out, s) +} + +func autoconvert_api_HTTPGetAction_To_v1beta3_HTTPGetAction(in *pkgapi.HTTPGetAction, out *pkgapiv1beta3.HTTPGetAction, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.HTTPGetAction))(in) + } + out.Path = in.Path + if err := s.Convert(&in.Port, &out.Port, 0); err != nil { + return err + } + out.Host = in.Host + out.Scheme = pkgapiv1beta3.URIScheme(in.Scheme) + return nil +} + +func convert_api_HTTPGetAction_To_v1beta3_HTTPGetAction(in *pkgapi.HTTPGetAction, out *pkgapiv1beta3.HTTPGetAction, s conversion.Scope) error { + return autoconvert_api_HTTPGetAction_To_v1beta3_HTTPGetAction(in, out, s) +} + +func autoconvert_api_Handler_To_v1beta3_Handler(in *pkgapi.Handler, out *pkgapiv1beta3.Handler, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.Handler))(in) + } + if in.Exec != nil { + out.Exec = new(pkgapiv1beta3.ExecAction) + if err := convert_api_ExecAction_To_v1beta3_ExecAction(in.Exec, out.Exec, s); err != nil { + return err + } + } else { + out.Exec = nil + } + if in.HTTPGet != nil { + out.HTTPGet = new(pkgapiv1beta3.HTTPGetAction) + if err := convert_api_HTTPGetAction_To_v1beta3_HTTPGetAction(in.HTTPGet, out.HTTPGet, s); err != nil { + return err + } + } else { + out.HTTPGet = nil + } + if in.TCPSocket != nil { + out.TCPSocket = new(pkgapiv1beta3.TCPSocketAction) + if err := convert_api_TCPSocketAction_To_v1beta3_TCPSocketAction(in.TCPSocket, out.TCPSocket, s); err != nil { + return err + } + } else { + out.TCPSocket = nil + } + return nil +} + +func convert_api_Handler_To_v1beta3_Handler(in *pkgapi.Handler, out *pkgapiv1beta3.Handler, s conversion.Scope) error { + return autoconvert_api_Handler_To_v1beta3_Handler(in, out, s) +} + +func autoconvert_api_HostPathVolumeSource_To_v1beta3_HostPathVolumeSource(in *pkgapi.HostPathVolumeSource, out *pkgapiv1beta3.HostPathVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.HostPathVolumeSource))(in) + } + out.Path = in.Path + return nil +} + +func convert_api_HostPathVolumeSource_To_v1beta3_HostPathVolumeSource(in *pkgapi.HostPathVolumeSource, out *pkgapiv1beta3.HostPathVolumeSource, s conversion.Scope) error { + return autoconvert_api_HostPathVolumeSource_To_v1beta3_HostPathVolumeSource(in, out, s) +} + +func autoconvert_api_ISCSIVolumeSource_To_v1beta3_ISCSIVolumeSource(in *pkgapi.ISCSIVolumeSource, out *pkgapiv1beta3.ISCSIVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.ISCSIVolumeSource))(in) + } + out.TargetPortal = in.TargetPortal + out.IQN = in.IQN + out.Lun = in.Lun + out.FSType = in.FSType + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_ISCSIVolumeSource_To_v1beta3_ISCSIVolumeSource(in *pkgapi.ISCSIVolumeSource, out *pkgapiv1beta3.ISCSIVolumeSource, s conversion.Scope) error { + return autoconvert_api_ISCSIVolumeSource_To_v1beta3_ISCSIVolumeSource(in, out, s) +} + +func autoconvert_api_Lifecycle_To_v1beta3_Lifecycle(in *pkgapi.Lifecycle, out *pkgapiv1beta3.Lifecycle, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.Lifecycle))(in) + } + if in.PostStart != nil { + out.PostStart = new(pkgapiv1beta3.Handler) + if err := convert_api_Handler_To_v1beta3_Handler(in.PostStart, out.PostStart, s); err != nil { + return err + } + } else { + out.PostStart = nil + } + if in.PreStop != nil { + out.PreStop = new(pkgapiv1beta3.Handler) + if err := convert_api_Handler_To_v1beta3_Handler(in.PreStop, out.PreStop, s); err != nil { + return err + } + } else { + out.PreStop = nil + } + return nil +} + +func convert_api_Lifecycle_To_v1beta3_Lifecycle(in *pkgapi.Lifecycle, out *pkgapiv1beta3.Lifecycle, s conversion.Scope) error { + return autoconvert_api_Lifecycle_To_v1beta3_Lifecycle(in, out, s) +} + +func autoconvert_api_LocalObjectReference_To_v1beta3_LocalObjectReference(in *pkgapi.LocalObjectReference, out *pkgapiv1beta3.LocalObjectReference, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.LocalObjectReference))(in) + } + out.Name = in.Name + return nil +} + +func convert_api_LocalObjectReference_To_v1beta3_LocalObjectReference(in *pkgapi.LocalObjectReference, out *pkgapiv1beta3.LocalObjectReference, s conversion.Scope) error { + return autoconvert_api_LocalObjectReference_To_v1beta3_LocalObjectReference(in, out, s) +} + +func autoconvert_api_NFSVolumeSource_To_v1beta3_NFSVolumeSource(in *pkgapi.NFSVolumeSource, out *pkgapiv1beta3.NFSVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.NFSVolumeSource))(in) + } + out.Server = in.Server + out.Path = in.Path + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_NFSVolumeSource_To_v1beta3_NFSVolumeSource(in *pkgapi.NFSVolumeSource, out *pkgapiv1beta3.NFSVolumeSource, s conversion.Scope) error { + return autoconvert_api_NFSVolumeSource_To_v1beta3_NFSVolumeSource(in, out, s) +} + +func autoconvert_api_ObjectFieldSelector_To_v1beta3_ObjectFieldSelector(in *pkgapi.ObjectFieldSelector, out *pkgapiv1beta3.ObjectFieldSelector, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.ObjectFieldSelector))(in) + } + out.APIVersion = in.APIVersion + out.FieldPath = in.FieldPath + return nil +} + +func convert_api_ObjectFieldSelector_To_v1beta3_ObjectFieldSelector(in *pkgapi.ObjectFieldSelector, out *pkgapiv1beta3.ObjectFieldSelector, s conversion.Scope) error { + return autoconvert_api_ObjectFieldSelector_To_v1beta3_ObjectFieldSelector(in, out, s) +} + +func autoconvert_api_ObjectMeta_To_v1beta3_ObjectMeta(in *pkgapi.ObjectMeta, out *pkgapiv1beta3.ObjectMeta, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.ObjectMeta))(in) + } + out.Name = in.Name + out.GenerateName = in.GenerateName + out.Namespace = in.Namespace + out.SelfLink = in.SelfLink + out.UID = in.UID + out.ResourceVersion = in.ResourceVersion + out.Generation = in.Generation + if err := s.Convert(&in.CreationTimestamp, &out.CreationTimestamp, 0); err != nil { + return err + } + if in.DeletionTimestamp != nil { + if err := s.Convert(&in.DeletionTimestamp, &out.DeletionTimestamp, 0); err != nil { + return err + } + } else { + out.DeletionTimestamp = nil + } + if in.DeletionGracePeriodSeconds != nil { + out.DeletionGracePeriodSeconds = new(int64) + *out.DeletionGracePeriodSeconds = *in.DeletionGracePeriodSeconds + } else { + out.DeletionGracePeriodSeconds = nil + } + if in.Labels != nil { + out.Labels = make(map[string]string) + for key, val := range in.Labels { + out.Labels[key] = val + } + } else { + out.Labels = nil + } + if in.Annotations != nil { + out.Annotations = make(map[string]string) + for key, val := range in.Annotations { + out.Annotations[key] = val + } + } else { + out.Annotations = nil + } + return nil +} + +func convert_api_ObjectMeta_To_v1beta3_ObjectMeta(in *pkgapi.ObjectMeta, out *pkgapiv1beta3.ObjectMeta, s conversion.Scope) error { + return autoconvert_api_ObjectMeta_To_v1beta3_ObjectMeta(in, out, s) +} + +func autoconvert_api_ObjectReference_To_v1beta3_ObjectReference(in *pkgapi.ObjectReference, out *pkgapiv1beta3.ObjectReference, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.ObjectReference))(in) + } + out.Kind = in.Kind + out.Namespace = in.Namespace + out.Name = in.Name + out.UID = in.UID + out.APIVersion = in.APIVersion + out.ResourceVersion = in.ResourceVersion + out.FieldPath = in.FieldPath + return nil +} + +func convert_api_ObjectReference_To_v1beta3_ObjectReference(in *pkgapi.ObjectReference, out *pkgapiv1beta3.ObjectReference, s conversion.Scope) error { + return autoconvert_api_ObjectReference_To_v1beta3_ObjectReference(in, out, s) +} + +func autoconvert_api_PersistentVolumeClaimVolumeSource_To_v1beta3_PersistentVolumeClaimVolumeSource(in *pkgapi.PersistentVolumeClaimVolumeSource, out *pkgapiv1beta3.PersistentVolumeClaimVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.PersistentVolumeClaimVolumeSource))(in) + } + out.ClaimName = in.ClaimName + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_PersistentVolumeClaimVolumeSource_To_v1beta3_PersistentVolumeClaimVolumeSource(in *pkgapi.PersistentVolumeClaimVolumeSource, out *pkgapiv1beta3.PersistentVolumeClaimVolumeSource, s conversion.Scope) error { + return autoconvert_api_PersistentVolumeClaimVolumeSource_To_v1beta3_PersistentVolumeClaimVolumeSource(in, out, s) +} + +func autoconvert_api_PodSpec_To_v1beta3_PodSpec(in *pkgapi.PodSpec, out *pkgapiv1beta3.PodSpec, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.PodSpec))(in) + } + if in.Volumes != nil { + out.Volumes = make([]pkgapiv1beta3.Volume, len(in.Volumes)) + for i := range in.Volumes { + if err := convert_api_Volume_To_v1beta3_Volume(&in.Volumes[i], &out.Volumes[i], s); err != nil { + return err + } + } + } else { + out.Volumes = nil + } + if in.Containers != nil { + out.Containers = make([]pkgapiv1beta3.Container, len(in.Containers)) + for i := range in.Containers { + if err := s.Convert(&in.Containers[i], &out.Containers[i], 0); err != nil { + return err + } + } + } else { + out.Containers = nil + } + out.RestartPolicy = pkgapiv1beta3.RestartPolicy(in.RestartPolicy) + if in.TerminationGracePeriodSeconds != nil { + out.TerminationGracePeriodSeconds = new(int64) + *out.TerminationGracePeriodSeconds = *in.TerminationGracePeriodSeconds + } else { + out.TerminationGracePeriodSeconds = nil + } + if in.ActiveDeadlineSeconds != nil { + out.ActiveDeadlineSeconds = new(int64) + *out.ActiveDeadlineSeconds = *in.ActiveDeadlineSeconds + } else { + out.ActiveDeadlineSeconds = nil + } + out.DNSPolicy = pkgapiv1beta3.DNSPolicy(in.DNSPolicy) + if in.NodeSelector != nil { + out.NodeSelector = make(map[string]string) + for key, val := range in.NodeSelector { + out.NodeSelector[key] = val + } + } else { + out.NodeSelector = nil + } + // in.ServiceAccountName has no peer in out + // in.NodeName has no peer in out + if in.SecurityContext != nil { + if err := s.Convert(&in.SecurityContext, &out.SecurityContext, 0); err != nil { + return err + } + } else { + out.SecurityContext = nil + } + if in.ImagePullSecrets != nil { + out.ImagePullSecrets = make([]pkgapiv1beta3.LocalObjectReference, len(in.ImagePullSecrets)) + for i := range in.ImagePullSecrets { + if err := convert_api_LocalObjectReference_To_v1beta3_LocalObjectReference(&in.ImagePullSecrets[i], &out.ImagePullSecrets[i], s); err != nil { + return err + } + } + } else { + out.ImagePullSecrets = nil + } + return nil +} + +func autoconvert_api_PodTemplateSpec_To_v1beta3_PodTemplateSpec(in *pkgapi.PodTemplateSpec, out *pkgapiv1beta3.PodTemplateSpec, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.PodTemplateSpec))(in) + } + if err := convert_api_ObjectMeta_To_v1beta3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil { + return err + } + return nil +} + +func convert_api_PodTemplateSpec_To_v1beta3_PodTemplateSpec(in *pkgapi.PodTemplateSpec, out *pkgapiv1beta3.PodTemplateSpec, s conversion.Scope) error { + return autoconvert_api_PodTemplateSpec_To_v1beta3_PodTemplateSpec(in, out, s) +} + +func autoconvert_api_Probe_To_v1beta3_Probe(in *pkgapi.Probe, out *pkgapiv1beta3.Probe, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.Probe))(in) + } + if err := convert_api_Handler_To_v1beta3_Handler(&in.Handler, &out.Handler, s); err != nil { + return err + } + out.InitialDelaySeconds = in.InitialDelaySeconds + out.TimeoutSeconds = in.TimeoutSeconds + return nil +} + +func convert_api_Probe_To_v1beta3_Probe(in *pkgapi.Probe, out *pkgapiv1beta3.Probe, s conversion.Scope) error { + return autoconvert_api_Probe_To_v1beta3_Probe(in, out, s) +} + +func autoconvert_api_RBDVolumeSource_To_v1beta3_RBDVolumeSource(in *pkgapi.RBDVolumeSource, out *pkgapiv1beta3.RBDVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.RBDVolumeSource))(in) + } + if in.CephMonitors != nil { + out.CephMonitors = make([]string, len(in.CephMonitors)) + for i := range in.CephMonitors { + out.CephMonitors[i] = in.CephMonitors[i] + } + } else { + out.CephMonitors = nil + } + out.RBDImage = in.RBDImage + out.FSType = in.FSType + out.RBDPool = in.RBDPool + out.RadosUser = in.RadosUser + out.Keyring = in.Keyring + if in.SecretRef != nil { + out.SecretRef = new(pkgapiv1beta3.LocalObjectReference) + if err := convert_api_LocalObjectReference_To_v1beta3_LocalObjectReference(in.SecretRef, out.SecretRef, s); err != nil { + return err + } + } else { + out.SecretRef = nil + } + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_api_RBDVolumeSource_To_v1beta3_RBDVolumeSource(in *pkgapi.RBDVolumeSource, out *pkgapiv1beta3.RBDVolumeSource, s conversion.Scope) error { + return autoconvert_api_RBDVolumeSource_To_v1beta3_RBDVolumeSource(in, out, s) +} + +func autoconvert_api_ResourceRequirements_To_v1beta3_ResourceRequirements(in *pkgapi.ResourceRequirements, out *pkgapiv1beta3.ResourceRequirements, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.ResourceRequirements))(in) + } + if in.Limits != nil { + out.Limits = make(pkgapiv1beta3.ResourceList) + for key, val := range in.Limits { + newVal := resource.Quantity{} + if err := s.Convert(&val, &newVal, 0); err != nil { + return err + } + out.Limits[pkgapiv1beta3.ResourceName(key)] = newVal + } + } else { + out.Limits = nil + } + if in.Requests != nil { + out.Requests = make(pkgapiv1beta3.ResourceList) + for key, val := range in.Requests { + newVal := resource.Quantity{} + if err := s.Convert(&val, &newVal, 0); err != nil { + return err + } + out.Requests[pkgapiv1beta3.ResourceName(key)] = newVal + } + } else { + out.Requests = nil + } + return nil +} + +func convert_api_ResourceRequirements_To_v1beta3_ResourceRequirements(in *pkgapi.ResourceRequirements, out *pkgapiv1beta3.ResourceRequirements, s conversion.Scope) error { + return autoconvert_api_ResourceRequirements_To_v1beta3_ResourceRequirements(in, out, s) +} + +func autoconvert_api_SELinuxOptions_To_v1beta3_SELinuxOptions(in *pkgapi.SELinuxOptions, out *pkgapiv1beta3.SELinuxOptions, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.SELinuxOptions))(in) + } + out.User = in.User + out.Role = in.Role + out.Type = in.Type + out.Level = in.Level + return nil +} + +func convert_api_SELinuxOptions_To_v1beta3_SELinuxOptions(in *pkgapi.SELinuxOptions, out *pkgapiv1beta3.SELinuxOptions, s conversion.Scope) error { + return autoconvert_api_SELinuxOptions_To_v1beta3_SELinuxOptions(in, out, s) +} + +func autoconvert_api_SecretVolumeSource_To_v1beta3_SecretVolumeSource(in *pkgapi.SecretVolumeSource, out *pkgapiv1beta3.SecretVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.SecretVolumeSource))(in) + } + out.SecretName = in.SecretName + return nil +} + +func convert_api_SecretVolumeSource_To_v1beta3_SecretVolumeSource(in *pkgapi.SecretVolumeSource, out *pkgapiv1beta3.SecretVolumeSource, s conversion.Scope) error { + return autoconvert_api_SecretVolumeSource_To_v1beta3_SecretVolumeSource(in, out, s) +} + +func autoconvert_api_SecurityContext_To_v1beta3_SecurityContext(in *pkgapi.SecurityContext, out *pkgapiv1beta3.SecurityContext, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.SecurityContext))(in) + } + if in.Capabilities != nil { + out.Capabilities = new(pkgapiv1beta3.Capabilities) + if err := convert_api_Capabilities_To_v1beta3_Capabilities(in.Capabilities, out.Capabilities, s); err != nil { + return err + } + } else { + out.Capabilities = nil + } + if in.Privileged != nil { + out.Privileged = new(bool) + *out.Privileged = *in.Privileged + } else { + out.Privileged = nil + } + if in.SELinuxOptions != nil { + out.SELinuxOptions = new(pkgapiv1beta3.SELinuxOptions) + if err := convert_api_SELinuxOptions_To_v1beta3_SELinuxOptions(in.SELinuxOptions, out.SELinuxOptions, s); err != nil { + return err + } + } else { + out.SELinuxOptions = nil + } + if in.RunAsUser != nil { + out.RunAsUser = new(int64) + *out.RunAsUser = *in.RunAsUser + } else { + out.RunAsUser = nil + } + if in.RunAsNonRoot != nil { + out.RunAsNonRoot = new(bool) + *out.RunAsNonRoot = *in.RunAsNonRoot + } else { + out.RunAsNonRoot = nil + } + return nil +} + +func convert_api_SecurityContext_To_v1beta3_SecurityContext(in *pkgapi.SecurityContext, out *pkgapiv1beta3.SecurityContext, s conversion.Scope) error { + return autoconvert_api_SecurityContext_To_v1beta3_SecurityContext(in, out, s) +} + +func autoconvert_api_TCPSocketAction_To_v1beta3_TCPSocketAction(in *pkgapi.TCPSocketAction, out *pkgapiv1beta3.TCPSocketAction, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.TCPSocketAction))(in) + } + if err := s.Convert(&in.Port, &out.Port, 0); err != nil { + return err + } + return nil +} + +func convert_api_TCPSocketAction_To_v1beta3_TCPSocketAction(in *pkgapi.TCPSocketAction, out *pkgapiv1beta3.TCPSocketAction, s conversion.Scope) error { + return autoconvert_api_TCPSocketAction_To_v1beta3_TCPSocketAction(in, out, s) +} + +func autoconvert_api_Volume_To_v1beta3_Volume(in *pkgapi.Volume, out *pkgapiv1beta3.Volume, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.Volume))(in) + } + out.Name = in.Name + if err := s.Convert(&in.VolumeSource, &out.VolumeSource, 0); err != nil { + return err + } + return nil +} + +func convert_api_Volume_To_v1beta3_Volume(in *pkgapi.Volume, out *pkgapiv1beta3.Volume, s conversion.Scope) error { + return autoconvert_api_Volume_To_v1beta3_Volume(in, out, s) +} + +func autoconvert_api_VolumeMount_To_v1beta3_VolumeMount(in *pkgapi.VolumeMount, out *pkgapiv1beta3.VolumeMount, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.VolumeMount))(in) + } + out.Name = in.Name + out.ReadOnly = in.ReadOnly + out.MountPath = in.MountPath + return nil +} + +func convert_api_VolumeMount_To_v1beta3_VolumeMount(in *pkgapi.VolumeMount, out *pkgapiv1beta3.VolumeMount, s conversion.Scope) error { + return autoconvert_api_VolumeMount_To_v1beta3_VolumeMount(in, out, s) +} + +func autoconvert_api_VolumeSource_To_v1beta3_VolumeSource(in *pkgapi.VolumeSource, out *pkgapiv1beta3.VolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapi.VolumeSource))(in) + } + if in.HostPath != nil { + out.HostPath = new(pkgapiv1beta3.HostPathVolumeSource) + if err := convert_api_HostPathVolumeSource_To_v1beta3_HostPathVolumeSource(in.HostPath, out.HostPath, s); err != nil { + return err + } + } else { + out.HostPath = nil + } + if in.EmptyDir != nil { + out.EmptyDir = new(pkgapiv1beta3.EmptyDirVolumeSource) + if err := convert_api_EmptyDirVolumeSource_To_v1beta3_EmptyDirVolumeSource(in.EmptyDir, out.EmptyDir, s); err != nil { + return err + } + } else { + out.EmptyDir = nil + } + if in.GCEPersistentDisk != nil { + out.GCEPersistentDisk = new(pkgapiv1beta3.GCEPersistentDiskVolumeSource) + if err := convert_api_GCEPersistentDiskVolumeSource_To_v1beta3_GCEPersistentDiskVolumeSource(in.GCEPersistentDisk, out.GCEPersistentDisk, s); err != nil { + return err + } + } else { + out.GCEPersistentDisk = nil + } + if in.AWSElasticBlockStore != nil { + out.AWSElasticBlockStore = new(pkgapiv1beta3.AWSElasticBlockStoreVolumeSource) + if err := convert_api_AWSElasticBlockStoreVolumeSource_To_v1beta3_AWSElasticBlockStoreVolumeSource(in.AWSElasticBlockStore, out.AWSElasticBlockStore, s); err != nil { + return err + } + } else { + out.AWSElasticBlockStore = nil + } + if in.GitRepo != nil { + out.GitRepo = new(pkgapiv1beta3.GitRepoVolumeSource) + if err := convert_api_GitRepoVolumeSource_To_v1beta3_GitRepoVolumeSource(in.GitRepo, out.GitRepo, s); err != nil { + return err + } + } else { + out.GitRepo = nil + } + if in.Secret != nil { + out.Secret = new(pkgapiv1beta3.SecretVolumeSource) + if err := convert_api_SecretVolumeSource_To_v1beta3_SecretVolumeSource(in.Secret, out.Secret, s); err != nil { + return err + } + } else { + out.Secret = nil + } + if in.NFS != nil { + out.NFS = new(pkgapiv1beta3.NFSVolumeSource) + if err := convert_api_NFSVolumeSource_To_v1beta3_NFSVolumeSource(in.NFS, out.NFS, s); err != nil { + return err + } + } else { + out.NFS = nil + } + if in.ISCSI != nil { + out.ISCSI = new(pkgapiv1beta3.ISCSIVolumeSource) + if err := convert_api_ISCSIVolumeSource_To_v1beta3_ISCSIVolumeSource(in.ISCSI, out.ISCSI, s); err != nil { + return err + } + } else { + out.ISCSI = nil + } + if in.Glusterfs != nil { + out.Glusterfs = new(pkgapiv1beta3.GlusterfsVolumeSource) + if err := convert_api_GlusterfsVolumeSource_To_v1beta3_GlusterfsVolumeSource(in.Glusterfs, out.Glusterfs, s); err != nil { + return err + } + } else { + out.Glusterfs = nil + } + if in.PersistentVolumeClaim != nil { + out.PersistentVolumeClaim = new(pkgapiv1beta3.PersistentVolumeClaimVolumeSource) + if err := convert_api_PersistentVolumeClaimVolumeSource_To_v1beta3_PersistentVolumeClaimVolumeSource(in.PersistentVolumeClaim, out.PersistentVolumeClaim, s); err != nil { + return err + } + } else { + out.PersistentVolumeClaim = nil + } + if in.RBD != nil { + out.RBD = new(pkgapiv1beta3.RBDVolumeSource) + if err := convert_api_RBDVolumeSource_To_v1beta3_RBDVolumeSource(in.RBD, out.RBD, s); err != nil { + return err + } + } else { + out.RBD = nil + } + if in.Cinder != nil { + out.Cinder = new(pkgapiv1beta3.CinderVolumeSource) + if err := convert_api_CinderVolumeSource_To_v1beta3_CinderVolumeSource(in.Cinder, out.Cinder, s); err != nil { + return err + } + } else { + out.Cinder = nil + } + if in.CephFS != nil { + out.CephFS = new(pkgapiv1beta3.CephFSVolumeSource) + if err := convert_api_CephFSVolumeSource_To_v1beta3_CephFSVolumeSource(in.CephFS, out.CephFS, s); err != nil { + return err + } + } else { + out.CephFS = nil + } + if in.Flocker != nil { + out.Flocker = new(pkgapiv1beta3.FlockerVolumeSource) + if err := convert_api_FlockerVolumeSource_To_v1beta3_FlockerVolumeSource(in.Flocker, out.Flocker, s); err != nil { + return err + } + } else { + out.Flocker = nil + } + if in.DownwardAPI != nil { + out.DownwardAPI = new(pkgapiv1beta3.DownwardAPIVolumeSource) + if err := convert_api_DownwardAPIVolumeSource_To_v1beta3_DownwardAPIVolumeSource(in.DownwardAPI, out.DownwardAPI, s); err != nil { + return err + } + } else { + out.DownwardAPI = nil + } + if in.FC != nil { + out.FC = new(pkgapiv1beta3.FCVolumeSource) + if err := convert_api_FCVolumeSource_To_v1beta3_FCVolumeSource(in.FC, out.FC, s); err != nil { + return err + } + } else { + out.FC = nil + } + return nil +} + +func autoconvert_v1beta3_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource(in *pkgapiv1beta3.AWSElasticBlockStoreVolumeSource, out *pkgapi.AWSElasticBlockStoreVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.AWSElasticBlockStoreVolumeSource))(in) + } + out.VolumeID = in.VolumeID + out.FSType = in.FSType + out.Partition = in.Partition + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_v1beta3_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource(in *pkgapiv1beta3.AWSElasticBlockStoreVolumeSource, out *pkgapi.AWSElasticBlockStoreVolumeSource, s conversion.Scope) error { + return autoconvert_v1beta3_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource(in, out, s) +} + +func autoconvert_v1beta3_Capabilities_To_api_Capabilities(in *pkgapiv1beta3.Capabilities, out *pkgapi.Capabilities, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.Capabilities))(in) + } + if in.Add != nil { + out.Add = make([]pkgapi.Capability, len(in.Add)) + for i := range in.Add { + out.Add[i] = pkgapi.Capability(in.Add[i]) + } + } else { + out.Add = nil + } + if in.Drop != nil { + out.Drop = make([]pkgapi.Capability, len(in.Drop)) + for i := range in.Drop { + out.Drop[i] = pkgapi.Capability(in.Drop[i]) + } + } else { + out.Drop = nil + } + return nil +} + +func convert_v1beta3_Capabilities_To_api_Capabilities(in *pkgapiv1beta3.Capabilities, out *pkgapi.Capabilities, s conversion.Scope) error { + return autoconvert_v1beta3_Capabilities_To_api_Capabilities(in, out, s) +} + +func autoconvert_v1beta3_CephFSVolumeSource_To_api_CephFSVolumeSource(in *pkgapiv1beta3.CephFSVolumeSource, out *pkgapi.CephFSVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.CephFSVolumeSource))(in) + } + if in.Monitors != nil { + out.Monitors = make([]string, len(in.Monitors)) + for i := range in.Monitors { + out.Monitors[i] = in.Monitors[i] + } + } else { + out.Monitors = nil + } + out.User = in.User + out.SecretFile = in.SecretFile + if in.SecretRef != nil { + out.SecretRef = new(pkgapi.LocalObjectReference) + if err := convert_v1beta3_LocalObjectReference_To_api_LocalObjectReference(in.SecretRef, out.SecretRef, s); err != nil { + return err + } + } else { + out.SecretRef = nil } + out.ReadOnly = in.ReadOnly return nil } -func convert_v1beta3_Identity_To_api_Identity(in *userapiv1beta3.Identity, out *userapi.Identity, s conversion.Scope) error { - return autoconvert_v1beta3_Identity_To_api_Identity(in, out, s) +func convert_v1beta3_CephFSVolumeSource_To_api_CephFSVolumeSource(in *pkgapiv1beta3.CephFSVolumeSource, out *pkgapi.CephFSVolumeSource, s conversion.Scope) error { + return autoconvert_v1beta3_CephFSVolumeSource_To_api_CephFSVolumeSource(in, out, s) } -func autoconvert_v1beta3_IdentityList_To_api_IdentityList(in *userapiv1beta3.IdentityList, out *userapi.IdentityList, s conversion.Scope) error { +func autoconvert_v1beta3_CinderVolumeSource_To_api_CinderVolumeSource(in *pkgapiv1beta3.CinderVolumeSource, out *pkgapi.CinderVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapiv1beta3.IdentityList))(in) + defaulting.(func(*pkgapiv1beta3.CinderVolumeSource))(in) } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err + out.VolumeID = in.VolumeID + out.FSType = in.FSType + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_v1beta3_CinderVolumeSource_To_api_CinderVolumeSource(in *pkgapiv1beta3.CinderVolumeSource, out *pkgapi.CinderVolumeSource, s conversion.Scope) error { + return autoconvert_v1beta3_CinderVolumeSource_To_api_CinderVolumeSource(in, out, s) +} + +func autoconvert_v1beta3_Container_To_api_Container(in *pkgapiv1beta3.Container, out *pkgapi.Container, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.Container))(in) } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { - return err + out.Name = in.Name + out.Image = in.Image + if in.Command != nil { + out.Command = make([]string, len(in.Command)) + for i := range in.Command { + out.Command[i] = in.Command[i] + } + } else { + out.Command = nil } - if in.Items != nil { - out.Items = make([]userapi.Identity, len(in.Items)) - for i := range in.Items { - if err := convert_v1beta3_Identity_To_api_Identity(&in.Items[i], &out.Items[i], s); err != nil { + if in.Args != nil { + out.Args = make([]string, len(in.Args)) + for i := range in.Args { + out.Args[i] = in.Args[i] + } + } else { + out.Args = nil + } + out.WorkingDir = in.WorkingDir + if in.Ports != nil { + out.Ports = make([]pkgapi.ContainerPort, len(in.Ports)) + for i := range in.Ports { + if err := convert_v1beta3_ContainerPort_To_api_ContainerPort(&in.Ports[i], &out.Ports[i], s); err != nil { return err } } } else { - out.Items = nil + out.Ports = nil } - return nil -} - -func convert_v1beta3_IdentityList_To_api_IdentityList(in *userapiv1beta3.IdentityList, out *userapi.IdentityList, s conversion.Scope) error { - return autoconvert_v1beta3_IdentityList_To_api_IdentityList(in, out, s) -} - -func autoconvert_v1beta3_User_To_api_User(in *userapiv1beta3.User, out *userapi.User, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapiv1beta3.User))(in) + if in.Env != nil { + out.Env = make([]pkgapi.EnvVar, len(in.Env)) + for i := range in.Env { + if err := convert_v1beta3_EnvVar_To_api_EnvVar(&in.Env[i], &out.Env[i], s); err != nil { + return err + } + } + } else { + out.Env = nil } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + if err := convert_v1beta3_ResourceRequirements_To_api_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { return err } - if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err + if in.VolumeMounts != nil { + out.VolumeMounts = make([]pkgapi.VolumeMount, len(in.VolumeMounts)) + for i := range in.VolumeMounts { + if err := convert_v1beta3_VolumeMount_To_api_VolumeMount(&in.VolumeMounts[i], &out.VolumeMounts[i], s); err != nil { + return err + } + } + } else { + out.VolumeMounts = nil } - out.FullName = in.FullName - if in.Identities != nil { - out.Identities = make([]string, len(in.Identities)) - for i := range in.Identities { - out.Identities[i] = in.Identities[i] + if in.LivenessProbe != nil { + out.LivenessProbe = new(pkgapi.Probe) + if err := convert_v1beta3_Probe_To_api_Probe(in.LivenessProbe, out.LivenessProbe, s); err != nil { + return err } } else { - out.Identities = nil + out.LivenessProbe = nil } - if in.Groups != nil { - out.Groups = make([]string, len(in.Groups)) - for i := range in.Groups { - out.Groups[i] = in.Groups[i] + if in.ReadinessProbe != nil { + out.ReadinessProbe = new(pkgapi.Probe) + if err := convert_v1beta3_Probe_To_api_Probe(in.ReadinessProbe, out.ReadinessProbe, s); err != nil { + return err } } else { - out.Groups = nil + out.ReadinessProbe = nil + } + if in.Lifecycle != nil { + out.Lifecycle = new(pkgapi.Lifecycle) + if err := convert_v1beta3_Lifecycle_To_api_Lifecycle(in.Lifecycle, out.Lifecycle, s); err != nil { + return err + } + } else { + out.Lifecycle = nil + } + out.TerminationMessagePath = in.TerminationMessagePath + // in.Privileged has no peer in out + out.ImagePullPolicy = pkgapi.PullPolicy(in.ImagePullPolicy) + // in.Capabilities has no peer in out + if in.SecurityContext != nil { + out.SecurityContext = new(pkgapi.SecurityContext) + if err := convert_v1beta3_SecurityContext_To_api_SecurityContext(in.SecurityContext, out.SecurityContext, s); err != nil { + return err + } + } else { + out.SecurityContext = nil } + out.Stdin = in.Stdin + out.StdinOnce = in.StdinOnce + out.TTY = in.TTY return nil } -func convert_v1beta3_User_To_api_User(in *userapiv1beta3.User, out *userapi.User, s conversion.Scope) error { - return autoconvert_v1beta3_User_To_api_User(in, out, s) +func autoconvert_v1beta3_ContainerPort_To_api_ContainerPort(in *pkgapiv1beta3.ContainerPort, out *pkgapi.ContainerPort, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.ContainerPort))(in) + } + out.Name = in.Name + out.HostPort = in.HostPort + out.ContainerPort = in.ContainerPort + out.Protocol = pkgapi.Protocol(in.Protocol) + out.HostIP = in.HostIP + return nil } -func autoconvert_v1beta3_UserIdentityMapping_To_api_UserIdentityMapping(in *userapiv1beta3.UserIdentityMapping, out *userapi.UserIdentityMapping, s conversion.Scope) error { +func convert_v1beta3_ContainerPort_To_api_ContainerPort(in *pkgapiv1beta3.ContainerPort, out *pkgapi.ContainerPort, s conversion.Scope) error { + return autoconvert_v1beta3_ContainerPort_To_api_ContainerPort(in, out, s) +} + +func autoconvert_v1beta3_DownwardAPIVolumeFile_To_api_DownwardAPIVolumeFile(in *pkgapiv1beta3.DownwardAPIVolumeFile, out *pkgapi.DownwardAPIVolumeFile, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapiv1beta3.UserIdentityMapping))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err - } - if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { - return err + defaulting.(func(*pkgapiv1beta3.DownwardAPIVolumeFile))(in) } - if err := convert_v1beta3_ObjectReference_To_api_ObjectReference(&in.Identity, &out.Identity, s); err != nil { - return err - } - if err := convert_v1beta3_ObjectReference_To_api_ObjectReference(&in.User, &out.User, s); err != nil { + out.Path = in.Path + if err := convert_v1beta3_ObjectFieldSelector_To_api_ObjectFieldSelector(&in.FieldRef, &out.FieldRef, s); err != nil { return err } return nil } -func convert_v1beta3_UserIdentityMapping_To_api_UserIdentityMapping(in *userapiv1beta3.UserIdentityMapping, out *userapi.UserIdentityMapping, s conversion.Scope) error { - return autoconvert_v1beta3_UserIdentityMapping_To_api_UserIdentityMapping(in, out, s) +func convert_v1beta3_DownwardAPIVolumeFile_To_api_DownwardAPIVolumeFile(in *pkgapiv1beta3.DownwardAPIVolumeFile, out *pkgapi.DownwardAPIVolumeFile, s conversion.Scope) error { + return autoconvert_v1beta3_DownwardAPIVolumeFile_To_api_DownwardAPIVolumeFile(in, out, s) } -func autoconvert_v1beta3_UserList_To_api_UserList(in *userapiv1beta3.UserList, out *userapi.UserList, s conversion.Scope) error { +func autoconvert_v1beta3_DownwardAPIVolumeSource_To_api_DownwardAPIVolumeSource(in *pkgapiv1beta3.DownwardAPIVolumeSource, out *pkgapi.DownwardAPIVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*userapiv1beta3.UserList))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err - } - if err := s.Convert(&in.ListMeta, &out.ListMeta, 0); err != nil { - return err + defaulting.(func(*pkgapiv1beta3.DownwardAPIVolumeSource))(in) } if in.Items != nil { - out.Items = make([]userapi.User, len(in.Items)) + out.Items = make([]pkgapi.DownwardAPIVolumeFile, len(in.Items)) for i := range in.Items { - if err := convert_v1beta3_User_To_api_User(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1beta3_DownwardAPIVolumeFile_To_api_DownwardAPIVolumeFile(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -4875,19 +6909,31 @@ func autoconvert_v1beta3_UserList_To_api_UserList(in *userapiv1beta3.UserList, o return nil } -func convert_v1beta3_UserList_To_api_UserList(in *userapiv1beta3.UserList, out *userapi.UserList, s conversion.Scope) error { - return autoconvert_v1beta3_UserList_To_api_UserList(in, out, s) +func convert_v1beta3_DownwardAPIVolumeSource_To_api_DownwardAPIVolumeSource(in *pkgapiv1beta3.DownwardAPIVolumeSource, out *pkgapi.DownwardAPIVolumeSource, s conversion.Scope) error { + return autoconvert_v1beta3_DownwardAPIVolumeSource_To_api_DownwardAPIVolumeSource(in, out, s) } -func autoconvert_api_EnvVar_To_v1beta3_EnvVar(in *pkgapi.EnvVar, out *pkgapiv1beta3.EnvVar, s conversion.Scope) error { +func autoconvert_v1beta3_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in *pkgapiv1beta3.EmptyDirVolumeSource, out *pkgapi.EmptyDirVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*pkgapi.EnvVar))(in) + defaulting.(func(*pkgapiv1beta3.EmptyDirVolumeSource))(in) + } + out.Medium = pkgapi.StorageMedium(in.Medium) + return nil +} + +func convert_v1beta3_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in *pkgapiv1beta3.EmptyDirVolumeSource, out *pkgapi.EmptyDirVolumeSource, s conversion.Scope) error { + return autoconvert_v1beta3_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in, out, s) +} + +func autoconvert_v1beta3_EnvVar_To_api_EnvVar(in *pkgapiv1beta3.EnvVar, out *pkgapi.EnvVar, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.EnvVar))(in) } out.Name = in.Name out.Value = in.Value if in.ValueFrom != nil { - out.ValueFrom = new(pkgapiv1beta3.EnvVarSource) - if err := convert_api_EnvVarSource_To_v1beta3_EnvVarSource(in.ValueFrom, out.ValueFrom, s); err != nil { + out.ValueFrom = new(pkgapi.EnvVarSource) + if err := convert_v1beta3_EnvVarSource_To_api_EnvVarSource(in.ValueFrom, out.ValueFrom, s); err != nil { return err } } else { @@ -4896,17 +6942,17 @@ func autoconvert_api_EnvVar_To_v1beta3_EnvVar(in *pkgapi.EnvVar, out *pkgapiv1be return nil } -func convert_api_EnvVar_To_v1beta3_EnvVar(in *pkgapi.EnvVar, out *pkgapiv1beta3.EnvVar, s conversion.Scope) error { - return autoconvert_api_EnvVar_To_v1beta3_EnvVar(in, out, s) +func convert_v1beta3_EnvVar_To_api_EnvVar(in *pkgapiv1beta3.EnvVar, out *pkgapi.EnvVar, s conversion.Scope) error { + return autoconvert_v1beta3_EnvVar_To_api_EnvVar(in, out, s) } -func autoconvert_api_EnvVarSource_To_v1beta3_EnvVarSource(in *pkgapi.EnvVarSource, out *pkgapiv1beta3.EnvVarSource, s conversion.Scope) error { +func autoconvert_v1beta3_EnvVarSource_To_api_EnvVarSource(in *pkgapiv1beta3.EnvVarSource, out *pkgapi.EnvVarSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*pkgapi.EnvVarSource))(in) + defaulting.(func(*pkgapiv1beta3.EnvVarSource))(in) } if in.FieldRef != nil { - out.FieldRef = new(pkgapiv1beta3.ObjectFieldSelector) - if err := convert_api_ObjectFieldSelector_To_v1beta3_ObjectFieldSelector(in.FieldRef, out.FieldRef, s); err != nil { + out.FieldRef = new(pkgapi.ObjectFieldSelector) + if err := convert_v1beta3_ObjectFieldSelector_To_api_ObjectFieldSelector(in.FieldRef, out.FieldRef, s); err != nil { return err } } else { @@ -4915,176 +6961,215 @@ func autoconvert_api_EnvVarSource_To_v1beta3_EnvVarSource(in *pkgapi.EnvVarSourc return nil } -func convert_api_EnvVarSource_To_v1beta3_EnvVarSource(in *pkgapi.EnvVarSource, out *pkgapiv1beta3.EnvVarSource, s conversion.Scope) error { - return autoconvert_api_EnvVarSource_To_v1beta3_EnvVarSource(in, out, s) +func convert_v1beta3_EnvVarSource_To_api_EnvVarSource(in *pkgapiv1beta3.EnvVarSource, out *pkgapi.EnvVarSource, s conversion.Scope) error { + return autoconvert_v1beta3_EnvVarSource_To_api_EnvVarSource(in, out, s) } -func autoconvert_api_LocalObjectReference_To_v1beta3_LocalObjectReference(in *pkgapi.LocalObjectReference, out *pkgapiv1beta3.LocalObjectReference, s conversion.Scope) error { +func autoconvert_v1beta3_ExecAction_To_api_ExecAction(in *pkgapiv1beta3.ExecAction, out *pkgapi.ExecAction, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*pkgapi.LocalObjectReference))(in) + defaulting.(func(*pkgapiv1beta3.ExecAction))(in) + } + if in.Command != nil { + out.Command = make([]string, len(in.Command)) + for i := range in.Command { + out.Command[i] = in.Command[i] + } + } else { + out.Command = nil } - out.Name = in.Name return nil } -func convert_api_LocalObjectReference_To_v1beta3_LocalObjectReference(in *pkgapi.LocalObjectReference, out *pkgapiv1beta3.LocalObjectReference, s conversion.Scope) error { - return autoconvert_api_LocalObjectReference_To_v1beta3_LocalObjectReference(in, out, s) +func convert_v1beta3_ExecAction_To_api_ExecAction(in *pkgapiv1beta3.ExecAction, out *pkgapi.ExecAction, s conversion.Scope) error { + return autoconvert_v1beta3_ExecAction_To_api_ExecAction(in, out, s) } -func autoconvert_api_ObjectFieldSelector_To_v1beta3_ObjectFieldSelector(in *pkgapi.ObjectFieldSelector, out *pkgapiv1beta3.ObjectFieldSelector, s conversion.Scope) error { +func autoconvert_v1beta3_FCVolumeSource_To_api_FCVolumeSource(in *pkgapiv1beta3.FCVolumeSource, out *pkgapi.FCVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*pkgapi.ObjectFieldSelector))(in) + defaulting.(func(*pkgapiv1beta3.FCVolumeSource))(in) } - out.APIVersion = in.APIVersion - out.FieldPath = in.FieldPath + if in.TargetWWNs != nil { + out.TargetWWNs = make([]string, len(in.TargetWWNs)) + for i := range in.TargetWWNs { + out.TargetWWNs[i] = in.TargetWWNs[i] + } + } else { + out.TargetWWNs = nil + } + if in.Lun != nil { + out.Lun = new(int) + *out.Lun = *in.Lun + } else { + out.Lun = nil + } + out.FSType = in.FSType + out.ReadOnly = in.ReadOnly return nil } -func convert_api_ObjectFieldSelector_To_v1beta3_ObjectFieldSelector(in *pkgapi.ObjectFieldSelector, out *pkgapiv1beta3.ObjectFieldSelector, s conversion.Scope) error { - return autoconvert_api_ObjectFieldSelector_To_v1beta3_ObjectFieldSelector(in, out, s) +func convert_v1beta3_FCVolumeSource_To_api_FCVolumeSource(in *pkgapiv1beta3.FCVolumeSource, out *pkgapi.FCVolumeSource, s conversion.Scope) error { + return autoconvert_v1beta3_FCVolumeSource_To_api_FCVolumeSource(in, out, s) } -func autoconvert_api_ObjectMeta_To_v1beta3_ObjectMeta(in *pkgapi.ObjectMeta, out *pkgapiv1beta3.ObjectMeta, s conversion.Scope) error { +func autoconvert_v1beta3_FlockerVolumeSource_To_api_FlockerVolumeSource(in *pkgapiv1beta3.FlockerVolumeSource, out *pkgapi.FlockerVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*pkgapi.ObjectMeta))(in) - } - out.Name = in.Name - out.GenerateName = in.GenerateName - out.Namespace = in.Namespace - out.SelfLink = in.SelfLink - out.UID = in.UID - out.ResourceVersion = in.ResourceVersion - out.Generation = in.Generation - if err := s.Convert(&in.CreationTimestamp, &out.CreationTimestamp, 0); err != nil { - return err - } - if in.DeletionTimestamp != nil { - if err := s.Convert(&in.DeletionTimestamp, &out.DeletionTimestamp, 0); err != nil { - return err - } - } else { - out.DeletionTimestamp = nil + defaulting.(func(*pkgapiv1beta3.FlockerVolumeSource))(in) } - if in.DeletionGracePeriodSeconds != nil { - out.DeletionGracePeriodSeconds = new(int64) - *out.DeletionGracePeriodSeconds = *in.DeletionGracePeriodSeconds - } else { - out.DeletionGracePeriodSeconds = nil + out.DatasetName = in.DatasetName + return nil +} + +func convert_v1beta3_FlockerVolumeSource_To_api_FlockerVolumeSource(in *pkgapiv1beta3.FlockerVolumeSource, out *pkgapi.FlockerVolumeSource, s conversion.Scope) error { + return autoconvert_v1beta3_FlockerVolumeSource_To_api_FlockerVolumeSource(in, out, s) +} + +func autoconvert_v1beta3_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSource(in *pkgapiv1beta3.GCEPersistentDiskVolumeSource, out *pkgapi.GCEPersistentDiskVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.GCEPersistentDiskVolumeSource))(in) } - if in.Labels != nil { - out.Labels = make(map[string]string) - for key, val := range in.Labels { - out.Labels[key] = val - } - } else { - out.Labels = nil + out.PDName = in.PDName + out.FSType = in.FSType + out.Partition = in.Partition + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_v1beta3_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSource(in *pkgapiv1beta3.GCEPersistentDiskVolumeSource, out *pkgapi.GCEPersistentDiskVolumeSource, s conversion.Scope) error { + return autoconvert_v1beta3_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSource(in, out, s) +} + +func autoconvert_v1beta3_GitRepoVolumeSource_To_api_GitRepoVolumeSource(in *pkgapiv1beta3.GitRepoVolumeSource, out *pkgapi.GitRepoVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.GitRepoVolumeSource))(in) } - if in.Annotations != nil { - out.Annotations = make(map[string]string) - for key, val := range in.Annotations { - out.Annotations[key] = val - } - } else { - out.Annotations = nil + out.Repository = in.Repository + out.Revision = in.Revision + return nil +} + +func convert_v1beta3_GitRepoVolumeSource_To_api_GitRepoVolumeSource(in *pkgapiv1beta3.GitRepoVolumeSource, out *pkgapi.GitRepoVolumeSource, s conversion.Scope) error { + return autoconvert_v1beta3_GitRepoVolumeSource_To_api_GitRepoVolumeSource(in, out, s) +} + +func autoconvert_v1beta3_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in *pkgapiv1beta3.GlusterfsVolumeSource, out *pkgapi.GlusterfsVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.GlusterfsVolumeSource))(in) } + out.EndpointsName = in.EndpointsName + out.Path = in.Path + out.ReadOnly = in.ReadOnly return nil } -func convert_api_ObjectMeta_To_v1beta3_ObjectMeta(in *pkgapi.ObjectMeta, out *pkgapiv1beta3.ObjectMeta, s conversion.Scope) error { - return autoconvert_api_ObjectMeta_To_v1beta3_ObjectMeta(in, out, s) +func convert_v1beta3_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in *pkgapiv1beta3.GlusterfsVolumeSource, out *pkgapi.GlusterfsVolumeSource, s conversion.Scope) error { + return autoconvert_v1beta3_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in, out, s) } -func autoconvert_api_ObjectReference_To_v1beta3_ObjectReference(in *pkgapi.ObjectReference, out *pkgapiv1beta3.ObjectReference, s conversion.Scope) error { +func autoconvert_v1beta3_HTTPGetAction_To_api_HTTPGetAction(in *pkgapiv1beta3.HTTPGetAction, out *pkgapi.HTTPGetAction, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*pkgapi.ObjectReference))(in) + defaulting.(func(*pkgapiv1beta3.HTTPGetAction))(in) } - out.Kind = in.Kind - out.Namespace = in.Namespace - out.Name = in.Name - out.UID = in.UID - out.APIVersion = in.APIVersion - out.ResourceVersion = in.ResourceVersion - out.FieldPath = in.FieldPath + out.Path = in.Path + if err := s.Convert(&in.Port, &out.Port, 0); err != nil { + return err + } + out.Host = in.Host + out.Scheme = pkgapi.URIScheme(in.Scheme) return nil } -func convert_api_ObjectReference_To_v1beta3_ObjectReference(in *pkgapi.ObjectReference, out *pkgapiv1beta3.ObjectReference, s conversion.Scope) error { - return autoconvert_api_ObjectReference_To_v1beta3_ObjectReference(in, out, s) +func convert_v1beta3_HTTPGetAction_To_api_HTTPGetAction(in *pkgapiv1beta3.HTTPGetAction, out *pkgapi.HTTPGetAction, s conversion.Scope) error { + return autoconvert_v1beta3_HTTPGetAction_To_api_HTTPGetAction(in, out, s) } -func autoconvert_api_ResourceRequirements_To_v1beta3_ResourceRequirements(in *pkgapi.ResourceRequirements, out *pkgapiv1beta3.ResourceRequirements, s conversion.Scope) error { +func autoconvert_v1beta3_Handler_To_api_Handler(in *pkgapiv1beta3.Handler, out *pkgapi.Handler, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*pkgapi.ResourceRequirements))(in) + defaulting.(func(*pkgapiv1beta3.Handler))(in) } - if in.Limits != nil { - out.Limits = make(pkgapiv1beta3.ResourceList) - for key, val := range in.Limits { - newVal := resource.Quantity{} - if err := s.Convert(&val, &newVal, 0); err != nil { - return err - } - out.Limits[pkgapiv1beta3.ResourceName(key)] = newVal + if in.Exec != nil { + out.Exec = new(pkgapi.ExecAction) + if err := convert_v1beta3_ExecAction_To_api_ExecAction(in.Exec, out.Exec, s); err != nil { + return err } } else { - out.Limits = nil - } - if in.Requests != nil { - out.Requests = make(pkgapiv1beta3.ResourceList) - for key, val := range in.Requests { - newVal := resource.Quantity{} - if err := s.Convert(&val, &newVal, 0); err != nil { - return err - } - out.Requests[pkgapiv1beta3.ResourceName(key)] = newVal + out.Exec = nil + } + if in.HTTPGet != nil { + out.HTTPGet = new(pkgapi.HTTPGetAction) + if err := convert_v1beta3_HTTPGetAction_To_api_HTTPGetAction(in.HTTPGet, out.HTTPGet, s); err != nil { + return err } } else { - out.Requests = nil + out.HTTPGet = nil + } + if in.TCPSocket != nil { + out.TCPSocket = new(pkgapi.TCPSocketAction) + if err := convert_v1beta3_TCPSocketAction_To_api_TCPSocketAction(in.TCPSocket, out.TCPSocket, s); err != nil { + return err + } + } else { + out.TCPSocket = nil } return nil } -func convert_api_ResourceRequirements_To_v1beta3_ResourceRequirements(in *pkgapi.ResourceRequirements, out *pkgapiv1beta3.ResourceRequirements, s conversion.Scope) error { - return autoconvert_api_ResourceRequirements_To_v1beta3_ResourceRequirements(in, out, s) +func convert_v1beta3_Handler_To_api_Handler(in *pkgapiv1beta3.Handler, out *pkgapi.Handler, s conversion.Scope) error { + return autoconvert_v1beta3_Handler_To_api_Handler(in, out, s) } -func autoconvert_v1beta3_EnvVar_To_api_EnvVar(in *pkgapiv1beta3.EnvVar, out *pkgapi.EnvVar, s conversion.Scope) error { +func autoconvert_v1beta3_HostPathVolumeSource_To_api_HostPathVolumeSource(in *pkgapiv1beta3.HostPathVolumeSource, out *pkgapi.HostPathVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*pkgapiv1beta3.EnvVar))(in) + defaulting.(func(*pkgapiv1beta3.HostPathVolumeSource))(in) } - out.Name = in.Name - out.Value = in.Value - if in.ValueFrom != nil { - out.ValueFrom = new(pkgapi.EnvVarSource) - if err := convert_v1beta3_EnvVarSource_To_api_EnvVarSource(in.ValueFrom, out.ValueFrom, s); err != nil { - return err - } - } else { - out.ValueFrom = nil + out.Path = in.Path + return nil +} + +func convert_v1beta3_HostPathVolumeSource_To_api_HostPathVolumeSource(in *pkgapiv1beta3.HostPathVolumeSource, out *pkgapi.HostPathVolumeSource, s conversion.Scope) error { + return autoconvert_v1beta3_HostPathVolumeSource_To_api_HostPathVolumeSource(in, out, s) +} + +func autoconvert_v1beta3_ISCSIVolumeSource_To_api_ISCSIVolumeSource(in *pkgapiv1beta3.ISCSIVolumeSource, out *pkgapi.ISCSIVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.ISCSIVolumeSource))(in) } + out.TargetPortal = in.TargetPortal + out.IQN = in.IQN + out.Lun = in.Lun + out.FSType = in.FSType + out.ReadOnly = in.ReadOnly return nil } -func convert_v1beta3_EnvVar_To_api_EnvVar(in *pkgapiv1beta3.EnvVar, out *pkgapi.EnvVar, s conversion.Scope) error { - return autoconvert_v1beta3_EnvVar_To_api_EnvVar(in, out, s) +func convert_v1beta3_ISCSIVolumeSource_To_api_ISCSIVolumeSource(in *pkgapiv1beta3.ISCSIVolumeSource, out *pkgapi.ISCSIVolumeSource, s conversion.Scope) error { + return autoconvert_v1beta3_ISCSIVolumeSource_To_api_ISCSIVolumeSource(in, out, s) } -func autoconvert_v1beta3_EnvVarSource_To_api_EnvVarSource(in *pkgapiv1beta3.EnvVarSource, out *pkgapi.EnvVarSource, s conversion.Scope) error { +func autoconvert_v1beta3_Lifecycle_To_api_Lifecycle(in *pkgapiv1beta3.Lifecycle, out *pkgapi.Lifecycle, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*pkgapiv1beta3.EnvVarSource))(in) + defaulting.(func(*pkgapiv1beta3.Lifecycle))(in) } - if in.FieldRef != nil { - out.FieldRef = new(pkgapi.ObjectFieldSelector) - if err := convert_v1beta3_ObjectFieldSelector_To_api_ObjectFieldSelector(in.FieldRef, out.FieldRef, s); err != nil { + if in.PostStart != nil { + out.PostStart = new(pkgapi.Handler) + if err := convert_v1beta3_Handler_To_api_Handler(in.PostStart, out.PostStart, s); err != nil { return err } } else { - out.FieldRef = nil + out.PostStart = nil + } + if in.PreStop != nil { + out.PreStop = new(pkgapi.Handler) + if err := convert_v1beta3_Handler_To_api_Handler(in.PreStop, out.PreStop, s); err != nil { + return err + } + } else { + out.PreStop = nil } return nil } -func convert_v1beta3_EnvVarSource_To_api_EnvVarSource(in *pkgapiv1beta3.EnvVarSource, out *pkgapi.EnvVarSource, s conversion.Scope) error { - return autoconvert_v1beta3_EnvVarSource_To_api_EnvVarSource(in, out, s) +func convert_v1beta3_Lifecycle_To_api_Lifecycle(in *pkgapiv1beta3.Lifecycle, out *pkgapi.Lifecycle, s conversion.Scope) error { + return autoconvert_v1beta3_Lifecycle_To_api_Lifecycle(in, out, s) } func autoconvert_v1beta3_LocalObjectReference_To_api_LocalObjectReference(in *pkgapiv1beta3.LocalObjectReference, out *pkgapi.LocalObjectReference, s conversion.Scope) error { @@ -5099,6 +7184,20 @@ func convert_v1beta3_LocalObjectReference_To_api_LocalObjectReference(in *pkgapi return autoconvert_v1beta3_LocalObjectReference_To_api_LocalObjectReference(in, out, s) } +func autoconvert_v1beta3_NFSVolumeSource_To_api_NFSVolumeSource(in *pkgapiv1beta3.NFSVolumeSource, out *pkgapi.NFSVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.NFSVolumeSource))(in) + } + out.Server = in.Server + out.Path = in.Path + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_v1beta3_NFSVolumeSource_To_api_NFSVolumeSource(in *pkgapiv1beta3.NFSVolumeSource, out *pkgapi.NFSVolumeSource, s conversion.Scope) error { + return autoconvert_v1beta3_NFSVolumeSource_To_api_NFSVolumeSource(in, out, s) +} + func autoconvert_v1beta3_ObjectFieldSelector_To_api_ObjectFieldSelector(in *pkgapiv1beta3.ObjectFieldSelector, out *pkgapi.ObjectFieldSelector, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*pkgapiv1beta3.ObjectFieldSelector))(in) @@ -5180,6 +7279,156 @@ func convert_v1beta3_ObjectReference_To_api_ObjectReference(in *pkgapiv1beta3.Ob return autoconvert_v1beta3_ObjectReference_To_api_ObjectReference(in, out, s) } +func autoconvert_v1beta3_PersistentVolumeClaimVolumeSource_To_api_PersistentVolumeClaimVolumeSource(in *pkgapiv1beta3.PersistentVolumeClaimVolumeSource, out *pkgapi.PersistentVolumeClaimVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.PersistentVolumeClaimVolumeSource))(in) + } + out.ClaimName = in.ClaimName + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_v1beta3_PersistentVolumeClaimVolumeSource_To_api_PersistentVolumeClaimVolumeSource(in *pkgapiv1beta3.PersistentVolumeClaimVolumeSource, out *pkgapi.PersistentVolumeClaimVolumeSource, s conversion.Scope) error { + return autoconvert_v1beta3_PersistentVolumeClaimVolumeSource_To_api_PersistentVolumeClaimVolumeSource(in, out, s) +} + +func autoconvert_v1beta3_PodSpec_To_api_PodSpec(in *pkgapiv1beta3.PodSpec, out *pkgapi.PodSpec, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.PodSpec))(in) + } + if in.Volumes != nil { + out.Volumes = make([]pkgapi.Volume, len(in.Volumes)) + for i := range in.Volumes { + if err := convert_v1beta3_Volume_To_api_Volume(&in.Volumes[i], &out.Volumes[i], s); err != nil { + return err + } + } + } else { + out.Volumes = nil + } + if in.Containers != nil { + out.Containers = make([]pkgapi.Container, len(in.Containers)) + for i := range in.Containers { + if err := s.Convert(&in.Containers[i], &out.Containers[i], 0); err != nil { + return err + } + } + } else { + out.Containers = nil + } + out.RestartPolicy = pkgapi.RestartPolicy(in.RestartPolicy) + if in.TerminationGracePeriodSeconds != nil { + out.TerminationGracePeriodSeconds = new(int64) + *out.TerminationGracePeriodSeconds = *in.TerminationGracePeriodSeconds + } else { + out.TerminationGracePeriodSeconds = nil + } + if in.ActiveDeadlineSeconds != nil { + out.ActiveDeadlineSeconds = new(int64) + *out.ActiveDeadlineSeconds = *in.ActiveDeadlineSeconds + } else { + out.ActiveDeadlineSeconds = nil + } + out.DNSPolicy = pkgapi.DNSPolicy(in.DNSPolicy) + if in.NodeSelector != nil { + out.NodeSelector = make(map[string]string) + for key, val := range in.NodeSelector { + out.NodeSelector[key] = val + } + } else { + out.NodeSelector = nil + } + // in.ServiceAccount has no peer in out + // in.Host has no peer in out + // in.HostNetwork has no peer in out + // in.HostPID has no peer in out + // in.HostIPC has no peer in out + if in.SecurityContext != nil { + if err := s.Convert(&in.SecurityContext, &out.SecurityContext, 0); err != nil { + return err + } + } else { + out.SecurityContext = nil + } + if in.ImagePullSecrets != nil { + out.ImagePullSecrets = make([]pkgapi.LocalObjectReference, len(in.ImagePullSecrets)) + for i := range in.ImagePullSecrets { + if err := convert_v1beta3_LocalObjectReference_To_api_LocalObjectReference(&in.ImagePullSecrets[i], &out.ImagePullSecrets[i], s); err != nil { + return err + } + } + } else { + out.ImagePullSecrets = nil + } + return nil +} + +func autoconvert_v1beta3_PodTemplateSpec_To_api_PodTemplateSpec(in *pkgapiv1beta3.PodTemplateSpec, out *pkgapi.PodTemplateSpec, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.PodTemplateSpec))(in) + } + if err := convert_v1beta3_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil { + return err + } + return nil +} + +func convert_v1beta3_PodTemplateSpec_To_api_PodTemplateSpec(in *pkgapiv1beta3.PodTemplateSpec, out *pkgapi.PodTemplateSpec, s conversion.Scope) error { + return autoconvert_v1beta3_PodTemplateSpec_To_api_PodTemplateSpec(in, out, s) +} + +func autoconvert_v1beta3_Probe_To_api_Probe(in *pkgapiv1beta3.Probe, out *pkgapi.Probe, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.Probe))(in) + } + if err := convert_v1beta3_Handler_To_api_Handler(&in.Handler, &out.Handler, s); err != nil { + return err + } + out.InitialDelaySeconds = in.InitialDelaySeconds + out.TimeoutSeconds = in.TimeoutSeconds + return nil +} + +func convert_v1beta3_Probe_To_api_Probe(in *pkgapiv1beta3.Probe, out *pkgapi.Probe, s conversion.Scope) error { + return autoconvert_v1beta3_Probe_To_api_Probe(in, out, s) +} + +func autoconvert_v1beta3_RBDVolumeSource_To_api_RBDVolumeSource(in *pkgapiv1beta3.RBDVolumeSource, out *pkgapi.RBDVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.RBDVolumeSource))(in) + } + if in.CephMonitors != nil { + out.CephMonitors = make([]string, len(in.CephMonitors)) + for i := range in.CephMonitors { + out.CephMonitors[i] = in.CephMonitors[i] + } + } else { + out.CephMonitors = nil + } + out.RBDImage = in.RBDImage + out.FSType = in.FSType + out.RBDPool = in.RBDPool + out.RadosUser = in.RadosUser + out.Keyring = in.Keyring + if in.SecretRef != nil { + out.SecretRef = new(pkgapi.LocalObjectReference) + if err := convert_v1beta3_LocalObjectReference_To_api_LocalObjectReference(in.SecretRef, out.SecretRef, s); err != nil { + return err + } + } else { + out.SecretRef = nil + } + out.ReadOnly = in.ReadOnly + return nil +} + +func convert_v1beta3_RBDVolumeSource_To_api_RBDVolumeSource(in *pkgapiv1beta3.RBDVolumeSource, out *pkgapi.RBDVolumeSource, s conversion.Scope) error { + return autoconvert_v1beta3_RBDVolumeSource_To_api_RBDVolumeSource(in, out, s) +} + func autoconvert_v1beta3_ResourceRequirements_To_api_ResourceRequirements(in *pkgapiv1beta3.ResourceRequirements, out *pkgapi.ResourceRequirements, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*pkgapiv1beta3.ResourceRequirements))(in) @@ -5215,8 +7464,260 @@ func convert_v1beta3_ResourceRequirements_To_api_ResourceRequirements(in *pkgapi return autoconvert_v1beta3_ResourceRequirements_To_api_ResourceRequirements(in, out, s) } +func autoconvert_v1beta3_SELinuxOptions_To_api_SELinuxOptions(in *pkgapiv1beta3.SELinuxOptions, out *pkgapi.SELinuxOptions, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.SELinuxOptions))(in) + } + out.User = in.User + out.Role = in.Role + out.Type = in.Type + out.Level = in.Level + return nil +} + +func convert_v1beta3_SELinuxOptions_To_api_SELinuxOptions(in *pkgapiv1beta3.SELinuxOptions, out *pkgapi.SELinuxOptions, s conversion.Scope) error { + return autoconvert_v1beta3_SELinuxOptions_To_api_SELinuxOptions(in, out, s) +} + +func autoconvert_v1beta3_SecretVolumeSource_To_api_SecretVolumeSource(in *pkgapiv1beta3.SecretVolumeSource, out *pkgapi.SecretVolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.SecretVolumeSource))(in) + } + out.SecretName = in.SecretName + return nil +} + +func convert_v1beta3_SecretVolumeSource_To_api_SecretVolumeSource(in *pkgapiv1beta3.SecretVolumeSource, out *pkgapi.SecretVolumeSource, s conversion.Scope) error { + return autoconvert_v1beta3_SecretVolumeSource_To_api_SecretVolumeSource(in, out, s) +} + +func autoconvert_v1beta3_SecurityContext_To_api_SecurityContext(in *pkgapiv1beta3.SecurityContext, out *pkgapi.SecurityContext, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.SecurityContext))(in) + } + if in.Capabilities != nil { + out.Capabilities = new(pkgapi.Capabilities) + if err := convert_v1beta3_Capabilities_To_api_Capabilities(in.Capabilities, out.Capabilities, s); err != nil { + return err + } + } else { + out.Capabilities = nil + } + if in.Privileged != nil { + out.Privileged = new(bool) + *out.Privileged = *in.Privileged + } else { + out.Privileged = nil + } + if in.SELinuxOptions != nil { + out.SELinuxOptions = new(pkgapi.SELinuxOptions) + if err := convert_v1beta3_SELinuxOptions_To_api_SELinuxOptions(in.SELinuxOptions, out.SELinuxOptions, s); err != nil { + return err + } + } else { + out.SELinuxOptions = nil + } + if in.RunAsUser != nil { + out.RunAsUser = new(int64) + *out.RunAsUser = *in.RunAsUser + } else { + out.RunAsUser = nil + } + if in.RunAsNonRoot != nil { + out.RunAsNonRoot = new(bool) + *out.RunAsNonRoot = *in.RunAsNonRoot + } else { + out.RunAsNonRoot = nil + } + return nil +} + +func convert_v1beta3_SecurityContext_To_api_SecurityContext(in *pkgapiv1beta3.SecurityContext, out *pkgapi.SecurityContext, s conversion.Scope) error { + return autoconvert_v1beta3_SecurityContext_To_api_SecurityContext(in, out, s) +} + +func autoconvert_v1beta3_TCPSocketAction_To_api_TCPSocketAction(in *pkgapiv1beta3.TCPSocketAction, out *pkgapi.TCPSocketAction, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.TCPSocketAction))(in) + } + if err := s.Convert(&in.Port, &out.Port, 0); err != nil { + return err + } + return nil +} + +func convert_v1beta3_TCPSocketAction_To_api_TCPSocketAction(in *pkgapiv1beta3.TCPSocketAction, out *pkgapi.TCPSocketAction, s conversion.Scope) error { + return autoconvert_v1beta3_TCPSocketAction_To_api_TCPSocketAction(in, out, s) +} + +func autoconvert_v1beta3_Volume_To_api_Volume(in *pkgapiv1beta3.Volume, out *pkgapi.Volume, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.Volume))(in) + } + out.Name = in.Name + if err := s.Convert(&in.VolumeSource, &out.VolumeSource, 0); err != nil { + return err + } + return nil +} + +func convert_v1beta3_Volume_To_api_Volume(in *pkgapiv1beta3.Volume, out *pkgapi.Volume, s conversion.Scope) error { + return autoconvert_v1beta3_Volume_To_api_Volume(in, out, s) +} + +func autoconvert_v1beta3_VolumeMount_To_api_VolumeMount(in *pkgapiv1beta3.VolumeMount, out *pkgapi.VolumeMount, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.VolumeMount))(in) + } + out.Name = in.Name + out.ReadOnly = in.ReadOnly + out.MountPath = in.MountPath + return nil +} + +func convert_v1beta3_VolumeMount_To_api_VolumeMount(in *pkgapiv1beta3.VolumeMount, out *pkgapi.VolumeMount, s conversion.Scope) error { + return autoconvert_v1beta3_VolumeMount_To_api_VolumeMount(in, out, s) +} + +func autoconvert_v1beta3_VolumeSource_To_api_VolumeSource(in *pkgapiv1beta3.VolumeSource, out *pkgapi.VolumeSource, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*pkgapiv1beta3.VolumeSource))(in) + } + if in.HostPath != nil { + out.HostPath = new(pkgapi.HostPathVolumeSource) + if err := convert_v1beta3_HostPathVolumeSource_To_api_HostPathVolumeSource(in.HostPath, out.HostPath, s); err != nil { + return err + } + } else { + out.HostPath = nil + } + if in.EmptyDir != nil { + out.EmptyDir = new(pkgapi.EmptyDirVolumeSource) + if err := convert_v1beta3_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in.EmptyDir, out.EmptyDir, s); err != nil { + return err + } + } else { + out.EmptyDir = nil + } + if in.GCEPersistentDisk != nil { + out.GCEPersistentDisk = new(pkgapi.GCEPersistentDiskVolumeSource) + if err := convert_v1beta3_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSource(in.GCEPersistentDisk, out.GCEPersistentDisk, s); err != nil { + return err + } + } else { + out.GCEPersistentDisk = nil + } + if in.AWSElasticBlockStore != nil { + out.AWSElasticBlockStore = new(pkgapi.AWSElasticBlockStoreVolumeSource) + if err := convert_v1beta3_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource(in.AWSElasticBlockStore, out.AWSElasticBlockStore, s); err != nil { + return err + } + } else { + out.AWSElasticBlockStore = nil + } + if in.GitRepo != nil { + out.GitRepo = new(pkgapi.GitRepoVolumeSource) + if err := convert_v1beta3_GitRepoVolumeSource_To_api_GitRepoVolumeSource(in.GitRepo, out.GitRepo, s); err != nil { + return err + } + } else { + out.GitRepo = nil + } + if in.Secret != nil { + out.Secret = new(pkgapi.SecretVolumeSource) + if err := convert_v1beta3_SecretVolumeSource_To_api_SecretVolumeSource(in.Secret, out.Secret, s); err != nil { + return err + } + } else { + out.Secret = nil + } + if in.NFS != nil { + out.NFS = new(pkgapi.NFSVolumeSource) + if err := convert_v1beta3_NFSVolumeSource_To_api_NFSVolumeSource(in.NFS, out.NFS, s); err != nil { + return err + } + } else { + out.NFS = nil + } + if in.ISCSI != nil { + out.ISCSI = new(pkgapi.ISCSIVolumeSource) + if err := convert_v1beta3_ISCSIVolumeSource_To_api_ISCSIVolumeSource(in.ISCSI, out.ISCSI, s); err != nil { + return err + } + } else { + out.ISCSI = nil + } + if in.Glusterfs != nil { + out.Glusterfs = new(pkgapi.GlusterfsVolumeSource) + if err := convert_v1beta3_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in.Glusterfs, out.Glusterfs, s); err != nil { + return err + } + } else { + out.Glusterfs = nil + } + if in.PersistentVolumeClaim != nil { + out.PersistentVolumeClaim = new(pkgapi.PersistentVolumeClaimVolumeSource) + if err := convert_v1beta3_PersistentVolumeClaimVolumeSource_To_api_PersistentVolumeClaimVolumeSource(in.PersistentVolumeClaim, out.PersistentVolumeClaim, s); err != nil { + return err + } + } else { + out.PersistentVolumeClaim = nil + } + if in.RBD != nil { + out.RBD = new(pkgapi.RBDVolumeSource) + if err := convert_v1beta3_RBDVolumeSource_To_api_RBDVolumeSource(in.RBD, out.RBD, s); err != nil { + return err + } + } else { + out.RBD = nil + } + if in.Cinder != nil { + out.Cinder = new(pkgapi.CinderVolumeSource) + if err := convert_v1beta3_CinderVolumeSource_To_api_CinderVolumeSource(in.Cinder, out.Cinder, s); err != nil { + return err + } + } else { + out.Cinder = nil + } + if in.CephFS != nil { + out.CephFS = new(pkgapi.CephFSVolumeSource) + if err := convert_v1beta3_CephFSVolumeSource_To_api_CephFSVolumeSource(in.CephFS, out.CephFS, s); err != nil { + return err + } + } else { + out.CephFS = nil + } + if in.Flocker != nil { + out.Flocker = new(pkgapi.FlockerVolumeSource) + if err := convert_v1beta3_FlockerVolumeSource_To_api_FlockerVolumeSource(in.Flocker, out.Flocker, s); err != nil { + return err + } + } else { + out.Flocker = nil + } + if in.DownwardAPI != nil { + out.DownwardAPI = new(pkgapi.DownwardAPIVolumeSource) + if err := convert_v1beta3_DownwardAPIVolumeSource_To_api_DownwardAPIVolumeSource(in.DownwardAPI, out.DownwardAPI, s); err != nil { + return err + } + } else { + out.DownwardAPI = nil + } + if in.FC != nil { + out.FC = new(pkgapi.FCVolumeSource) + if err := convert_v1beta3_FCVolumeSource_To_api_FCVolumeSource(in.FC, out.FC, s); err != nil { + return err + } + } else { + out.FC = nil + } + // in.Metadata has no peer in out + return nil +} + func init() { err := pkgapi.Scheme.AddGeneratedConversionFuncs( + autoconvert_api_AWSElasticBlockStoreVolumeSource_To_v1beta3_AWSElasticBlockStoreVolumeSource, autoconvert_api_BinaryBuildRequestOptions_To_v1beta3_BinaryBuildRequestOptions, autoconvert_api_BinaryBuildSource_To_v1beta3_BinaryBuildSource, autoconvert_api_BuildConfigList_To_v1beta3_BuildConfigList, @@ -5234,6 +7735,9 @@ func init() { autoconvert_api_BuildStrategy_To_v1beta3_BuildStrategy, autoconvert_api_BuildTriggerPolicy_To_v1beta3_BuildTriggerPolicy, autoconvert_api_Build_To_v1beta3_Build, + autoconvert_api_Capabilities_To_v1beta3_Capabilities, + autoconvert_api_CephFSVolumeSource_To_v1beta3_CephFSVolumeSource, + autoconvert_api_CinderVolumeSource_To_v1beta3_CinderVolumeSource, autoconvert_api_ClusterNetworkList_To_v1beta3_ClusterNetworkList, autoconvert_api_ClusterNetwork_To_v1beta3_ClusterNetwork, autoconvert_api_ClusterPolicyBindingList_To_v1beta3_ClusterPolicyBindingList, @@ -5244,22 +7748,47 @@ func init() { autoconvert_api_ClusterRoleBinding_To_v1beta3_ClusterRoleBinding, autoconvert_api_ClusterRoleList_To_v1beta3_ClusterRoleList, autoconvert_api_ClusterRole_To_v1beta3_ClusterRole, + autoconvert_api_ContainerPort_To_v1beta3_ContainerPort, + autoconvert_api_Container_To_v1beta3_Container, autoconvert_api_CustomBuildStrategy_To_v1beta3_CustomBuildStrategy, + autoconvert_api_CustomDeploymentStrategyParams_To_v1beta3_CustomDeploymentStrategyParams, + autoconvert_api_DeploymentCauseImageTrigger_To_v1beta3_DeploymentCauseImageTrigger, + autoconvert_api_DeploymentCause_To_v1beta3_DeploymentCause, autoconvert_api_DeploymentConfigList_To_v1beta3_DeploymentConfigList, autoconvert_api_DeploymentConfigRollbackSpec_To_v1beta3_DeploymentConfigRollbackSpec, autoconvert_api_DeploymentConfigRollback_To_v1beta3_DeploymentConfigRollback, + autoconvert_api_DeploymentConfigSpec_To_v1beta3_DeploymentConfigSpec, + autoconvert_api_DeploymentConfigStatus_To_v1beta3_DeploymentConfigStatus, autoconvert_api_DeploymentConfig_To_v1beta3_DeploymentConfig, + autoconvert_api_DeploymentDetails_To_v1beta3_DeploymentDetails, autoconvert_api_DeploymentLogOptions_To_v1beta3_DeploymentLogOptions, autoconvert_api_DeploymentLog_To_v1beta3_DeploymentLog, + autoconvert_api_DeploymentStrategy_To_v1beta3_DeploymentStrategy, + autoconvert_api_DeploymentTriggerImageChangeParams_To_v1beta3_DeploymentTriggerImageChangeParams, + autoconvert_api_DeploymentTriggerPolicy_To_v1beta3_DeploymentTriggerPolicy, autoconvert_api_DockerBuildStrategy_To_v1beta3_DockerBuildStrategy, + autoconvert_api_DownwardAPIVolumeFile_To_v1beta3_DownwardAPIVolumeFile, + autoconvert_api_DownwardAPIVolumeSource_To_v1beta3_DownwardAPIVolumeSource, + autoconvert_api_EmptyDirVolumeSource_To_v1beta3_EmptyDirVolumeSource, autoconvert_api_EnvVarSource_To_v1beta3_EnvVarSource, autoconvert_api_EnvVar_To_v1beta3_EnvVar, + autoconvert_api_ExecAction_To_v1beta3_ExecAction, + autoconvert_api_ExecNewPodHook_To_v1beta3_ExecNewPodHook, + autoconvert_api_FCVolumeSource_To_v1beta3_FCVolumeSource, + autoconvert_api_FlockerVolumeSource_To_v1beta3_FlockerVolumeSource, + autoconvert_api_GCEPersistentDiskVolumeSource_To_v1beta3_GCEPersistentDiskVolumeSource, autoconvert_api_GitBuildSource_To_v1beta3_GitBuildSource, + autoconvert_api_GitRepoVolumeSource_To_v1beta3_GitRepoVolumeSource, autoconvert_api_GitSourceRevision_To_v1beta3_GitSourceRevision, + autoconvert_api_GlusterfsVolumeSource_To_v1beta3_GlusterfsVolumeSource, autoconvert_api_GroupList_To_v1beta3_GroupList, autoconvert_api_Group_To_v1beta3_Group, + autoconvert_api_HTTPGetAction_To_v1beta3_HTTPGetAction, + autoconvert_api_Handler_To_v1beta3_Handler, + autoconvert_api_HostPathVolumeSource_To_v1beta3_HostPathVolumeSource, autoconvert_api_HostSubnetList_To_v1beta3_HostSubnetList, autoconvert_api_HostSubnet_To_v1beta3_HostSubnet, + autoconvert_api_ISCSIVolumeSource_To_v1beta3_ISCSIVolumeSource, autoconvert_api_IdentityList_To_v1beta3_IdentityList, autoconvert_api_Identity_To_v1beta3_Identity, autoconvert_api_ImageChangeTrigger_To_v1beta3_ImageChangeTrigger, @@ -5274,9 +7803,12 @@ func init() { autoconvert_api_ImageStream_To_v1beta3_ImageStream, autoconvert_api_Image_To_v1beta3_Image, autoconvert_api_IsPersonalSubjectAccessReview_To_v1beta3_IsPersonalSubjectAccessReview, + autoconvert_api_LifecycleHook_To_v1beta3_LifecycleHook, + autoconvert_api_Lifecycle_To_v1beta3_Lifecycle, autoconvert_api_LocalObjectReference_To_v1beta3_LocalObjectReference, autoconvert_api_LocalResourceAccessReview_To_v1beta3_LocalResourceAccessReview, autoconvert_api_LocalSubjectAccessReview_To_v1beta3_LocalSubjectAccessReview, + autoconvert_api_NFSVolumeSource_To_v1beta3_NFSVolumeSource, autoconvert_api_NetNamespaceList_To_v1beta3_NetNamespaceList, autoconvert_api_NetNamespace_To_v1beta3_NetNamespace, autoconvert_api_OAuthAccessTokenList_To_v1beta3_OAuthAccessTokenList, @@ -5291,16 +7823,22 @@ func init() { autoconvert_api_ObjectMeta_To_v1beta3_ObjectMeta, autoconvert_api_ObjectReference_To_v1beta3_ObjectReference, autoconvert_api_Parameter_To_v1beta3_Parameter, + autoconvert_api_PersistentVolumeClaimVolumeSource_To_v1beta3_PersistentVolumeClaimVolumeSource, + autoconvert_api_PodSpec_To_v1beta3_PodSpec, + autoconvert_api_PodTemplateSpec_To_v1beta3_PodTemplateSpec, autoconvert_api_PolicyBindingList_To_v1beta3_PolicyBindingList, autoconvert_api_PolicyBinding_To_v1beta3_PolicyBinding, autoconvert_api_PolicyList_To_v1beta3_PolicyList, autoconvert_api_PolicyRule_To_v1beta3_PolicyRule, autoconvert_api_Policy_To_v1beta3_Policy, + autoconvert_api_Probe_To_v1beta3_Probe, autoconvert_api_ProjectList_To_v1beta3_ProjectList, autoconvert_api_ProjectRequest_To_v1beta3_ProjectRequest, autoconvert_api_ProjectSpec_To_v1beta3_ProjectSpec, autoconvert_api_ProjectStatus_To_v1beta3_ProjectStatus, autoconvert_api_Project_To_v1beta3_Project, + autoconvert_api_RBDVolumeSource_To_v1beta3_RBDVolumeSource, + autoconvert_api_RecreateDeploymentStrategyParams_To_v1beta3_RecreateDeploymentStrategyParams, autoconvert_api_ResourceAccessReviewResponse_To_v1beta3_ResourceAccessReviewResponse, autoconvert_api_ResourceAccessReview_To_v1beta3_ResourceAccessReview, autoconvert_api_ResourceRequirements_To_v1beta3_ResourceRequirements, @@ -5308,24 +7846,33 @@ func init() { autoconvert_api_RoleBinding_To_v1beta3_RoleBinding, autoconvert_api_RoleList_To_v1beta3_RoleList, autoconvert_api_Role_To_v1beta3_Role, + autoconvert_api_RollingDeploymentStrategyParams_To_v1beta3_RollingDeploymentStrategyParams, autoconvert_api_RouteList_To_v1beta3_RouteList, autoconvert_api_RoutePort_To_v1beta3_RoutePort, autoconvert_api_RouteSpec_To_v1beta3_RouteSpec, autoconvert_api_RouteStatus_To_v1beta3_RouteStatus, autoconvert_api_Route_To_v1beta3_Route, + autoconvert_api_SELinuxOptions_To_v1beta3_SELinuxOptions, autoconvert_api_SecretSpec_To_v1beta3_SecretSpec, + autoconvert_api_SecretVolumeSource_To_v1beta3_SecretVolumeSource, + autoconvert_api_SecurityContext_To_v1beta3_SecurityContext, autoconvert_api_SourceBuildStrategy_To_v1beta3_SourceBuildStrategy, autoconvert_api_SourceControlUser_To_v1beta3_SourceControlUser, autoconvert_api_SourceRevision_To_v1beta3_SourceRevision, autoconvert_api_SubjectAccessReviewResponse_To_v1beta3_SubjectAccessReviewResponse, autoconvert_api_SubjectAccessReview_To_v1beta3_SubjectAccessReview, + autoconvert_api_TCPSocketAction_To_v1beta3_TCPSocketAction, autoconvert_api_TLSConfig_To_v1beta3_TLSConfig, autoconvert_api_TemplateList_To_v1beta3_TemplateList, autoconvert_api_Template_To_v1beta3_Template, autoconvert_api_UserIdentityMapping_To_v1beta3_UserIdentityMapping, autoconvert_api_UserList_To_v1beta3_UserList, autoconvert_api_User_To_v1beta3_User, + autoconvert_api_VolumeMount_To_v1beta3_VolumeMount, + autoconvert_api_VolumeSource_To_v1beta3_VolumeSource, + autoconvert_api_Volume_To_v1beta3_Volume, autoconvert_api_WebHookTrigger_To_v1beta3_WebHookTrigger, + autoconvert_v1beta3_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource, autoconvert_v1beta3_BinaryBuildRequestOptions_To_api_BinaryBuildRequestOptions, autoconvert_v1beta3_BinaryBuildSource_To_api_BinaryBuildSource, autoconvert_v1beta3_BuildConfigList_To_api_BuildConfigList, @@ -5343,6 +7890,9 @@ func init() { autoconvert_v1beta3_BuildStrategy_To_api_BuildStrategy, autoconvert_v1beta3_BuildTriggerPolicy_To_api_BuildTriggerPolicy, autoconvert_v1beta3_Build_To_api_Build, + autoconvert_v1beta3_Capabilities_To_api_Capabilities, + autoconvert_v1beta3_CephFSVolumeSource_To_api_CephFSVolumeSource, + autoconvert_v1beta3_CinderVolumeSource_To_api_CinderVolumeSource, autoconvert_v1beta3_ClusterNetworkList_To_api_ClusterNetworkList, autoconvert_v1beta3_ClusterNetwork_To_api_ClusterNetwork, autoconvert_v1beta3_ClusterPolicyBindingList_To_api_ClusterPolicyBindingList, @@ -5353,22 +7903,47 @@ func init() { autoconvert_v1beta3_ClusterRoleBinding_To_api_ClusterRoleBinding, autoconvert_v1beta3_ClusterRoleList_To_api_ClusterRoleList, autoconvert_v1beta3_ClusterRole_To_api_ClusterRole, + autoconvert_v1beta3_ContainerPort_To_api_ContainerPort, + autoconvert_v1beta3_Container_To_api_Container, autoconvert_v1beta3_CustomBuildStrategy_To_api_CustomBuildStrategy, + autoconvert_v1beta3_CustomDeploymentStrategyParams_To_api_CustomDeploymentStrategyParams, + autoconvert_v1beta3_DeploymentCauseImageTrigger_To_api_DeploymentCauseImageTrigger, + autoconvert_v1beta3_DeploymentCause_To_api_DeploymentCause, autoconvert_v1beta3_DeploymentConfigList_To_api_DeploymentConfigList, autoconvert_v1beta3_DeploymentConfigRollbackSpec_To_api_DeploymentConfigRollbackSpec, autoconvert_v1beta3_DeploymentConfigRollback_To_api_DeploymentConfigRollback, + autoconvert_v1beta3_DeploymentConfigSpec_To_api_DeploymentConfigSpec, + autoconvert_v1beta3_DeploymentConfigStatus_To_api_DeploymentConfigStatus, autoconvert_v1beta3_DeploymentConfig_To_api_DeploymentConfig, + autoconvert_v1beta3_DeploymentDetails_To_api_DeploymentDetails, autoconvert_v1beta3_DeploymentLogOptions_To_api_DeploymentLogOptions, autoconvert_v1beta3_DeploymentLog_To_api_DeploymentLog, + autoconvert_v1beta3_DeploymentStrategy_To_api_DeploymentStrategy, + autoconvert_v1beta3_DeploymentTriggerImageChangeParams_To_api_DeploymentTriggerImageChangeParams, + autoconvert_v1beta3_DeploymentTriggerPolicy_To_api_DeploymentTriggerPolicy, autoconvert_v1beta3_DockerBuildStrategy_To_api_DockerBuildStrategy, + autoconvert_v1beta3_DownwardAPIVolumeFile_To_api_DownwardAPIVolumeFile, + autoconvert_v1beta3_DownwardAPIVolumeSource_To_api_DownwardAPIVolumeSource, + autoconvert_v1beta3_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource, autoconvert_v1beta3_EnvVarSource_To_api_EnvVarSource, autoconvert_v1beta3_EnvVar_To_api_EnvVar, + autoconvert_v1beta3_ExecAction_To_api_ExecAction, + autoconvert_v1beta3_ExecNewPodHook_To_api_ExecNewPodHook, + autoconvert_v1beta3_FCVolumeSource_To_api_FCVolumeSource, + autoconvert_v1beta3_FlockerVolumeSource_To_api_FlockerVolumeSource, + autoconvert_v1beta3_GCEPersistentDiskVolumeSource_To_api_GCEPersistentDiskVolumeSource, autoconvert_v1beta3_GitBuildSource_To_api_GitBuildSource, + autoconvert_v1beta3_GitRepoVolumeSource_To_api_GitRepoVolumeSource, autoconvert_v1beta3_GitSourceRevision_To_api_GitSourceRevision, + autoconvert_v1beta3_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource, autoconvert_v1beta3_GroupList_To_api_GroupList, autoconvert_v1beta3_Group_To_api_Group, + autoconvert_v1beta3_HTTPGetAction_To_api_HTTPGetAction, + autoconvert_v1beta3_Handler_To_api_Handler, + autoconvert_v1beta3_HostPathVolumeSource_To_api_HostPathVolumeSource, autoconvert_v1beta3_HostSubnetList_To_api_HostSubnetList, autoconvert_v1beta3_HostSubnet_To_api_HostSubnet, + autoconvert_v1beta3_ISCSIVolumeSource_To_api_ISCSIVolumeSource, autoconvert_v1beta3_IdentityList_To_api_IdentityList, autoconvert_v1beta3_Identity_To_api_Identity, autoconvert_v1beta3_ImageChangeTrigger_To_api_ImageChangeTrigger, @@ -5383,9 +7958,12 @@ func init() { autoconvert_v1beta3_ImageStream_To_api_ImageStream, autoconvert_v1beta3_Image_To_api_Image, autoconvert_v1beta3_IsPersonalSubjectAccessReview_To_api_IsPersonalSubjectAccessReview, + autoconvert_v1beta3_LifecycleHook_To_api_LifecycleHook, + autoconvert_v1beta3_Lifecycle_To_api_Lifecycle, autoconvert_v1beta3_LocalObjectReference_To_api_LocalObjectReference, autoconvert_v1beta3_LocalResourceAccessReview_To_api_LocalResourceAccessReview, autoconvert_v1beta3_LocalSubjectAccessReview_To_api_LocalSubjectAccessReview, + autoconvert_v1beta3_NFSVolumeSource_To_api_NFSVolumeSource, autoconvert_v1beta3_NetNamespaceList_To_api_NetNamespaceList, autoconvert_v1beta3_NetNamespace_To_api_NetNamespace, autoconvert_v1beta3_OAuthAccessTokenList_To_api_OAuthAccessTokenList, @@ -5400,16 +7978,22 @@ func init() { autoconvert_v1beta3_ObjectMeta_To_api_ObjectMeta, autoconvert_v1beta3_ObjectReference_To_api_ObjectReference, autoconvert_v1beta3_Parameter_To_api_Parameter, + autoconvert_v1beta3_PersistentVolumeClaimVolumeSource_To_api_PersistentVolumeClaimVolumeSource, + autoconvert_v1beta3_PodSpec_To_api_PodSpec, + autoconvert_v1beta3_PodTemplateSpec_To_api_PodTemplateSpec, autoconvert_v1beta3_PolicyBindingList_To_api_PolicyBindingList, autoconvert_v1beta3_PolicyBinding_To_api_PolicyBinding, autoconvert_v1beta3_PolicyList_To_api_PolicyList, autoconvert_v1beta3_PolicyRule_To_api_PolicyRule, autoconvert_v1beta3_Policy_To_api_Policy, + autoconvert_v1beta3_Probe_To_api_Probe, autoconvert_v1beta3_ProjectList_To_api_ProjectList, autoconvert_v1beta3_ProjectRequest_To_api_ProjectRequest, autoconvert_v1beta3_ProjectSpec_To_api_ProjectSpec, autoconvert_v1beta3_ProjectStatus_To_api_ProjectStatus, autoconvert_v1beta3_Project_To_api_Project, + autoconvert_v1beta3_RBDVolumeSource_To_api_RBDVolumeSource, + autoconvert_v1beta3_RecreateDeploymentStrategyParams_To_api_RecreateDeploymentStrategyParams, autoconvert_v1beta3_ResourceAccessReviewResponse_To_api_ResourceAccessReviewResponse, autoconvert_v1beta3_ResourceAccessReview_To_api_ResourceAccessReview, autoconvert_v1beta3_ResourceRequirements_To_api_ResourceRequirements, @@ -5417,23 +8001,31 @@ func init() { autoconvert_v1beta3_RoleBinding_To_api_RoleBinding, autoconvert_v1beta3_RoleList_To_api_RoleList, autoconvert_v1beta3_Role_To_api_Role, + autoconvert_v1beta3_RollingDeploymentStrategyParams_To_api_RollingDeploymentStrategyParams, autoconvert_v1beta3_RouteList_To_api_RouteList, autoconvert_v1beta3_RoutePort_To_api_RoutePort, autoconvert_v1beta3_RouteSpec_To_api_RouteSpec, autoconvert_v1beta3_RouteStatus_To_api_RouteStatus, autoconvert_v1beta3_Route_To_api_Route, + autoconvert_v1beta3_SELinuxOptions_To_api_SELinuxOptions, autoconvert_v1beta3_SecretSpec_To_api_SecretSpec, + autoconvert_v1beta3_SecretVolumeSource_To_api_SecretVolumeSource, + autoconvert_v1beta3_SecurityContext_To_api_SecurityContext, autoconvert_v1beta3_SourceBuildStrategy_To_api_SourceBuildStrategy, autoconvert_v1beta3_SourceControlUser_To_api_SourceControlUser, autoconvert_v1beta3_SourceRevision_To_api_SourceRevision, autoconvert_v1beta3_SubjectAccessReviewResponse_To_api_SubjectAccessReviewResponse, autoconvert_v1beta3_SubjectAccessReview_To_api_SubjectAccessReview, + autoconvert_v1beta3_TCPSocketAction_To_api_TCPSocketAction, autoconvert_v1beta3_TLSConfig_To_api_TLSConfig, autoconvert_v1beta3_TemplateList_To_api_TemplateList, autoconvert_v1beta3_Template_To_api_Template, autoconvert_v1beta3_UserIdentityMapping_To_api_UserIdentityMapping, autoconvert_v1beta3_UserList_To_api_UserList, autoconvert_v1beta3_User_To_api_User, + autoconvert_v1beta3_VolumeMount_To_api_VolumeMount, + autoconvert_v1beta3_VolumeSource_To_api_VolumeSource, + autoconvert_v1beta3_Volume_To_api_Volume, autoconvert_v1beta3_WebHookTrigger_To_api_WebHookTrigger, ) if err != nil { diff --git a/pkg/cmd/admin/registry/registry.go b/pkg/cmd/admin/registry/registry.go index 5046fa6a8986..ec6eb9cdd4dd 100644 --- a/pkg/cmd/admin/registry/registry.go +++ b/pkg/cmd/admin/registry/registry.go @@ -285,15 +285,13 @@ func RunCmdRegistry(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, cfg Name: name, Labels: label, }, - Triggers: []dapi.DeploymentTriggerPolicy{ - {Type: dapi.DeploymentTriggerOnConfigChange}, - }, - Template: dapi.DeploymentTemplate{ - ControllerTemplate: kapi.ReplicationControllerSpec{ - Replicas: cfg.Replicas, - Selector: label, - Template: podTemplate, + Spec: dapi.DeploymentConfigSpec{ + Replicas: cfg.Replicas, + Selector: label, + Triggers: []dapi.DeploymentTriggerPolicy{ + {Type: dapi.DeploymentTriggerOnConfigChange}, }, + Template: podTemplate, }, }, } diff --git a/pkg/cmd/admin/router/router.go b/pkg/cmd/admin/router/router.go index 0a2ad749c35a..7119dff1778d 100644 --- a/pkg/cmd/admin/router/router.go +++ b/pkg/cmd/admin/router/router.go @@ -590,28 +590,26 @@ func RunCmdRouter(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, cfg * Name: name, Labels: label, }, - Triggers: []dapi.DeploymentTriggerPolicy{ - {Type: dapi.DeploymentTriggerOnConfigChange}, - }, - Template: dapi.DeploymentTemplate{ + Spec: dapi.DeploymentConfigSpec{ Strategy: dapi.DeploymentStrategy{ Type: dapi.DeploymentStrategyTypeRolling, RollingParams: &dapi.RollingDeploymentStrategyParams{UpdatePercent: &updatePercent}, }, - ControllerTemplate: kapi.ReplicationControllerSpec{ - Replicas: cfg.Replicas, - Selector: label, - Template: &kapi.PodTemplateSpec{ - ObjectMeta: kapi.ObjectMeta{Labels: label}, - Spec: kapi.PodSpec{ - SecurityContext: &kapi.PodSecurityContext{ - HostNetwork: cfg.HostNetwork, - }, - ServiceAccountName: cfg.ServiceAccount, - NodeSelector: nodeSelector, - Containers: containers, - Volumes: volumes, + Replicas: cfg.Replicas, + Selector: label, + Triggers: []dapi.DeploymentTriggerPolicy{ + {Type: dapi.DeploymentTriggerOnConfigChange}, + }, + Template: &kapi.PodTemplateSpec{ + ObjectMeta: kapi.ObjectMeta{Labels: label}, + Spec: kapi.PodSpec{ + SecurityContext: &kapi.PodSecurityContext{ + HostNetwork: cfg.HostNetwork, }, + ServiceAccountName: cfg.ServiceAccount, + NodeSelector: nodeSelector, + Containers: containers, + Volumes: volumes, }, }, }, diff --git a/pkg/cmd/cli/cmd/deploy.go b/pkg/cmd/cli/cmd/deploy.go index eecfa0492e69..b5e89fd3ca50 100644 --- a/pkg/cmd/cli/cmd/deploy.go +++ b/pkg/cmd/cli/cmd/deploy.go @@ -213,7 +213,7 @@ func (o DeployOptions) deploy(config *deployapi.DeploymentConfig, out io.Writer) // Reject attempts to start a concurrent deployment. status := deployutil.DeploymentStatusFor(deployment) if status != deployapi.DeploymentStatusComplete && status != deployapi.DeploymentStatusFailed { - return fmt.Errorf("#%d is already in progress (%s).\nOptionally, you can cancel this deployment using the --cancel option.", config.LatestVersion, status) + return fmt.Errorf("#%d is already in progress (%s).\nOptionally, you can cancel this deployment using the --cancel option.", config.Status.LatestVersion, status) } } else { if !kerrors.IsNotFound(err) { @@ -221,10 +221,10 @@ func (o DeployOptions) deploy(config *deployapi.DeploymentConfig, out io.Writer) } } - config.LatestVersion++ + config.Status.LatestVersion++ _, err = o.osClient.DeploymentConfigs(config.Namespace).Update(config) if err == nil { - fmt.Fprintf(out, "Started deployment #%d\n", config.LatestVersion) + fmt.Fprintf(out, "Started deployment #%d\n", config.Status.LatestVersion) } return err } @@ -233,20 +233,20 @@ func (o DeployOptions) deploy(config *deployapi.DeploymentConfig, out io.Writer) // the deployment to be retried. An error is returned if the deployment is not // currently in a failed state. func (o DeployOptions) retry(config *deployapi.DeploymentConfig, out io.Writer) error { - if config.LatestVersion == 0 { + if config.Status.LatestVersion == 0 { return fmt.Errorf("no deployments found for %s/%s", config.Namespace, config.Name) } deploymentName := deployutil.LatestDeploymentNameForConfig(config) deployment, err := o.kubeClient.ReplicationControllers(config.Namespace).Get(deploymentName) if err != nil { if kerrors.IsNotFound(err) { - return fmt.Errorf("unable to find the latest deployment (#%d).\nYou can start a new deployment using the --latest option.", config.LatestVersion) + return fmt.Errorf("unable to find the latest deployment (#%d).\nYou can start a new deployment using the --latest option.", config.Status.LatestVersion) } return err } if status := deployutil.DeploymentStatusFor(deployment); status != deployapi.DeploymentStatusFailed { - message := fmt.Sprintf("#%d is %s; only failed deployments can be retried.\n", config.LatestVersion, status) + message := fmt.Sprintf("#%d is %s; only failed deployments can be retried.\n", config.Status.LatestVersion, status) if status == deployapi.DeploymentStatusComplete { message += "You can start a new deployment using the --latest option." } else { @@ -259,12 +259,12 @@ func (o DeployOptions) retry(config *deployapi.DeploymentConfig, out io.Writer) // Delete the deployer pod as well as the deployment hooks pods, if any pods, err := o.kubeClient.Pods(config.Namespace).List(deployutil.DeployerPodSelector(deploymentName), fields.Everything()) if err != nil { - return fmt.Errorf("failed to list deployer/hook pods for deployment #%d: %v", config.LatestVersion, err) + return fmt.Errorf("failed to list deployer/hook pods for deployment #%d: %v", config.Status.LatestVersion, err) } for _, pod := range pods.Items { err := o.kubeClient.Pods(pod.Namespace).Delete(pod.Name, kapi.NewDeleteOptions(0)) if err != nil { - return fmt.Errorf("failed to delete deployer/hook pod %s for deployment #%d: %v", pod.Name, config.LatestVersion, err) + return fmt.Errorf("failed to delete deployer/hook pod %s for deployment #%d: %v", pod.Name, config.Status.LatestVersion, err) } } @@ -274,7 +274,7 @@ func (o DeployOptions) retry(config *deployapi.DeploymentConfig, out io.Writer) delete(deployment.Annotations, deployapi.DeploymentCancelledAnnotation) _, err = o.kubeClient.ReplicationControllers(deployment.Namespace).Update(deployment) if err == nil { - fmt.Fprintf(out, "Retried #%d\n", config.LatestVersion) + fmt.Fprintf(out, "Retried #%d\n", config.Status.LatestVersion) } return err } @@ -307,7 +307,7 @@ func (o DeployOptions) cancel(config *deployapi.DeploymentConfig, out io.Writer) deployment.Annotations[deployapi.DeploymentStatusReasonAnnotation] = deployapi.DeploymentCancelledByUser _, err := o.kubeClient.ReplicationControllers(deployment.Namespace).Update(&deployment) if err == nil { - fmt.Fprintf(out, "Cancelled deployment #%d\n", config.LatestVersion) + fmt.Fprintf(out, "Cancelled deployment #%d\n", config.Status.LatestVersion) anyCancelled = true } else { fmt.Fprintf(out, "Couldn't cancel deployment #%d (status: %s): %v\n", deployutil.DeploymentVersionFor(&deployment), status, err) @@ -332,7 +332,7 @@ func (o DeployOptions) cancel(config *deployapi.DeploymentConfig, out io.Writer) // reenableTriggers enables all image triggers and then persists config. func (o DeployOptions) reenableTriggers(config *deployapi.DeploymentConfig, out io.Writer) error { enabled := []string{} - for _, trigger := range config.Triggers { + for _, trigger := range config.Spec.Triggers { if trigger.Type == deployapi.DeploymentTriggerOnImageChange { trigger.ImageChangeParams.Automatic = true enabled = append(enabled, trigger.ImageChangeParams.From.Name) diff --git a/pkg/cmd/cli/cmd/deploy_test.go b/pkg/cmd/cli/cmd/deploy_test.go index 8fe7669c98e7..e548880e65f5 100644 --- a/pkg/cmd/cli/cmd/deploy_test.go +++ b/pkg/cmd/cli/cmd/deploy_test.go @@ -60,7 +60,7 @@ func TestCmdDeploy_latestOk(t *testing.T) { t.Fatalf("expected updated config") } - if e, a := 2, updatedConfig.LatestVersion; e != a { + if e, a := 2, updatedConfig.Status.LatestVersion; e != a { t.Fatalf("expected updated config version %d, got %d", e, a) } } @@ -292,10 +292,10 @@ func TestDeploy_reenableTriggers(t *testing.T) { }) config := deploytest.OkDeploymentConfig(1) - config.Triggers = []deployapi.DeploymentTriggerPolicy{} + config.Spec.Triggers = []deployapi.DeploymentTriggerPolicy{} count := 3 for i := 0; i < count; i++ { - config.Triggers = append(config.Triggers, mktrigger()) + config.Spec.Triggers = append(config.Spec.Triggers, mktrigger()) } o := &DeployOptions{osClient: osClient} @@ -308,10 +308,10 @@ func TestDeploy_reenableTriggers(t *testing.T) { t.Fatalf("expected an updated config") } - if e, a := count, len(config.Triggers); e != a { + if e, a := count, len(config.Spec.Triggers); e != a { t.Fatalf("expected %d triggers, got %d", e, a) } - for _, trigger := range config.Triggers { + for _, trigger := range config.Spec.Triggers { if !trigger.ImageChangeParams.Automatic { t.Errorf("expected trigger to be enabled: %#v", trigger.ImageChangeParams) } diff --git a/pkg/cmd/cli/cmd/exporter.go b/pkg/cmd/cli/cmd/exporter.go index 390b46e1ebb8..69493422694b 100644 --- a/pkg/cmd/cli/cmd/exporter.go +++ b/pkg/cmd/cli/cmd/exporter.go @@ -142,10 +142,10 @@ func (e *defaultExporter) Export(obj runtime.Object, exact bool) error { case *deployapi.DeploymentConfig: // TODO: when internal refactor is completed use status reset - t.LatestVersion = 0 - t.Details = nil - for i := range t.Triggers { - if p := t.Triggers[i].ImageChangeParams; p != nil { + t.Status.LatestVersion = 0 + t.Status.Details = nil + for i := range t.Spec.Triggers { + if p := t.Spec.Triggers[i].ImageChangeParams; p != nil { p.LastTriggeredImage = "" } } diff --git a/pkg/cmd/cli/cmd/exporter_test.go b/pkg/cmd/cli/cmd/exporter_test.go index 195c525415b4..20f3ba75c66c 100644 --- a/pkg/cmd/cli/cmd/exporter_test.go +++ b/pkg/cmd/cli/cmd/exporter_test.go @@ -33,11 +33,8 @@ func TestExport(t *testing.T) { ObjectMeta: kapi.ObjectMeta{ Name: "config", }, - LatestVersion: 0, - Triggers: []deployapi.DeploymentTriggerPolicy{ - deploytest.OkImageChangeTrigger(), - }, - Template: deploytest.OkDeploymentTemplate(), + Spec: deploytest.OkDeploymentConfigSpec(), + Status: deploytest.OkDeploymentConfigStatus(0), }, expectedErr: nil, }, diff --git a/pkg/cmd/cli/cmd/rollback.go b/pkg/cmd/cli/cmd/rollback.go index f6f31d7cd3c3..9d04f92b4025 100644 --- a/pkg/cmd/cli/cmd/rollback.go +++ b/pkg/cmd/cli/cmd/rollback.go @@ -249,8 +249,8 @@ func (o *RollbackOptions) Run() error { } // Print warnings about any image triggers disabled during the rollback. - fmt.Fprintf(o.out, "#%d rolled back to %s\n", rolledback.LatestVersion, rollback.Spec.From.Name) - for _, trigger := range rolledback.Triggers { + fmt.Fprintf(o.out, "#%d rolled back to %s\n", rolledback.Status.LatestVersion, rollback.Spec.From.Name) + for _, trigger := range rolledback.Spec.Triggers { disabled := []string{} if trigger.Type == deployapi.DeploymentTriggerOnImageChange && !trigger.ImageChangeParams.Automatic { disabled = append(disabled, trigger.ImageChangeParams.From.Name) @@ -327,7 +327,7 @@ func (o *RollbackOptions) findTargetDeployment(config *deployapi.DeploymentConfi break } } else { - if version < config.LatestVersion && deployutil.DeploymentStatusFor(&deployment) == deployapi.DeploymentStatusComplete { + if version < config.Status.LatestVersion && deployutil.DeploymentStatusFor(&deployment) == deployapi.DeploymentStatusComplete { target = &deployment break } diff --git a/pkg/cmd/cli/describe/deployments.go b/pkg/cmd/cli/describe/deployments.go index 91f8c7a4b06f..f8e48192f95d 100644 --- a/pkg/cmd/cli/describe/deployments.go +++ b/pkg/cmd/cli/describe/deployments.go @@ -23,6 +23,7 @@ import ( deployedges "github.com/openshift/origin/pkg/deploy/graph" deploygraph "github.com/openshift/origin/pkg/deploy/graph/nodes" deployutil "github.com/openshift/origin/pkg/deploy/util" + imageapi "github.com/openshift/origin/pkg/image/api" ) // DeploymentConfigDescriber generates information about a DeploymentConfig @@ -127,19 +128,19 @@ func (d *DeploymentConfigDescriber) Describe(namespace, name string) (string, er return tabbedString(func(out *tabwriter.Writer) error { formatMeta(out, deploymentConfig.ObjectMeta) - if deploymentConfig.LatestVersion == 0 { + if deploymentConfig.Status.LatestVersion == 0 { formatString(out, "Latest Version", "Not deployed") } else { - formatString(out, "Latest Version", strconv.Itoa(deploymentConfig.LatestVersion)) + formatString(out, "Latest Version", strconv.Itoa(deploymentConfig.Status.LatestVersion)) } - printTriggers(deploymentConfig.Triggers, out) + printTriggers(deploymentConfig.Spec.Triggers, out) - formatString(out, "Strategy", deploymentConfig.Template.Strategy.Type) - printStrategy(deploymentConfig.Template.Strategy, out) - printReplicationControllerSpec(deploymentConfig.Template.ControllerTemplate, out) - if deploymentConfig.Details != nil && len(deploymentConfig.Details.Message) > 0 { - fmt.Fprintf(out, "Warning:\t%s\n", deploymentConfig.Details.Message) + formatString(out, "Strategy", deploymentConfig.Spec.Strategy.Type) + printStrategy(deploymentConfig.Spec.Strategy, out) + printDeploymentConfigSpec(deploymentConfig.Spec, out) + if deploymentConfig.Status.Details != nil && len(deploymentConfig.Status.Details.Message) > 0 { + fmt.Fprintf(out, "Warning:\t%s\n", deploymentConfig.Status.Details.Message) } deploymentName := deployutil.LatestDeploymentNameForConfig(deploymentConfig) deployment, err := d.client.getDeployment(namespace, deploymentName) @@ -232,10 +233,9 @@ func printTriggers(triggers []deployapi.DeploymentTriggerPolicy, w *tabwriter.Wr case deployapi.DeploymentTriggerOnConfigChange: labels = append(labels, "Config") case deployapi.DeploymentTriggerOnImageChange: - if len(t.ImageChangeParams.RepositoryName) > 0 { - labels = append(labels, fmt.Sprintf("Image(%s@%s, auto=%v)", t.ImageChangeParams.RepositoryName, t.ImageChangeParams.Tag, t.ImageChangeParams.Automatic)) - } else if len(t.ImageChangeParams.From.Name) > 0 { - labels = append(labels, fmt.Sprintf("Image(%s@%s, auto=%v)", t.ImageChangeParams.From.Name, t.ImageChangeParams.Tag, t.ImageChangeParams.Automatic)) + if len(t.ImageChangeParams.From.Name) > 0 { + name, tag, _ := imageapi.SplitImageStreamTag(t.ImageChangeParams.From.Name) + labels = append(labels, fmt.Sprintf("Image(%s@%s, auto=%v)", name, tag, t.ImageChangeParams.Automatic)) } } } @@ -244,7 +244,7 @@ func printTriggers(triggers []deployapi.DeploymentTriggerPolicy, w *tabwriter.Wr formatString(w, "Triggers", desc) } -func printReplicationControllerSpec(spec kapi.ReplicationControllerSpec, w io.Writer) error { +func printDeploymentConfigSpec(spec deployapi.DeploymentConfigSpec, w io.Writer) error { fmt.Fprint(w, "Template:\n") fmt.Fprintf(w, " Selector:\t%s\n Replicas:\t%d\n", diff --git a/pkg/cmd/cli/describe/describer_test.go b/pkg/cmd/cli/describe/describer_test.go index e5b7a816a646..68bcd1845122 100644 --- a/pkg/cmd/cli/describe/describer_test.go +++ b/pkg/cmd/cli/describe/describer_test.go @@ -170,18 +170,17 @@ func TestDeploymentConfigDescriber(t *testing.T) { podList.Items = []kapi.Pod{*mkPod(kapi.PodRunning, 0)} describe() - config.Triggers = append(config.Triggers, deployapitest.OkConfigChangeTrigger()) + config.Spec.Triggers = append(config.Spec.Triggers, deployapitest.OkConfigChangeTrigger()) describe() - config.Template.Strategy = deployapitest.OkCustomStrategy() + config.Spec.Strategy = deployapitest.OkCustomStrategy() describe() - config.Triggers[0].ImageChangeParams.RepositoryName = "" - config.Triggers[0].ImageChangeParams.From = kapi.ObjectReference{Name: "imageRepo"} + config.Spec.Triggers[0].ImageChangeParams.From = kapi.ObjectReference{Name: "imageRepo"} describe() - config.Template.Strategy = deployapitest.OkStrategy() - config.Template.Strategy.RecreateParams = &deployapi.RecreateDeploymentStrategyParams{ + config.Spec.Strategy = deployapitest.OkStrategy() + config.Spec.Strategy.RecreateParams = &deployapi.RecreateDeploymentStrategyParams{ Pre: &deployapi.LifecycleHook{ FailurePolicy: deployapi.LifecycleHookFailurePolicyAbort, ExecNewPod: &deployapi.ExecNewPodHook{ diff --git a/pkg/cmd/cli/describe/printer.go b/pkg/cmd/cli/describe/printer.go index a564953f96fb..0421d0aeed4c 100644 --- a/pkg/cmd/cli/describe/printer.go +++ b/pkg/cmd/cli/describe/printer.go @@ -453,7 +453,7 @@ func printRouteList(routeList *routeapi.RouteList, w io.Writer, withNamespace, w func printDeploymentConfig(dc *deployapi.DeploymentConfig, w io.Writer, withNamespace, wide, showAll bool, columnLabels []string) error { triggers := sets.String{} - for _, trigger := range dc.Triggers { + for _, trigger := range dc.Spec.Triggers { triggers.Insert(string(trigger.Type)) } tStr := strings.Join(triggers.List(), ", ") @@ -463,7 +463,7 @@ func printDeploymentConfig(dc *deployapi.DeploymentConfig, w io.Writer, withName return err } } - _, err := fmt.Fprintf(w, "%s\t%s\t%v\n", dc.Name, tStr, dc.LatestVersion) + _, err := fmt.Fprintf(w, "%s\t%s\t%v\n", dc.Name, tStr, dc.Status.LatestVersion) return err } diff --git a/pkg/cmd/cli/describe/projectstatus.go b/pkg/cmd/cli/describe/projectstatus.go index 35abad320fa8..9074ae88c3c8 100644 --- a/pkg/cmd/cli/describe/projectstatus.go +++ b/pkg/cmd/cli/describe/projectstatus.go @@ -390,7 +390,7 @@ func describeRouteInServiceGroup(routeNode *routegraph.RouteNode) []string { } func describeDeploymentConfigTrigger(dc *deployapi.DeploymentConfig) string { - if len(dc.Triggers) == 0 { + if len(dc.Spec.Triggers) == 0 { return "(manual)" } @@ -624,10 +624,10 @@ func describeDeployments(dcNode *deploygraph.DeploymentConfigNode, activeDeploym if activeDeployment == nil { on, auto := describeDeploymentConfigTriggers(dcNode.DeploymentConfig) - if dcNode.DeploymentConfig.LatestVersion == 0 { + if dcNode.DeploymentConfig.Status.LatestVersion == 0 { out = append(out, fmt.Sprintf("#1 deployment waiting %s", on)) } else if auto { - out = append(out, fmt.Sprintf("#%d deployment pending %s", dcNode.DeploymentConfig.LatestVersion, on)) + out = append(out, fmt.Sprintf("#%d deployment pending %s", dcNode.DeploymentConfig.Status.LatestVersion, on)) } // TODO: detect new image available? } else { @@ -714,7 +714,7 @@ func describePodSummary(rc *kapi.ReplicationController, includeEmpty bool) strin func describeDeploymentConfigTriggers(config *deployapi.DeploymentConfig) (string, bool) { hasConfig, hasImage := false, false - for _, t := range config.Triggers { + for _, t := range config.Spec.Triggers { switch t.Type { case deployapi.DeploymentTriggerOnConfigChange: hasConfig = true diff --git a/pkg/cmd/infra/deployer/deployer.go b/pkg/cmd/infra/deployer/deployer.go index d579ad0eb932..dc00eca1724b 100644 --- a/pkg/cmd/infra/deployer/deployer.go +++ b/pkg/cmd/infra/deployer/deployer.go @@ -89,14 +89,14 @@ func NewDeployer(client kclient.Interface) *Deployer { }, scaler: scaler, strategyFor: func(config *deployapi.DeploymentConfig) (strategy.DeploymentStrategy, error) { - switch config.Template.Strategy.Type { + switch config.Spec.Strategy.Type { case deployapi.DeploymentStrategyTypeRecreate: return recreate.NewRecreateDeploymentStrategy(client, latest.Codec), nil case deployapi.DeploymentStrategyTypeRolling: recreate := recreate.NewRecreateDeploymentStrategy(client, latest.Codec) return rolling.NewRollingDeploymentStrategy(config.Namespace, client, latest.Codec, recreate), nil default: - return nil, fmt.Errorf("unsupported strategy type: %s", config.Template.Strategy.Type) + return nil, fmt.Errorf("unsupported strategy type: %s", config.Spec.Strategy.Type) } }, } diff --git a/pkg/cmd/util/clientcmd/factory.go b/pkg/cmd/util/clientcmd/factory.go index 1cd43589cd1d..0342159b0961 100644 --- a/pkg/cmd/util/clientcmd/factory.go +++ b/pkg/cmd/util/clientcmd/factory.go @@ -240,7 +240,7 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory { w.PodSelectorForObject = func(object runtime.Object) (string, error) { switch t := object.(type) { case *deployapi.DeploymentConfig: - return kubectl.MakeLabels(t.Template.ControllerTemplate.Selector), nil + return kubectl.MakeLabels(t.Spec.Selector), nil default: return kPodSelectorForObjectFunc(object) } @@ -249,7 +249,7 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory { w.PortsForObject = func(object runtime.Object) ([]string, error) { switch t := object.(type) { case *deployapi.DeploymentConfig: - return getPorts(t.Template.ControllerTemplate.Template.Spec), nil + return getPorts(t.Spec.Template.Spec), nil default: return kPortsForObjectFunc(object) } @@ -323,7 +323,7 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory { var err error var pods *api.PodList for pods == nil || len(pods.Items) == 0 { - if t.LatestVersion == 0 { + if t.Status.LatestVersion == 0 { time.Sleep(2 * time.Second) } if t, err = oc.DeploymentConfigs(t.Namespace).Get(t.Name); err != nil { @@ -385,11 +385,11 @@ func (f *Factory) UpdatePodSpecForObject(obj runtime.Object, fn func(*api.PodSpe } return true, fn(&t.Spec.Template.Spec) case *deployapi.DeploymentConfig: - template := t.Template.ControllerTemplate - if template.Template == nil { - template.Template = &api.PodTemplateSpec{} + template := t.Spec.Template + if template == nil { + template = &api.PodTemplateSpec{} } - return true, fn(&template.Template.Spec) + return true, fn(&template.Spec) default: return false, fmt.Errorf("the object is not a pod or does not have a pod template") } diff --git a/pkg/deploy/api/test/ok.go b/pkg/deploy/api/test/ok.go index 2fa5d03ff335..5283a7b60a47 100644 --- a/pkg/deploy/api/test/ok.go +++ b/pkg/deploy/api/test/ok.go @@ -8,6 +8,24 @@ import ( imageapi "github.com/openshift/origin/pkg/image/api" ) +func OkDeploymentConfigSpec() deployapi.DeploymentConfigSpec { + return deployapi.DeploymentConfigSpec{ + Replicas: 1, + Selector: OkSelector(), + Strategy: OkStrategy(), + Template: OkPodTemplate(), + Triggers: []deployapi.DeploymentTriggerPolicy{ + OkImageChangeTrigger(), + }, + } +} + +func OkDeploymentConfigStatus(version int) deployapi.DeploymentConfigStatus { + return deployapi.DeploymentConfigStatus{ + LatestVersion: version, + } +} + func OkStrategy() deployapi.DeploymentStrategy { return deployapi.DeploymentStrategy{ Type: deployapi.DeploymentStrategyTypeRecreate, @@ -67,21 +85,6 @@ func OkRollingStrategy() deployapi.DeploymentStrategy { } } -func OkControllerTemplate() kapi.ReplicationControllerSpec { - return kapi.ReplicationControllerSpec{ - Replicas: 1, - Selector: OkSelector(), - Template: OkPodTemplate(), - } -} - -func OkDeploymentTemplate() deployapi.DeploymentTemplate { - return deployapi.DeploymentTemplate{ - Strategy: OkStrategy(), - ControllerTemplate: OkControllerTemplate(), - } -} - func OkSelector() map[string]string { return map[string]string{"a": "b"} } @@ -131,24 +134,9 @@ func OkImageChangeTrigger() deployapi.DeploymentTriggerPolicy { "container1", }, From: kapi.ObjectReference{ - Kind: "ImageStream", - Name: "test-image-stream", - }, - Tag: imageapi.DefaultImageTag, - }, - } -} - -func OkImageChangeTriggerDeprecated() deployapi.DeploymentTriggerPolicy { - return deployapi.DeploymentTriggerPolicy{ - Type: deployapi.DeploymentTriggerOnImageChange, - ImageChangeParams: &deployapi.DeploymentTriggerImageChangeParams{ - Automatic: true, - ContainerNames: []string{ - "container1", + Kind: "ImageStreamTag", + Name: imageapi.JoinImageStreamTag("test-image-stream", imageapi.DefaultImageTag), }, - RepositoryName: "registry:8080/repo1:ref1", - Tag: imageapi.DefaultImageTag, }, } } @@ -158,10 +146,7 @@ func OkDeploymentConfig(version int) *deployapi.DeploymentConfig { ObjectMeta: kapi.ObjectMeta{ Name: "config", }, - LatestVersion: version, - Triggers: []deployapi.DeploymentTriggerPolicy{ - OkImageChangeTrigger(), - }, - Template: OkDeploymentTemplate(), + Spec: OkDeploymentConfigSpec(), + Status: OkDeploymentConfigStatus(version), } } diff --git a/pkg/deploy/api/types.go b/pkg/deploy/api/types.go index 5a8fd1bfe1a2..7520fa80db29 100644 --- a/pkg/deploy/api/types.go +++ b/pkg/deploy/api/types.go @@ -245,12 +245,38 @@ const DeploymentCancelledAnnotationValue = "true" type DeploymentConfig struct { unversioned.TypeMeta kapi.ObjectMeta + + // Spec represents a desired deployment state and how to deploy to it. + Spec DeploymentConfigSpec + + // Status represents the current deployment state. + Status DeploymentConfigStatus +} + +// DeploymentConfigSpec represents the desired state of the deployment. +type DeploymentConfigSpec struct { + // Strategy describes how a deployment is executed. + Strategy DeploymentStrategy + // Triggers determine how updates to a DeploymentConfig result in new deployments. If no triggers // are defined, a new deployment can only occur as a result of an explicit client update to the // DeploymentConfig with a new LatestVersion. Triggers []DeploymentTriggerPolicy - // Template represents a desired deployment state and how to deploy it. - Template DeploymentTemplate + + // Replicas is the number of desired replicas. + Replicas int + + // Selector is a label query over pods that should match the Replicas count. + Selector map[string]string + + // Template is the object that describes the pod that will be created if + // insufficient replicas are detected. Internally, this takes precedence over a + // TemplateRef. + Template *kapi.PodTemplateSpec +} + +// DeploymentConfigStatus represents the current deployment state. +type DeploymentConfigStatus struct { // LatestVersion is used to determine whether the current deployment associated with a DeploymentConfig // is out of sync. LatestVersion int @@ -259,15 +285,6 @@ type DeploymentConfig struct { Details *DeploymentDetails } -// DeploymentTemplate contains all the necessary information to create a deployment from a -// DeploymentStrategy. -type DeploymentTemplate struct { - // Strategy describes how a deployment is executed. - Strategy DeploymentStrategy - // ControllerTemplate is the desired replication state the deployment works to materialize. - ControllerTemplate kapi.ReplicationControllerSpec -} - // DeploymentTriggerPolicy describes a policy for a single trigger that results in a new deployment. type DeploymentTriggerPolicy struct { // Type of the trigger @@ -296,17 +313,10 @@ type DeploymentTriggerImageChangeParams struct { Automatic bool // ContainerNames is used to restrict tag updates to the specified set of container names in a pod. ContainerNames []string - // RepositoryName is the identifier for a Docker image repository to watch for changes. - // DEPRECATED: will be removed in v1beta3. - RepositoryName string - // From is a reference to a Docker image repository to watch for changes. This field takes - // precedence over RepositoryName, which is deprecated and will be removed in v1beta3. The - // Kind may be left blank, in which case it defaults to "ImageRepository". The "Name" is - // the only required subfield - if Namespace is blank, the namespace of the current deployment + // From is a reference to an image stream tag to watch for changes. From.Name is the only + // required subfield - if From.Namespace is blank, the namespace of the current deployment // trigger will be used. From kapi.ObjectReference - // Tag is the name of an image repository tag to watch for changes. - Tag string // LastTriggeredImage is the last image to be triggered. LastTriggeredImage string } @@ -329,10 +339,9 @@ type DeploymentCause struct { // DeploymentCauseImageTrigger contains information about a deployment caused by an image trigger type DeploymentCauseImageTrigger struct { - // RepositoryName is the identifier for a Docker image repository that was updated. - RepositoryName string - // Tag is the name of an image repository tag that is now pointing to a new image. - Tag string + // From is a reference to the changed object which triggered a deployment. The field may have + // the kinds DockerImage, ImageStreamTag, or ImageStreamImage. + From kapi.ObjectReference } // DeploymentConfigList is a collection of deployment configs. diff --git a/pkg/deploy/api/v1/conversion.go b/pkg/deploy/api/v1/conversion.go index 62cb814b7892..b87a489a26d2 100644 --- a/pkg/deploy/api/v1/conversion.go +++ b/pkg/deploy/api/v1/conversion.go @@ -3,6 +3,7 @@ package v1 import ( "fmt" "math" + "strings" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/conversion" @@ -13,200 +14,36 @@ import ( imageapi "github.com/openshift/origin/pkg/image/api" ) -func convert_v1_DeploymentConfig_To_api_DeploymentConfig(in *DeploymentConfig, out *newer.DeploymentConfig, s conversion.Scope) error { - if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil { - return err - } - if err := s.Convert(&in.Spec, &out.Template, 0); err != nil { - return err - } - if err := s.Convert(&in.Spec.Triggers, &out.Triggers, 0); err != nil { - return err - } - out.LatestVersion = in.Status.LatestVersion - if err := s.Convert(&in.Status.Details, &out.Details, 0); err != nil { - return err - } - return nil -} - -func convert_api_DeploymentConfig_To_v1_DeploymentConfig(in *newer.DeploymentConfig, out *DeploymentConfig, s conversion.Scope) error { - if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil { - return err - } - if err := s.Convert(&in.Template, &out.Spec, 0); err != nil { - return err - } - if err := s.Convert(&in.Triggers, &out.Spec.Triggers, 0); err != nil { - return err - } - out.Status.LatestVersion = in.LatestVersion - if err := s.Convert(&in.Details, &out.Status.Details, 0); err != nil { - return err - } - return nil -} - -func convert_v1_DeploymentConfigSpec_To_api_DeploymentTemplate(in *DeploymentConfigSpec, out *newer.DeploymentTemplate, s conversion.Scope) error { - out.ControllerTemplate.Replicas = in.Replicas - if in.Selector != nil { - out.ControllerTemplate.Selector = make(map[string]string) - for k, v := range in.Selector { - out.ControllerTemplate.Selector[k] = v - } - } - if in.Template != nil { - if err := s.Convert(&in.Template, &out.ControllerTemplate.Template, 0); err != nil { - return err - } - } - if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil { - return err - } - return nil -} - -func convert_v1_DeploymentStrategy_To_api_DeploymentStrategy(in *DeploymentStrategy, out *newer.DeploymentStrategy, s conversion.Scope) error { - if err := s.Convert(&in.Type, &out.Type, 0); err != nil { - return err - } - if err := s.Convert(&in.CustomParams, &out.CustomParams, 0); err != nil { - return err - } - if err := s.Convert(&in.RecreateParams, &out.RecreateParams, 0); err != nil { - return err - } - if err := s.Convert(&in.RollingParams, &out.RollingParams, 0); err != nil { - return err - } - if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil { - return err - } - if err := s.Convert(&in.Labels, &out.Labels, 0); err != nil { - return err - } - if err := s.Convert(&in.Annotations, &out.Annotations, 0); err != nil { - return err - } - return nil -} - -func convert_api_DeploymentStrategy_To_v1_DeploymentStrategy(in *newer.DeploymentStrategy, out *DeploymentStrategy, s conversion.Scope) error { - if err := s.Convert(&in.Type, &out.Type, 0); err != nil { - return err - } - if err := s.Convert(&in.CustomParams, &out.CustomParams, 0); err != nil { - return err - } - if err := s.Convert(&in.RecreateParams, &out.RecreateParams, 0); err != nil { - return err - } - if err := s.Convert(&in.RollingParams, &out.RollingParams, 0); err != nil { - return err - } - if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil { - return err - } - if err := s.Convert(&in.Labels, &out.Labels, 0); err != nil { - return err - } - if err := s.Convert(&in.Annotations, &out.Annotations, 0); err != nil { - return err - } - return nil -} - -func convert_api_DeploymentTemplate_To_v1_DeploymentConfigSpec(in *newer.DeploymentTemplate, out *DeploymentConfigSpec, s conversion.Scope) error { - out.Replicas = in.ControllerTemplate.Replicas - if in.ControllerTemplate.Selector != nil { - out.Selector = make(map[string]string) - for k, v := range in.ControllerTemplate.Selector { - out.Selector[k] = v - } - } - if in.ControllerTemplate.Template != nil { - if err := s.Convert(&in.ControllerTemplate.Template, &out.Template, 0); err != nil { - return err - } - } - if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil { - return err - } - return nil -} - func convert_v1_DeploymentTriggerImageChangeParams_To_api_DeploymentTriggerImageChangeParams(in *DeploymentTriggerImageChangeParams, out *newer.DeploymentTriggerImageChangeParams, s conversion.Scope) error { - out.Automatic = in.Automatic - out.ContainerNames = make([]string, len(in.ContainerNames)) - copy(out.ContainerNames, in.ContainerNames) - out.LastTriggeredImage = in.LastTriggeredImage - if err := s.Convert(&in.From, &out.From, 0); err != nil { + if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil { return err } switch in.From.Kind { - case "DockerImage": - ref, err := imageapi.ParseDockerImageReference(in.From.Name) - if err != nil { - return err - } - out.Tag = ref.Tag - ref.Tag, ref.ID = "", "" - out.RepositoryName = ref.String() case "ImageStreamTag": - name, tag, ok := imageapi.SplitImageStreamTag(in.From.Name) - if !ok { - return fmt.Errorf("ImageStreamTag object references must be in the form :: %s", in.From.Name) + case "ImageStream", "ImageRepository": + out.From.Kind = "ImageStreamTag" + if !strings.Contains(out.From.Name, ":") { + out.From.Name = imageapi.JoinImageStreamTag(out.From.Name, imageapi.DefaultImageTag) } - out.From.Kind = "ImageStream" - out.From.Name = name - out.Tag = tag + default: + // Will be handled by validation } return nil } func convert_api_DeploymentTriggerImageChangeParams_To_v1_DeploymentTriggerImageChangeParams(in *newer.DeploymentTriggerImageChangeParams, out *DeploymentTriggerImageChangeParams, s conversion.Scope) error { - out.Automatic = in.Automatic - out.ContainerNames = make([]string, len(in.ContainerNames)) - copy(out.ContainerNames, in.ContainerNames) - out.LastTriggeredImage = in.LastTriggeredImage - if err := s.Convert(&in.From, &out.From, 0); err != nil { + if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil { return err } switch in.From.Kind { - case "ImageStream": + case "ImageStreamTag": + case "ImageStream", "ImageRepository": out.From.Kind = "ImageStreamTag" - tag := in.Tag - if len(tag) == 0 { - tag = imageapi.DefaultImageTag - } - out.From.Name = fmt.Sprintf("%s:%s", in.From.Name, tag) - } - return nil -} - -func convert_v1_DeploymentCauseImageTrigger_To_api_DeploymentCauseImageTrigger(in *DeploymentCauseImageTrigger, out *newer.DeploymentCauseImageTrigger, s conversion.Scope) error { - switch in.From.Kind { - case "DockerImage": - ref, err := imageapi.ParseDockerImageReference(in.From.Name) - if err != nil { - return err - } - out.Tag = ref.Tag - ref.Tag, ref.ID = "", "" - out.RepositoryName = ref.Minimal().String() - } - return nil -} - -func convert_api_DeploymentCauseImageTrigger_To_v1_DeploymentCauseImageTrigger(in *newer.DeploymentCauseImageTrigger, out *DeploymentCauseImageTrigger, s conversion.Scope) error { - if len(in.RepositoryName) != 0 { - ref, err := imageapi.ParseDockerImageReference(in.RepositoryName) - if err != nil { - return err + if !strings.Contains(out.From.Name, ":") { + out.From.Name = imageapi.JoinImageStreamTag(out.From.Name, imageapi.DefaultImageTag) } - ref.Tag = in.Tag - out.From.Kind = "DockerImage" - out.From.Name = ref.String() + default: + // Will be handled by validation } return nil } @@ -288,32 +125,10 @@ func convert_api_RollingDeploymentStrategyParams_To_v1_RollingDeploymentStrategy } func init() { - err := api.Scheme.AddDefaultingFuncs( - func(obj *DeploymentTriggerImageChangeParams) { - if len(obj.From.Kind) == 0 { - obj.From.Kind = "ImageStreamTag" - } - }, - ) - if err != nil { - panic(err) - } - - err = api.Scheme.AddConversionFuncs( - convert_v1_DeploymentConfig_To_api_DeploymentConfig, - convert_api_DeploymentConfig_To_v1_DeploymentConfig, - - convert_v1_DeploymentConfigSpec_To_api_DeploymentTemplate, - convert_v1_DeploymentStrategy_To_api_DeploymentStrategy, - convert_api_DeploymentStrategy_To_v1_DeploymentStrategy, - convert_api_DeploymentTemplate_To_v1_DeploymentConfigSpec, - + err := api.Scheme.AddConversionFuncs( convert_v1_DeploymentTriggerImageChangeParams_To_api_DeploymentTriggerImageChangeParams, convert_api_DeploymentTriggerImageChangeParams_To_v1_DeploymentTriggerImageChangeParams, - convert_v1_DeploymentCauseImageTrigger_To_api_DeploymentCauseImageTrigger, - convert_api_DeploymentCauseImageTrigger_To_v1_DeploymentCauseImageTrigger, - convert_v1_RollingDeploymentStrategyParams_To_api_RollingDeploymentStrategyParams, convert_api_RollingDeploymentStrategyParams_To_v1_RollingDeploymentStrategyParams, ) diff --git a/pkg/deploy/api/v1/conversion_test.go b/pkg/deploy/api/v1/conversion_test.go index 65205d32a7cc..e9ca29326a38 100644 --- a/pkg/deploy/api/v1/conversion_test.go +++ b/pkg/deploy/api/v1/conversion_test.go @@ -13,23 +13,44 @@ import ( ) func TestTriggerRoundTrip(t *testing.T) { - p := DeploymentTriggerImageChangeParams{ - From: kapiv1.ObjectReference{ - Kind: "DockerImage", - Name: "", + tests := []struct { + testName string + kind, name string + }{ + { + testName: "ImageStream -> ImageStreamTag", + kind: "ImageStream", + name: "golang", + }, + { + testName: "ImageStreamTag -> ImageStreamTag", + kind: "ImageStreamTag", + name: "golang:latest", + }, + { + testName: "ImageRepository -> ImageStreamTag", + kind: "ImageRepository", + name: "golang", }, } - out := &newer.DeploymentTriggerImageChangeParams{} - if err := kapi.Scheme.Convert(&p, out); err == nil { - t.Errorf("unexpected error: %v", err) - } - p.From.Name = "a/b:test" - out = &newer.DeploymentTriggerImageChangeParams{} - if err := kapi.Scheme.Convert(&p, out); err != nil { - t.Errorf("unexpected error: %v", err) - } - if out.RepositoryName != "a/b" && out.Tag != "test" { - t.Errorf("unexpected output: %#v", out) + + for _, test := range tests { + p := DeploymentTriggerImageChangeParams{ + From: kapiv1.ObjectReference{ + Kind: test.kind, + Name: test.name, + }, + } + out := &newer.DeploymentTriggerImageChangeParams{} + if err := kapi.Scheme.Convert(&p, out); err != nil { + t.Errorf("%s: unexpected error: %v", test.testName, err) + } + if out.From.Name != "golang:latest" { + t.Errorf("%s: unexpected name: %s", test.testName, out.From.Name) + } + if out.From.Kind != "ImageStreamTag" { + t.Errorf("%s: unexpected kind: %s", test.testName, out.From.Kind) + } } } diff --git a/pkg/deploy/api/v1/defaults.go b/pkg/deploy/api/v1/defaults.go index f9930fcbb876..1349845ad996 100644 --- a/pkg/deploy/api/v1/defaults.go +++ b/pkg/deploy/api/v1/defaults.go @@ -58,6 +58,11 @@ func init() { } } }, + func(obj *DeploymentTriggerImageChangeParams) { + if len(obj.From.Kind) == 0 { + obj.From.Kind = "ImageStreamTag" + } + }, ) if err != nil { panic(err) diff --git a/pkg/deploy/api/v1/types.go b/pkg/deploy/api/v1/types.go index deaba98421e7..84acf0866fd2 100644 --- a/pkg/deploy/api/v1/types.go +++ b/pkg/deploy/api/v1/types.go @@ -224,8 +224,7 @@ type DeploymentConfig struct { Status DeploymentConfigStatus `json:"status" description:"the current state of the latest deployment"` } -// DeploymentTemplate contains all the necessary information to create a deployment from a -// DeploymentStrategy. +// DeploymentConfigSpec represents the desired state of the deployment. type DeploymentConfigSpec struct { // Strategy describes how a deployment is executed. Strategy DeploymentStrategy `json:"strategy" description:"how a deployment is executed"` @@ -290,11 +289,10 @@ type DeploymentTriggerImageChangeParams struct { Automatic bool `json:"automatic,omitempty" description:"whether detection of a new tag value should trigger a deployment"` // ContainerNames is used to restrict tag updates to the specified set of container names in a pod. ContainerNames []string `json:"containerNames,omitempty" description:"restricts tag updates to a set of container names in the pod"` - // From is a reference to a Docker image repository tag to watch for changes. The - // Kind may be left blank, in which case it defaults to "ImageStreamTag". The "Name" is - // the only required subfield - if Namespace is blank, the namespace of the current deployment + // From is a reference to an image stream tag to watch for changes. From.Name is the only + // required subfield - if From.Namespace is blank, the namespace of the current deployment // trigger will be used. - From kapi.ObjectReference `json:"from" description:"a reference to an ImageRepository, ImageStream, or ImageStreamTag to watch for changes"` + From kapi.ObjectReference `json:"from" description:"a reference to an ImageStreamTag to watch for changes"` // LastTriggeredImage is the last image to be triggered. LastTriggeredImage string `json:"lastTriggeredImage,omitempty" description:"the last image to be triggered"` } diff --git a/pkg/deploy/api/v1beta3/conversion.go b/pkg/deploy/api/v1beta3/conversion.go index 62709bd46722..9b10db71df5f 100644 --- a/pkg/deploy/api/v1beta3/conversion.go +++ b/pkg/deploy/api/v1beta3/conversion.go @@ -3,6 +3,7 @@ package v1beta3 import ( "fmt" "math" + "strings" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/conversion" @@ -12,200 +13,36 @@ import ( imageapi "github.com/openshift/origin/pkg/image/api" ) -func convert_v1beta3_DeploymentConfig_To_api_DeploymentConfig(in *DeploymentConfig, out *newer.DeploymentConfig, s conversion.Scope) error { - if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil { - return err - } - if err := s.Convert(&in.Spec, &out.Template, 0); err != nil { - return err - } - if err := s.Convert(&in.Spec.Triggers, &out.Triggers, 0); err != nil { - return err - } - out.LatestVersion = in.Status.LatestVersion - if err := s.Convert(&in.Status.Details, &out.Details, 0); err != nil { - return err - } - return nil -} - -func convert_api_DeploymentConfig_To_v1beta3_DeploymentConfig(in *newer.DeploymentConfig, out *DeploymentConfig, s conversion.Scope) error { - if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil { - return err - } - if err := s.Convert(&in.Template, &out.Spec, 0); err != nil { - return err - } - if err := s.Convert(&in.Triggers, &out.Spec.Triggers, 0); err != nil { - return err - } - out.Status.LatestVersion = in.LatestVersion - if err := s.Convert(&in.Details, &out.Status.Details, 0); err != nil { - return err - } - return nil -} - -func convert_v1beta3_DeploymentConfigSpec_To_api_DeploymentTemplate(in *DeploymentConfigSpec, out *newer.DeploymentTemplate, s conversion.Scope) error { - out.ControllerTemplate.Replicas = in.Replicas - if in.Selector != nil { - out.ControllerTemplate.Selector = make(map[string]string) - for k, v := range in.Selector { - out.ControllerTemplate.Selector[k] = v - } - } - if in.Template != nil { - if err := s.Convert(&in.Template, &out.ControllerTemplate.Template, 0); err != nil { - return err - } - } - if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil { - return err - } - return nil -} - -func convert_v1beta3_DeploymentStrategy_To_api_DeploymentStrategy(in *DeploymentStrategy, out *newer.DeploymentStrategy, s conversion.Scope) error { - if err := s.Convert(&in.Type, &out.Type, 0); err != nil { - return err - } - if err := s.Convert(&in.CustomParams, &out.CustomParams, 0); err != nil { - return err - } - if err := s.Convert(&in.RecreateParams, &out.RecreateParams, 0); err != nil { - return err - } - if err := s.Convert(&in.RollingParams, &out.RollingParams, 0); err != nil { - return err - } - if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil { - return err - } - if err := s.Convert(&in.Labels, &out.Labels, 0); err != nil { - return err - } - if err := s.Convert(&in.Annotations, &out.Annotations, 0); err != nil { - return err - } - return nil -} - -func convert_api_DeploymentStrategy_To_v1beta3_DeploymentStrategy(in *newer.DeploymentStrategy, out *DeploymentStrategy, s conversion.Scope) error { - if err := s.Convert(&in.Type, &out.Type, 0); err != nil { - return err - } - if err := s.Convert(&in.CustomParams, &out.CustomParams, 0); err != nil { - return err - } - if err := s.Convert(&in.RecreateParams, &out.RecreateParams, 0); err != nil { - return err - } - if err := s.Convert(&in.RollingParams, &out.RollingParams, 0); err != nil { - return err - } - if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil { - return err - } - if err := s.Convert(&in.Labels, &out.Labels, 0); err != nil { - return err - } - if err := s.Convert(&in.Annotations, &out.Annotations, 0); err != nil { - return err - } - return nil -} - -func convert_api_DeploymentTemplate_To_v1beta3_DeploymentConfigSpec(in *newer.DeploymentTemplate, out *DeploymentConfigSpec, s conversion.Scope) error { - out.Replicas = in.ControllerTemplate.Replicas - if in.ControllerTemplate.Selector != nil { - out.Selector = make(map[string]string) - for k, v := range in.ControllerTemplate.Selector { - out.Selector[k] = v - } - } - if in.ControllerTemplate.Template != nil { - if err := s.Convert(&in.ControllerTemplate.Template, &out.Template, 0); err != nil { - return err - } - } - if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil { - return err - } - return nil -} - func convert_v1beta3_DeploymentTriggerImageChangeParams_To_api_DeploymentTriggerImageChangeParams(in *DeploymentTriggerImageChangeParams, out *newer.DeploymentTriggerImageChangeParams, s conversion.Scope) error { - out.Automatic = in.Automatic - out.ContainerNames = make([]string, len(in.ContainerNames)) - copy(out.ContainerNames, in.ContainerNames) - out.LastTriggeredImage = in.LastTriggeredImage - if err := s.Convert(&in.From, &out.From, 0); err != nil { + if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil { return err } switch in.From.Kind { - case "DockerImage": - ref, err := imageapi.ParseDockerImageReference(in.From.Name) - if err != nil { - return err - } - out.Tag = ref.Tag - ref.Tag, ref.ID = "", "" - out.RepositoryName = ref.String() case "ImageStreamTag": - name, tag, ok := imageapi.SplitImageStreamTag(in.From.Name) - if !ok { - return fmt.Errorf("ImageStreamTag object references must be in the form :: %s", in.From.Name) + case "ImageStream", "ImageRepository": + out.From.Kind = "ImageStreamTag" + if !strings.Contains(out.From.Name, ":") { + out.From.Name = imageapi.JoinImageStreamTag(out.From.Name, imageapi.DefaultImageTag) } - out.From.Kind = "ImageStream" - out.From.Name = name - out.Tag = tag + default: + // Will be handled by validation } return nil } func convert_api_DeploymentTriggerImageChangeParams_To_v1beta3_DeploymentTriggerImageChangeParams(in *newer.DeploymentTriggerImageChangeParams, out *DeploymentTriggerImageChangeParams, s conversion.Scope) error { - out.Automatic = in.Automatic - out.ContainerNames = make([]string, len(in.ContainerNames)) - copy(out.ContainerNames, in.ContainerNames) - out.LastTriggeredImage = in.LastTriggeredImage - if err := s.Convert(&in.From, &out.From, 0); err != nil { + if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil { return err } switch in.From.Kind { - case "ImageStream": + case "ImageStreamTag": + case "ImageStream", "ImageRepository": out.From.Kind = "ImageStreamTag" - tag := in.Tag - if len(tag) == 0 { - tag = imageapi.DefaultImageTag - } - out.From.Name = fmt.Sprintf("%s:%s", in.From.Name, tag) - } - return nil -} - -func convert_v1beta3_DeploymentCauseImageTrigger_To_api_DeploymentCauseImageTrigger(in *DeploymentCauseImageTrigger, out *newer.DeploymentCauseImageTrigger, s conversion.Scope) error { - switch in.From.Kind { - case "DockerImage": - ref, err := imageapi.ParseDockerImageReference(in.From.Name) - if err != nil { - return err + if !strings.Contains(out.From.Name, ":") { + out.From.Name = imageapi.JoinImageStreamTag(out.From.Name, imageapi.DefaultImageTag) } - out.Tag = ref.Tag - ref.Tag, ref.ID = "", "" - out.RepositoryName = ref.Minimal().String() - } - return nil -} - -func convert_api_DeploymentCauseImageTrigger_To_v1beta3_DeploymentCauseImageTrigger(in *newer.DeploymentCauseImageTrigger, out *DeploymentCauseImageTrigger, s conversion.Scope) error { - if len(in.RepositoryName) != 0 { - ref, err := imageapi.ParseDockerImageReference(in.RepositoryName) - if err != nil { - return err - } - ref.Tag = in.Tag - out.From.Kind = "DockerImage" - out.From.Name = ref.String() + default: + // Will be handled by validation } return nil } @@ -287,28 +124,10 @@ func convert_api_RollingDeploymentStrategyParams_To_v1beta3_RollingDeploymentStr } func init() { - err := api.Scheme.AddDefaultingFuncs( - func(obj *DeploymentTriggerImageChangeParams) { - if len(obj.From.Kind) == 0 { - obj.From.Kind = "ImageStreamTag" - } - }, - ) - if err != nil { - panic(err) - } - - err = api.Scheme.AddConversionFuncs( - convert_v1beta3_DeploymentConfig_To_api_DeploymentConfig, - convert_api_DeploymentConfig_To_v1beta3_DeploymentConfig, - convert_v1beta3_DeploymentConfigSpec_To_api_DeploymentTemplate, - convert_v1beta3_DeploymentStrategy_To_api_DeploymentStrategy, - convert_api_DeploymentStrategy_To_v1beta3_DeploymentStrategy, - convert_api_DeploymentTemplate_To_v1beta3_DeploymentConfigSpec, + err := api.Scheme.AddConversionFuncs( convert_v1beta3_DeploymentTriggerImageChangeParams_To_api_DeploymentTriggerImageChangeParams, convert_api_DeploymentTriggerImageChangeParams_To_v1beta3_DeploymentTriggerImageChangeParams, - convert_v1beta3_DeploymentCauseImageTrigger_To_api_DeploymentCauseImageTrigger, - convert_api_DeploymentCauseImageTrigger_To_v1beta3_DeploymentCauseImageTrigger, + convert_v1beta3_RollingDeploymentStrategyParams_To_api_RollingDeploymentStrategyParams, convert_api_RollingDeploymentStrategyParams_To_v1beta3_RollingDeploymentStrategyParams, ) diff --git a/pkg/deploy/api/v1beta3/conversion_test.go b/pkg/deploy/api/v1beta3/conversion_test.go index d3c6aff02f6b..69119e2be97b 100644 --- a/pkg/deploy/api/v1beta3/conversion_test.go +++ b/pkg/deploy/api/v1beta3/conversion_test.go @@ -12,23 +12,44 @@ import ( ) func TestTriggerRoundTrip(t *testing.T) { - p := DeploymentTriggerImageChangeParams{ - From: kapiv1beta3.ObjectReference{ - Kind: "DockerImage", - Name: "", + tests := []struct { + testName string + kind, name string + }{ + { + testName: "ImageStream -> ImageStreamTag", + kind: "ImageStream", + name: "golang", + }, + { + testName: "ImageStreamTag -> ImageStreamTag", + kind: "ImageStreamTag", + name: "golang:latest", + }, + { + testName: "ImageRepository -> ImageStreamTag", + kind: "ImageRepository", + name: "golang", }, } - out := &newer.DeploymentTriggerImageChangeParams{} - if err := kapi.Scheme.Convert(&p, out); err == nil { - t.Errorf("unexpected error: %v", err) - } - p.From.Name = "a/b:test" - out = &newer.DeploymentTriggerImageChangeParams{} - if err := kapi.Scheme.Convert(&p, out); err != nil { - t.Errorf("unexpected error: %v", err) - } - if out.RepositoryName != "a/b" && out.Tag != "test" { - t.Errorf("unexpected output: %#v", out) + + for _, test := range tests { + p := DeploymentTriggerImageChangeParams{ + From: kapiv1beta3.ObjectReference{ + Kind: test.kind, + Name: test.name, + }, + } + out := &newer.DeploymentTriggerImageChangeParams{} + if err := kapi.Scheme.Convert(&p, out); err != nil { + t.Errorf("%s: unexpected error: %v", test.testName, err) + } + if out.From.Name != "golang:latest" { + t.Errorf("%s: unexpected name: %s", test.testName, out.From.Name) + } + if out.From.Kind != "ImageStreamTag" { + t.Errorf("%s: unexpected kind: %s", test.testName, out.From.Kind) + } } } diff --git a/pkg/deploy/api/v1beta3/defaults.go b/pkg/deploy/api/v1beta3/defaults.go index 275ec04d961e..80a3bb1a2aa5 100644 --- a/pkg/deploy/api/v1beta3/defaults.go +++ b/pkg/deploy/api/v1beta3/defaults.go @@ -51,6 +51,11 @@ func init() { } } }, + func(obj *DeploymentTriggerImageChangeParams) { + if len(obj.From.Kind) == 0 { + obj.From.Kind = "ImageStreamTag" + } + }, ) if err != nil { panic(err) diff --git a/pkg/deploy/api/v1beta3/types.go b/pkg/deploy/api/v1beta3/types.go index 3148f1d9fddb..d3b3197be29a 100644 --- a/pkg/deploy/api/v1beta3/types.go +++ b/pkg/deploy/api/v1beta3/types.go @@ -304,11 +304,10 @@ type DeploymentTriggerImageChangeParams struct { Automatic bool `json:"automatic,omitempty" description:"whether detection of a new tag value should trigger a deployment"` // ContainerNames is used to restrict tag updates to the specified set of container names in a pod. ContainerNames []string `json:"containerNames,omitempty" description:"restricts tag updates to a set of container names in the pod"` - // From is a reference to a Docker image repository tag to watch for changes. The - // Kind may be left blank, in which case it defaults to "ImageStreamTag". The "Name" is - // the only required subfield - if Namespace is blank, the namespace of the current deployment + // From is a reference to an image stream tag to watch for changes. From.Name is the only + // required subfield - if From.Namespace is blank, the namespace of the current deployment // trigger will be used. - From kapi.ObjectReference `json:"from" description:"a reference to an ImageRepository, ImageStream, or ImageStreamTag to watch for changes"` + From kapi.ObjectReference `json:"from" description:"a reference to an ImageStreamTag to watch for changes"` // LastTriggeredImage is the last image to be triggered. LastTriggeredImage string `json:"lastTriggeredImage" description:"the last image to be triggered"` } diff --git a/pkg/deploy/api/validation/validation.go b/pkg/deploy/api/validation/validation.go index d1f82967f9bb..655c6a7416fb 100644 --- a/pkg/deploy/api/validation/validation.go +++ b/pkg/deploy/api/validation/validation.go @@ -1,36 +1,44 @@ package validation import ( + "errors" "fmt" "regexp" "strconv" - "strings" kapi "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/fielderrors" - "k8s.io/kubernetes/pkg/util/sets" kvalidation "k8s.io/kubernetes/pkg/util/validation" deployapi "github.com/openshift/origin/pkg/deploy/api" + imageapi "github.com/openshift/origin/pkg/image/api" + imageval "github.com/openshift/origin/pkg/image/api/validation" ) -// TODO: These tests validate the ReplicationControllerState in a Deployment or DeploymentConfig. -// The upstream validation API isn't factored currently to allow this; we'll make a PR to -// upstream and fix when it goes in. - func ValidateDeploymentConfig(config *deployapi.DeploymentConfig) fielderrors.ValidationErrorList { allErrs := fielderrors.ValidationErrorList{} allErrs = append(allErrs, validation.ValidateObjectMeta(&config.ObjectMeta, true, validation.NameIsDNSSubdomain).Prefix("metadata")...) - for i := range config.Triggers { - allErrs = append(allErrs, validateTrigger(&config.Triggers[i]).PrefixIndex(i).Prefix("triggers")...) + // TODO: Refactor to validate spec and status separately + for i := range config.Spec.Triggers { + allErrs = append(allErrs, validateTrigger(&config.Spec.Triggers[i]).PrefixIndex(i).Prefix("spec.triggers")...) + } + allErrs = append(allErrs, validateDeploymentStrategy(&config.Spec.Strategy).Prefix("spec.strategy")...) + if config.Spec.Template == nil { + allErrs = append(allErrs, fielderrors.NewFieldRequired("spec.template")) + } else { + allErrs = append(allErrs, validation.ValidatePodTemplateSpec(config.Spec.Template).Prefix("spec.template")...) + } + if config.Status.LatestVersion < 0 { + allErrs = append(allErrs, fielderrors.NewFieldInvalid("status.latestVersion", config.Status.LatestVersion, "latestVersion cannot be negative")) } - allErrs = append(allErrs, validateDeploymentStrategy(&config.Template.Strategy).Prefix("template.strategy")...) - allErrs = append(allErrs, validation.ValidateReplicationControllerSpec(&config.Template.ControllerTemplate).Prefix("template.controllerTemplate")...) - if config.LatestVersion < 0 { - allErrs = append(allErrs, fielderrors.NewFieldInvalid("latestVersion", config.LatestVersion, "latestVersion cannot be negative")) + if config.Spec.Replicas < 0 { + allErrs = append(allErrs, fielderrors.NewFieldInvalid("spec.replicas", config.Spec.Replicas, "replicas cannot be negative")) + } + if config.Spec.Selector == nil || len(config.Spec.Selector) == 0 { + allErrs = append(allErrs, fielderrors.NewFieldInvalid("spec.selector", config.Spec.Selector, "selector cannot be empty")) } return allErrs } @@ -39,10 +47,10 @@ func ValidateDeploymentConfigUpdate(newConfig *deployapi.DeploymentConfig, oldCo allErrs := fielderrors.ValidationErrorList{} allErrs = append(allErrs, validation.ValidateObjectMetaUpdate(&newConfig.ObjectMeta, &oldConfig.ObjectMeta).Prefix("metadata")...) allErrs = append(allErrs, ValidateDeploymentConfig(newConfig)...) - if newConfig.LatestVersion < oldConfig.LatestVersion { - allErrs = append(allErrs, fielderrors.NewFieldInvalid("latestVersion", newConfig.LatestVersion, "latestVersion cannot be decremented")) - } else if newConfig.LatestVersion > (oldConfig.LatestVersion + 1) { - allErrs = append(allErrs, fielderrors.NewFieldInvalid("latestVersion", newConfig.LatestVersion, "latestVersion can only be incremented by 1")) + if newConfig.Status.LatestVersion < oldConfig.Status.LatestVersion { + allErrs = append(allErrs, fielderrors.NewFieldInvalid("status.latestVersion", newConfig.Status.LatestVersion, "latestVersion cannot be decremented")) + } else if newConfig.Status.LatestVersion > (oldConfig.Status.LatestVersion + 1) { + allErrs = append(allErrs, fielderrors.NewFieldInvalid("status.latestVersion", newConfig.Status.LatestVersion, "latestVersion can only be incremented by 1")) } return allErrs } @@ -254,30 +262,18 @@ func validateTrigger(trigger *deployapi.DeploymentTriggerPolicy) fielderrors.Val func validateImageChangeParams(params *deployapi.DeploymentTriggerImageChangeParams) fielderrors.ValidationErrorList { errs := fielderrors.ValidationErrorList{} - if len(params.From.Name) != 0 { - if len(params.From.Kind) == 0 { - params.From.Kind = "ImageStream" - } - kinds := sets.NewString("ImageRepository", "ImageStream", "ImageStreamTag") - if !kinds.Has(params.From.Kind) { - msg := fmt.Sprintf("kind must be one of: %s", strings.Join(kinds.List(), ", ")) - errs = append(errs, fielderrors.NewFieldInvalid("from.kind", params.From.Kind, msg)) + if len(params.From.Name) == 0 { + errs = append(errs, fielderrors.NewFieldRequired("from")) + } else { + if params.From.Kind != "ImageStreamTag" { + errs = append(errs, fielderrors.NewFieldInvalid("from.kind", params.From.Kind, "kind must be an ImageStreamTag")) } - - if !kvalidation.IsDNS1123Subdomain(params.From.Name) { - errs = append(errs, fielderrors.NewFieldInvalid("from.name", params.From.Name, "name must be a valid subdomain")) + if err := validateImageStreamTagName(params.From.Name); err != nil { + errs = append(errs, fielderrors.NewFieldInvalid("from.name", params.From.Name, err.Error())) } if len(params.From.Namespace) != 0 && !kvalidation.IsDNS1123Subdomain(params.From.Namespace) { errs = append(errs, fielderrors.NewFieldInvalid("from.namespace", params.From.Namespace, "namespace must be a valid subdomain")) } - - if len(params.RepositoryName) != 0 { - errs = append(errs, fielderrors.NewFieldInvalid("repositoryName", params.RepositoryName, "only one of 'from', 'repository' name may be specified")) - } - } else { - if len(params.RepositoryName) == 0 { - errs = append(errs, fielderrors.NewFieldRequired("from")) - } } if len(params.ContainerNames) == 0 { @@ -287,6 +283,18 @@ func validateImageChangeParams(params *deployapi.DeploymentTriggerImageChangePar return errs } +func validateImageStreamTagName(istag string) error { + name, _, ok := imageapi.SplitImageStreamTag(istag) + if !ok { + return fmt.Errorf("invalid ImageStreamTag: %s", istag) + } + ok, reason := imageval.ValidateImageStreamName(name, false) + if !ok { + return errors.New(reason) + } + return nil +} + func ValidatePositiveIntOrPercent(intOrPercent util.IntOrString, fieldName string) fielderrors.ValidationErrorList { allErrs := fielderrors.ValidationErrorList{} if intOrPercent.Kind == util.IntstrString { diff --git a/pkg/deploy/api/validation/validation_test.go b/pkg/deploy/api/validation/validation_test.go index 35f4348b03db..8bdd56cbcdee 100644 --- a/pkg/deploy/api/validation/validation_test.go +++ b/pkg/deploy/api/validation/validation_test.go @@ -24,8 +24,8 @@ func manualTrigger() []api.DeploymentTriggerPolicy { func rollingConfig(interval, updatePeriod, timeout int) api.DeploymentConfig { return api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Triggers: manualTrigger(), - Template: api.DeploymentTemplate{ + Spec: api.DeploymentConfigSpec{ + Triggers: manualTrigger(), Strategy: api.DeploymentStrategy{ Type: api.DeploymentStrategyTypeRolling, RollingParams: &api.RollingDeploymentStrategyParams{ @@ -35,7 +35,8 @@ func rollingConfig(interval, updatePeriod, timeout int) api.DeploymentConfig { MaxSurge: kutil.NewIntOrStringFromInt(1), }, }, - ControllerTemplate: test.OkControllerTemplate(), + Template: test.OkPodTemplate(), + Selector: test.OkSelector(), }, } } @@ -43,8 +44,8 @@ func rollingConfig(interval, updatePeriod, timeout int) api.DeploymentConfig { func rollingConfigMax(maxSurge, maxUnavailable kutil.IntOrString) api.DeploymentConfig { return api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Triggers: manualTrigger(), - Template: api.DeploymentTemplate{ + Spec: api.DeploymentConfigSpec{ + Triggers: manualTrigger(), Strategy: api.DeploymentStrategy{ Type: api.DeploymentStrategyTypeRolling, RollingParams: &api.RollingDeploymentStrategyParams{ @@ -55,18 +56,22 @@ func rollingConfigMax(maxSurge, maxUnavailable kutil.IntOrString) api.Deployment MaxUnavailable: maxUnavailable, }, }, - ControllerTemplate: test.OkControllerTemplate(), + Template: test.OkPodTemplate(), + Selector: test.OkSelector(), }, } } -// TODO: test validation errors for ReplicationControllerTemplates - func TestValidateDeploymentConfigOK(t *testing.T) { errs := ValidateDeploymentConfig(&api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Triggers: manualTrigger(), - Template: test.OkDeploymentTemplate(), + Spec: api.DeploymentConfigSpec{ + Replicas: 1, + Triggers: manualTrigger(), + Selector: test.OkSelector(), + Strategy: test.OkStrategy(), + Template: test.OkPodTemplate(), + }, }) if len(errs) > 0 { @@ -76,14 +81,14 @@ func TestValidateDeploymentConfigOK(t *testing.T) { func TestValidateDeploymentConfigMissingFields(t *testing.T) { errorCases := map[string]struct { - D api.DeploymentConfig - T fielderrors.ValidationErrorType - F string + DeploymentConfig api.DeploymentConfig + ErrorType fielderrors.ValidationErrorType + Field string }{ "missing name": { api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "", Namespace: "bar"}, - Template: test.OkDeploymentTemplate(), + Spec: test.OkDeploymentConfigSpec(), }, fielderrors.ValidationErrorTypeRequired, "metadata.name", @@ -91,7 +96,7 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) { "missing namespace": { api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: ""}, - Template: test.OkDeploymentTemplate(), + Spec: test.OkDeploymentConfigSpec(), }, fielderrors.ValidationErrorTypeRequired, "metadata.namespace", @@ -99,7 +104,7 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) { "invalid name": { api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "-foo", Namespace: "bar"}, - Template: test.OkDeploymentTemplate(), + Spec: test.OkDeploymentConfigSpec(), }, fielderrors.ValidationErrorTypeInvalid, "metadata.name", @@ -107,7 +112,7 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) { "invalid namespace": { api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "-bar"}, - Template: test.OkDeploymentTemplate(), + Spec: test.OkDeploymentConfigSpec(), }, fielderrors.ValidationErrorTypeInvalid, "metadata.namespace", @@ -116,137 +121,147 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) { "missing trigger.type": { api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Triggers: []api.DeploymentTriggerPolicy{ - { - ImageChangeParams: &api.DeploymentTriggerImageChangeParams{ - ContainerNames: []string{"foo"}, + Spec: api.DeploymentConfigSpec{ + Replicas: 1, + Triggers: []api.DeploymentTriggerPolicy{ + { + ImageChangeParams: &api.DeploymentTriggerImageChangeParams{ + ContainerNames: []string{"foo"}, + }, }, }, + Selector: test.OkSelector(), + Strategy: test.OkStrategy(), + Template: test.OkPodTemplate(), }, - Template: test.OkDeploymentTemplate(), }, fielderrors.ValidationErrorTypeRequired, - "triggers[0].type", + "spec.triggers[0].type", }, "missing Trigger imageChangeParams.from": { api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Triggers: []api.DeploymentTriggerPolicy{ - { - Type: api.DeploymentTriggerOnImageChange, - ImageChangeParams: &api.DeploymentTriggerImageChangeParams{ - ContainerNames: []string{"foo"}, + Spec: api.DeploymentConfigSpec{ + Replicas: 1, + Triggers: []api.DeploymentTriggerPolicy{ + { + Type: api.DeploymentTriggerOnImageChange, + ImageChangeParams: &api.DeploymentTriggerImageChangeParams{ + ContainerNames: []string{"foo"}, + }, }, }, + Selector: test.OkSelector(), + Strategy: test.OkStrategy(), + Template: test.OkPodTemplate(), }, - Template: test.OkDeploymentTemplate(), }, fielderrors.ValidationErrorTypeRequired, - "triggers[0].imageChangeParams.from", + "spec.triggers[0].imageChangeParams.from", }, "invalid Trigger imageChangeParams.from.kind": { api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Triggers: []api.DeploymentTriggerPolicy{ - { - Type: api.DeploymentTriggerOnImageChange, - ImageChangeParams: &api.DeploymentTriggerImageChangeParams{ - From: kapi.ObjectReference{ - Kind: "Invalid", - Name: "name", - }, - ContainerNames: []string{"foo"}, - }, - }, - }, - Template: test.OkDeploymentTemplate(), - }, - fielderrors.ValidationErrorTypeInvalid, - "triggers[0].imageChangeParams.from.kind", - }, - "both fields illegal Trigger imageChangeParams.repositoryName": { - api.DeploymentConfig{ - ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Triggers: []api.DeploymentTriggerPolicy{ - { - Type: api.DeploymentTriggerOnImageChange, - ImageChangeParams: &api.DeploymentTriggerImageChangeParams{ - ContainerNames: []string{"foo"}, - RepositoryName: "name", - From: kapi.ObjectReference{ - Name: "other", + Spec: api.DeploymentConfigSpec{ + Replicas: 1, + Triggers: []api.DeploymentTriggerPolicy{ + { + Type: api.DeploymentTriggerOnImageChange, + ImageChangeParams: &api.DeploymentTriggerImageChangeParams{ + From: kapi.ObjectReference{ + Kind: "Invalid", + Name: "name:tag", + }, + ContainerNames: []string{"foo"}, }, }, }, + Selector: test.OkSelector(), + Strategy: test.OkStrategy(), + Template: test.OkPodTemplate(), }, - Template: test.OkDeploymentTemplate(), }, fielderrors.ValidationErrorTypeInvalid, - "triggers[0].imageChangeParams.repositoryName", + "spec.triggers[0].imageChangeParams.from.kind", }, "missing Trigger imageChangeParams.containerNames": { api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Triggers: []api.DeploymentTriggerPolicy{ - { - Type: api.DeploymentTriggerOnImageChange, - ImageChangeParams: &api.DeploymentTriggerImageChangeParams{ - RepositoryName: "foo", + Spec: api.DeploymentConfigSpec{ + Replicas: 1, + Triggers: []api.DeploymentTriggerPolicy{ + { + Type: api.DeploymentTriggerOnImageChange, + ImageChangeParams: &api.DeploymentTriggerImageChangeParams{ + From: kapi.ObjectReference{ + Kind: "ImageStreamTag", + Name: "foo:v1", + }, + }, }, }, + Selector: test.OkSelector(), + Strategy: test.OkStrategy(), + Template: test.OkPodTemplate(), }, - Template: test.OkDeploymentTemplate(), }, fielderrors.ValidationErrorTypeRequired, - "triggers[0].imageChangeParams.containerNames", + "spec.triggers[0].imageChangeParams.containerNames", }, "missing strategy.type": { api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Triggers: manualTrigger(), - Template: api.DeploymentTemplate{ + Spec: api.DeploymentConfigSpec{ + Replicas: 1, + Triggers: manualTrigger(), + Selector: test.OkSelector(), Strategy: api.DeploymentStrategy{ CustomParams: test.OkCustomParams(), }, - ControllerTemplate: test.OkControllerTemplate(), + Template: test.OkPodTemplate(), }, }, fielderrors.ValidationErrorTypeRequired, - "template.strategy.type", + "spec.strategy.type", }, "missing strategy.customParams": { api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Triggers: manualTrigger(), - Template: api.DeploymentTemplate{ + Spec: api.DeploymentConfigSpec{ + Replicas: 1, + Triggers: manualTrigger(), + Selector: test.OkSelector(), Strategy: api.DeploymentStrategy{ Type: api.DeploymentStrategyTypeCustom, }, - ControllerTemplate: test.OkControllerTemplate(), + Template: test.OkPodTemplate(), }, }, fielderrors.ValidationErrorTypeRequired, - "template.strategy.customParams", + "spec.strategy.customParams", }, - "missing template.strategy.customParams.image": { + "missing spec.strategy.customParams.image": { api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Triggers: manualTrigger(), - Template: api.DeploymentTemplate{ + Spec: api.DeploymentConfigSpec{ + Replicas: 1, + Triggers: manualTrigger(), + Selector: test.OkSelector(), Strategy: api.DeploymentStrategy{ Type: api.DeploymentStrategyTypeCustom, CustomParams: &api.CustomDeploymentStrategyParams{}, }, - ControllerTemplate: test.OkControllerTemplate(), + Template: test.OkPodTemplate(), }, }, fielderrors.ValidationErrorTypeRequired, - "template.strategy.customParams.image", + "spec.strategy.customParams.image", }, - "missing template.strategy.recreateParams.pre.failurePolicy": { + "missing spec.strategy.recreateParams.pre.failurePolicy": { api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Template: api.DeploymentTemplate{ + Spec: api.DeploymentConfigSpec{ + Replicas: 1, Strategy: api.DeploymentStrategy{ Type: api.DeploymentStrategyTypeRecreate, RecreateParams: &api.RecreateDeploymentStrategyParams{ @@ -258,16 +273,18 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) { }, }, }, - ControllerTemplate: test.OkControllerTemplate(), + Template: test.OkPodTemplate(), + Selector: test.OkSelector(), }, }, fielderrors.ValidationErrorTypeRequired, - "template.strategy.recreateParams.pre.failurePolicy", + "spec.strategy.recreateParams.pre.failurePolicy", }, - "missing template.strategy.recreateParams.pre.execNewPod": { + "missing spec.strategy.recreateParams.pre.execNewPod": { api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Template: api.DeploymentTemplate{ + Spec: api.DeploymentConfigSpec{ + Replicas: 1, Strategy: api.DeploymentStrategy{ Type: api.DeploymentStrategyTypeRecreate, RecreateParams: &api.RecreateDeploymentStrategyParams{ @@ -276,16 +293,18 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) { }, }, }, - ControllerTemplate: test.OkControllerTemplate(), + Template: test.OkPodTemplate(), + Selector: test.OkSelector(), }, }, fielderrors.ValidationErrorTypeRequired, - "template.strategy.recreateParams.pre.execNewPod", + "spec.strategy.recreateParams.pre.execNewPod", }, - "missing template.strategy.recreateParams.pre.execNewPod.command": { + "missing spec.strategy.recreateParams.pre.execNewPod.command": { api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Template: api.DeploymentTemplate{ + Spec: api.DeploymentConfigSpec{ + Replicas: 1, Strategy: api.DeploymentStrategy{ Type: api.DeploymentStrategyTypeRecreate, RecreateParams: &api.RecreateDeploymentStrategyParams{ @@ -297,16 +316,18 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) { }, }, }, - ControllerTemplate: test.OkControllerTemplate(), + Template: test.OkPodTemplate(), + Selector: test.OkSelector(), }, }, fielderrors.ValidationErrorTypeRequired, - "template.strategy.recreateParams.pre.execNewPod.command", + "spec.strategy.recreateParams.pre.execNewPod.command", }, - "missing template.strategy.recreateParams.pre.execNewPod.containerName": { + "missing spec.strategy.recreateParams.pre.execNewPod.containerName": { api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Template: api.DeploymentTemplate{ + Spec: api.DeploymentConfigSpec{ + Replicas: 1, Strategy: api.DeploymentStrategy{ Type: api.DeploymentStrategyTypeRecreate, RecreateParams: &api.RecreateDeploymentStrategyParams{ @@ -318,16 +339,18 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) { }, }, }, - ControllerTemplate: test.OkControllerTemplate(), + Template: test.OkPodTemplate(), + Selector: test.OkSelector(), }, }, fielderrors.ValidationErrorTypeRequired, - "template.strategy.recreateParams.pre.execNewPod.containerName", + "spec.strategy.recreateParams.pre.execNewPod.containerName", }, - "invalid template.strategy.recreateParams.pre.execNewPod.volumes": { + "invalid spec.strategy.recreateParams.pre.execNewPod.volumes": { api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Template: api.DeploymentTemplate{ + Spec: api.DeploymentConfigSpec{ + Replicas: 1, Strategy: api.DeploymentStrategy{ Type: api.DeploymentStrategyTypeRecreate, RecreateParams: &api.RecreateDeploymentStrategyParams{ @@ -341,31 +364,33 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) { }, }, }, - ControllerTemplate: test.OkControllerTemplate(), + Template: test.OkPodTemplate(), + Selector: test.OkSelector(), }, }, fielderrors.ValidationErrorTypeInvalid, - "template.strategy.recreateParams.pre.execNewPod.volumes[1]", + "spec.strategy.recreateParams.pre.execNewPod.volumes[1]", }, - "invalid template.strategy.rollingParams.intervalSeconds": { + "invalid spec.strategy.rollingParams.intervalSeconds": { rollingConfig(-20, 1, 1), fielderrors.ValidationErrorTypeInvalid, - "template.strategy.rollingParams.intervalSeconds", + "spec.strategy.rollingParams.intervalSeconds", }, - "invalid template.strategy.rollingParams.updatePeriodSeconds": { + "invalid spec.strategy.rollingParams.updatePeriodSeconds": { rollingConfig(1, -20, 1), fielderrors.ValidationErrorTypeInvalid, - "template.strategy.rollingParams.updatePeriodSeconds", + "spec.strategy.rollingParams.updatePeriodSeconds", }, - "invalid template.strategy.rollingParams.timeoutSeconds": { + "invalid spec.strategy.rollingParams.timeoutSeconds": { rollingConfig(1, 1, -20), fielderrors.ValidationErrorTypeInvalid, - "template.strategy.rollingParams.timeoutSeconds", + "spec.strategy.rollingParams.timeoutSeconds", }, - "missing template.strategy.rollingParams.pre.failurePolicy": { + "missing spec.strategy.rollingParams.pre.failurePolicy": { api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Template: api.DeploymentTemplate{ + Spec: api.DeploymentConfigSpec{ + Replicas: 1, Strategy: api.DeploymentStrategy{ Type: api.DeploymentStrategyTypeRolling, RollingParams: &api.RollingDeploymentStrategyParams{ @@ -381,73 +406,74 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) { }, }, }, - ControllerTemplate: test.OkControllerTemplate(), + Template: test.OkPodTemplate(), + Selector: test.OkSelector(), }, }, fielderrors.ValidationErrorTypeRequired, - "template.strategy.rollingParams.pre.failurePolicy", + "spec.strategy.rollingParams.pre.failurePolicy", }, - "both maxSurge and maxUnavailable 0 template.strategy.rollingParams.maxUnavailable": { + "both maxSurge and maxUnavailable 0 spec.strategy.rollingParams.maxUnavailable": { rollingConfigMax(kutil.NewIntOrStringFromInt(0), kutil.NewIntOrStringFromInt(0)), fielderrors.ValidationErrorTypeInvalid, - "template.strategy.rollingParams.maxUnavailable", + "spec.strategy.rollingParams.maxUnavailable", }, - "invalid lower bound template.strategy.rollingParams.maxUnavailable": { + "invalid lower bound spec.strategy.rollingParams.maxUnavailable": { rollingConfigMax(kutil.NewIntOrStringFromInt(0), kutil.NewIntOrStringFromInt(-100)), fielderrors.ValidationErrorTypeInvalid, - "template.strategy.rollingParams.maxUnavailable", + "spec.strategy.rollingParams.maxUnavailable", }, - "invalid lower bound template.strategy.rollingParams.maxSurge": { + "invalid lower bound spec.strategy.rollingParams.maxSurge": { rollingConfigMax(kutil.NewIntOrStringFromInt(-1), kutil.NewIntOrStringFromInt(0)), fielderrors.ValidationErrorTypeInvalid, - "template.strategy.rollingParams.maxSurge", + "spec.strategy.rollingParams.maxSurge", }, - "both maxSurge and maxUnavailable 0 percent template.strategy.rollingParams.maxUnavailable": { + "both maxSurge and maxUnavailable 0 percent spec.strategy.rollingParams.maxUnavailable": { rollingConfigMax(kutil.NewIntOrStringFromString("0%"), kutil.NewIntOrStringFromString("0%")), fielderrors.ValidationErrorTypeInvalid, - "template.strategy.rollingParams.maxUnavailable", + "spec.strategy.rollingParams.maxUnavailable", }, - "invalid lower bound percent template.strategy.rollingParams.maxUnavailable": { + "invalid lower bound percent spec.strategy.rollingParams.maxUnavailable": { rollingConfigMax(kutil.NewIntOrStringFromInt(0), kutil.NewIntOrStringFromString("-1%")), fielderrors.ValidationErrorTypeInvalid, - "template.strategy.rollingParams.maxUnavailable", + "spec.strategy.rollingParams.maxUnavailable", }, - "invalid upper bound percent template.strategy.rollingParams.maxUnavailable": { + "invalid upper bound percent spec.strategy.rollingParams.maxUnavailable": { rollingConfigMax(kutil.NewIntOrStringFromInt(0), kutil.NewIntOrStringFromString("101%")), fielderrors.ValidationErrorTypeInvalid, - "template.strategy.rollingParams.maxUnavailable", + "spec.strategy.rollingParams.maxUnavailable", }, - "invalid percent template.strategy.rollingParams.maxUnavailable": { + "invalid percent spec.strategy.rollingParams.maxUnavailable": { rollingConfigMax(kutil.NewIntOrStringFromInt(0), kutil.NewIntOrStringFromString("foo")), fielderrors.ValidationErrorTypeInvalid, - "template.strategy.rollingParams.maxUnavailable", + "spec.strategy.rollingParams.maxUnavailable", }, - "invalid percent template.strategy.rollingParams.maxSurge": { + "invalid percent spec.strategy.rollingParams.maxSurge": { rollingConfigMax(kutil.NewIntOrStringFromString("foo"), kutil.NewIntOrStringFromString("100%")), fielderrors.ValidationErrorTypeInvalid, - "template.strategy.rollingParams.maxSurge", + "spec.strategy.rollingParams.maxSurge", }, } - for k, v := range errorCases { - errs := ValidateDeploymentConfig(&v.D) - if len(v.T) == 0 { + for testName, v := range errorCases { + errs := ValidateDeploymentConfig(&v.DeploymentConfig) + if len(v.ErrorType) == 0 { if len(errs) > 0 { for _, e := range errs { - t.Errorf("unexpected error for %s: %s", k, e) + t.Errorf("%s: unexpected error: %s", testName, e) } } continue } if len(errs) == 0 { - t.Errorf("Expected failure for scenario %s", k) + t.Errorf("%s: expected test failure, got success", testName) } for i := range errs { - if errs[i].(*fielderrors.ValidationError).Type != v.T { - t.Errorf("%s: expected errors to have type %s: %v", k, v.T, errs[i]) + if got, exp := errs[i].(*fielderrors.ValidationError).Type, v.ErrorType; got != exp { + t.Errorf("%s: expected error \"%v\" to have type %q, but got %q", testName, errs[i], exp, got) } - if errs[i].(*fielderrors.ValidationError).Field != v.F { - t.Errorf("%s: expected errors to have field %s: %v", k, v.F, errs[i]) + if got, exp := errs[i].(*fielderrors.ValidationError).Field, v.Field; got != exp { + t.Errorf("%s: expected error \"%v\" to have field %q, but got %q", testName, errs[i], exp, got) } } } @@ -455,16 +481,30 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) { func TestValidateDeploymentConfigUpdate(t *testing.T) { oldConfig := &api.DeploymentConfig{ - ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar", ResourceVersion: "1"}, - Triggers: manualTrigger(), - Template: test.OkDeploymentTemplate(), - LatestVersion: 5, + ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar", ResourceVersion: "1"}, + Spec: api.DeploymentConfigSpec{ + Replicas: 1, + Triggers: manualTrigger(), + Selector: test.OkSelector(), + Strategy: test.OkStrategy(), + Template: test.OkPodTemplate(), + }, + Status: api.DeploymentConfigStatus{ + LatestVersion: 5, + }, } newConfig := &api.DeploymentConfig{ - ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar", ResourceVersion: "1"}, - Triggers: manualTrigger(), - Template: test.OkDeploymentTemplate(), - LatestVersion: 3, + ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar", ResourceVersion: "1"}, + Spec: api.DeploymentConfigSpec{ + Replicas: 1, + Triggers: manualTrigger(), + Selector: test.OkSelector(), + Strategy: test.OkStrategy(), + Template: test.OkPodTemplate(), + }, + Status: api.DeploymentConfigStatus{ + LatestVersion: 3, + }, } scenarios := []struct { @@ -477,8 +517,8 @@ func TestValidateDeploymentConfigUpdate(t *testing.T) { } for _, values := range scenarios { - oldConfig.LatestVersion = values.oldLatestVersion - newConfig.LatestVersion = values.newLatestVersion + oldConfig.Status.LatestVersion = values.oldLatestVersion + newConfig.Status.LatestVersion = values.newLatestVersion errs := ValidateDeploymentConfigUpdate(newConfig, oldConfig) if len(errs) == 0 { t.Errorf("Expected update failure") @@ -487,15 +527,15 @@ func TestValidateDeploymentConfigUpdate(t *testing.T) { if errs[i].(*fielderrors.ValidationError).Type != fielderrors.ValidationErrorTypeInvalid { t.Errorf("expected update error to have type %s: %v", fielderrors.ValidationErrorTypeInvalid, errs[i]) } - if errs[i].(*fielderrors.ValidationError).Field != "latestVersion" { + if errs[i].(*fielderrors.ValidationError).Field != "status.latestVersion" { t.Errorf("expected update error to have field %s: %v", "latestVersion", errs[i]) } } } // testing for a successful update - oldConfig.LatestVersion = 5 - newConfig.LatestVersion = 6 + oldConfig.Status.LatestVersion = 5 + newConfig.Status.LatestVersion = 6 errs := ValidateDeploymentConfigUpdate(newConfig, oldConfig) if len(errs) > 0 { t.Errorf("Unexpected update failure") @@ -569,56 +609,29 @@ func TestValidateDeploymentConfigRollbackInvalidFields(t *testing.T) { func TestValidateDeploymentConfigDefaultImageStreamKind(t *testing.T) { config := &api.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Triggers: []api.DeploymentTriggerPolicy{ - { - Type: api.DeploymentTriggerOnImageChange, - ImageChangeParams: &api.DeploymentTriggerImageChangeParams{ - From: kapi.ObjectReference{ - Name: "name", - }, - ContainerNames: []string{"foo"}, - }, - }, - }, - Template: test.OkDeploymentTemplate(), - } - - errs := ValidateDeploymentConfig(config) - if len(errs) > 0 { - t.Errorf("Unxpected non-empty error list: %v", errs) - } - - if e, a := "ImageStream", config.Triggers[0].ImageChangeParams.From.Kind; e != a { - t.Errorf("expected imageChangeParams.from.kind %s, got %s", e, a) - } -} - -func TestValidateDeploymentConfigImageRepositorySupported(t *testing.T) { - config := &api.DeploymentConfig{ - ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "bar"}, - Triggers: []api.DeploymentTriggerPolicy{ - { - Type: api.DeploymentTriggerOnImageChange, - ImageChangeParams: &api.DeploymentTriggerImageChangeParams{ - From: kapi.ObjectReference{ - Kind: "ImageRepository", - Name: "name", + Spec: api.DeploymentConfigSpec{ + Replicas: 1, + Triggers: []api.DeploymentTriggerPolicy{ + { + Type: api.DeploymentTriggerOnImageChange, + ImageChangeParams: &api.DeploymentTriggerImageChangeParams{ + From: kapi.ObjectReference{ + Kind: "ImageStreamTag", + Name: "name:v1", + }, + ContainerNames: []string{"foo"}, }, - ContainerNames: []string{"foo"}, }, }, + Selector: test.OkSelector(), + Template: test.OkPodTemplate(), + Strategy: test.OkStrategy(), }, - Template: test.OkDeploymentTemplate(), } - errs := ValidateDeploymentConfig(config) - if len(errs) > 0 { + if errs := ValidateDeploymentConfig(config); len(errs) > 0 { t.Errorf("Unxpected non-empty error list: %v", errs) } - - if e, a := "ImageRepository", config.Triggers[0].ImageChangeParams.From.Kind; e != a { - t.Errorf("expected imageChangeParams.from.kind %s, got %s", e, a) - } } func mkint64p(i int) *int64 { diff --git a/pkg/deploy/controller/configchange/controller.go b/pkg/deploy/controller/configchange/controller.go index 24d51dd2fc8c..99c602bce2b7 100644 --- a/pkg/deploy/controller/configchange/controller.go +++ b/pkg/deploy/controller/configchange/controller.go @@ -38,7 +38,7 @@ func (c *DeploymentConfigChangeController) Handle(config *deployapi.DeploymentCo return nil } - if config.LatestVersion == 0 { + if config.Status.LatestVersion == 0 { _, _, err := c.generateDeployment(config) if err != nil { if kerrors.IsConflict(err) { @@ -70,8 +70,8 @@ func (c *DeploymentConfigChangeController) Handle(config *deployapi.DeploymentCo } // Detect template diffs, and return early if there aren't any changes. - if kapi.Semantic.DeepEqual(config.Template.ControllerTemplate.Template, deployedConfig.Template.ControllerTemplate.Template) { - glog.V(5).Infof("Ignoring DeploymentConfig change for %s (latestVersion=%d); same as Deployment %s", deployutil.LabelForDeploymentConfig(config), config.LatestVersion, deployutil.LabelForDeployment(deployment)) + if kapi.Semantic.DeepEqual(config.Spec.Template, deployedConfig.Spec.Template) { + glog.V(5).Infof("Ignoring DeploymentConfig change for %s (latestVersion=%d); same as Deployment %s", deployutil.LabelForDeploymentConfig(config), config.Status.LatestVersion, deployutil.LabelForDeployment(deployment)) return nil } @@ -90,11 +90,11 @@ func (c *DeploymentConfigChangeController) Handle(config *deployapi.DeploymentCo func (c *DeploymentConfigChangeController) generateDeployment(config *deployapi.DeploymentConfig) (int, int, error) { newConfig, err := c.changeStrategy.generateDeploymentConfig(config.Namespace, config.Name) if err != nil { - return config.LatestVersion, 0, err + return config.Status.LatestVersion, 0, err } - if newConfig.LatestVersion == config.LatestVersion { - newConfig.LatestVersion++ + if newConfig.Status.LatestVersion == config.Status.LatestVersion { + newConfig.Status.LatestVersion++ } // set the trigger details for the new deployment config @@ -103,7 +103,7 @@ func (c *DeploymentConfigChangeController) generateDeployment(config *deployapi. &deployapi.DeploymentCause{ Type: deployapi.DeploymentTriggerOnConfigChange, }) - newConfig.Details = &deployapi.DeploymentDetails{ + newConfig.Status.Details = &deployapi.DeploymentDetails{ Causes: causes, } @@ -112,10 +112,10 @@ func (c *DeploymentConfigChangeController) generateDeployment(config *deployapi. // current config will be captured in future events. updatedConfig, err := c.changeStrategy.updateDeploymentConfig(config.Namespace, newConfig) if err != nil { - return config.LatestVersion, newConfig.LatestVersion, err + return config.Status.LatestVersion, newConfig.Status.LatestVersion, err } - return config.LatestVersion, updatedConfig.LatestVersion, nil + return config.Status.LatestVersion, updatedConfig.Status.LatestVersion, nil } // changeStrategy knows how to generate and update DeploymentConfigs. diff --git a/pkg/deploy/controller/configchange/controller_test.go b/pkg/deploy/controller/configchange/controller_test.go index 05eef740dae2..e541a3db2833 100644 --- a/pkg/deploy/controller/configchange/controller_test.go +++ b/pkg/deploy/controller/configchange/controller_test.go @@ -31,7 +31,7 @@ func TestHandle_newConfigNoTriggers(t *testing.T) { } config := deployapitest.OkDeploymentConfig(1) - config.Triggers = []deployapi.DeploymentTriggerPolicy{} + config.Spec.Triggers = []deployapi.DeploymentTriggerPolicy{} err := controller.Handle(config) if err != nil { @@ -61,7 +61,7 @@ func TestHandle_newConfigTriggers(t *testing.T) { } config := deployapitest.OkDeploymentConfig(0) - config.Triggers = []deployapi.DeploymentTriggerPolicy{deployapitest.OkConfigChangeTrigger()} + config.Spec.Triggers = []deployapi.DeploymentTriggerPolicy{deployapitest.OkConfigChangeTrigger()} err := controller.Handle(config) if err != nil { @@ -72,16 +72,16 @@ func TestHandle_newConfigTriggers(t *testing.T) { t.Fatalf("expected config to be updated") } - if e, a := 1, updated.LatestVersion; e != a { + if e, a := 1, updated.Status.LatestVersion; e != a { t.Fatalf("expected update to latestversion=%d, got %d", e, a) } - if updated.Details == nil { + if updated.Status.Details == nil { t.Fatalf("expected config change details to be set") - } else if updated.Details.Causes == nil { + } else if updated.Status.Details.Causes == nil { t.Fatalf("expected config change causes to be set") - } else if updated.Details.Causes[0].Type != deployapi.DeploymentTriggerOnConfigChange { - t.Fatalf("expected config change cause to be set to config change trigger, got %s", updated.Details.Causes[0].Type) + } else if updated.Status.Details.Causes[0].Type != deployapi.DeploymentTriggerOnConfigChange { + t.Fatalf("expected config change cause to be set to config change trigger, got %s", updated.Status.Details.Causes[0].Type) } } @@ -98,14 +98,14 @@ func TestHandle_changeWithTemplateDiff(t *testing.T) { name: "container name change", changeExpected: true, modify: func(config *deployapi.DeploymentConfig) { - config.Template.ControllerTemplate.Template.Spec.Containers[1].Name = "modified" + config.Spec.Template.Spec.Containers[1].Name = "modified" }, }, { name: "template label change", changeExpected: true, modify: func(config *deployapi.DeploymentConfig) { - config.Template.ControllerTemplate.Template.Labels["newkey"] = "value" + config.Spec.Template.Labels["newkey"] = "value" }, }, { @@ -119,7 +119,7 @@ func TestHandle_changeWithTemplateDiff(t *testing.T) { t.Logf("running scenario: %s", s.name) config := deployapitest.OkDeploymentConfig(1) - config.Triggers = []deployapi.DeploymentTriggerPolicy{deployapitest.OkConfigChangeTrigger()} + config.Spec.Triggers = []deployapi.DeploymentTriggerPolicy{deployapitest.OkConfigChangeTrigger()} deployment, _ := deployutil.MakeDeployment(config, kapi.Codec) var updated *deployapi.DeploymentConfig @@ -152,20 +152,20 @@ func TestHandle_changeWithTemplateDiff(t *testing.T) { t.Errorf("expected config to be updated") continue } - if e, a := 2, updated.LatestVersion; e != a { + if e, a := 2, updated.Status.LatestVersion; e != a { t.Errorf("expected update to latestversion=%d, got %d", e, a) } - if updated.Details == nil { + if updated.Status.Details == nil { t.Errorf("expected config change details to be set") - } else if updated.Details.Causes == nil { + } else if updated.Status.Details.Causes == nil { t.Errorf("expected config change causes to be set") - } else if updated.Details.Causes[0].Type != deployapi.DeploymentTriggerOnConfigChange { - t.Errorf("expected config change cause to be set to config change trigger, got %s", updated.Details.Causes[0].Type) + } else if updated.Status.Details.Causes[0].Type != deployapi.DeploymentTriggerOnConfigChange { + t.Errorf("expected config change cause to be set to config change trigger, got %s", updated.Status.Details.Causes[0].Type) } } else { if updated != nil { - t.Errorf("unexpected update to version %d", updated.LatestVersion) + t.Errorf("unexpected update to version %d", updated.Status.LatestVersion) } } } diff --git a/pkg/deploy/controller/deployment/controller.go b/pkg/deploy/controller/deployment/controller.go index 9cc5c2b670ad..6fcf226e1e9a 100644 --- a/pkg/deploy/controller/deployment/controller.go +++ b/pkg/deploy/controller/deployment/controller.go @@ -204,7 +204,7 @@ func (c *DeploymentController) makeDeployerPod(deployment *kapi.ReplicationContr return nil, err } - container, err := c.makeContainer(&deploymentConfig.Template.Strategy) + container, err := c.makeContainer(&deploymentConfig.Spec.Strategy) if err != nil { return nil, err } @@ -238,7 +238,7 @@ func (c *DeploymentController) makeDeployerPod(deployment *kapi.ReplicationContr Args: container.Args, Image: container.Image, Env: envVars, - Resources: deploymentConfig.Template.Strategy.Resources, + Resources: deploymentConfig.Spec.Strategy.Resources, }, }, ActiveDeadlineSeconds: &maxDeploymentDurationSeconds, @@ -251,8 +251,8 @@ func (c *DeploymentController) makeDeployerPod(deployment *kapi.ReplicationContr } // MergeInfo will not overwrite values unless the flag OverwriteExistingDstKey is set. - util.MergeInto(pod.Labels, deploymentConfig.Template.Strategy.Labels, 0) - util.MergeInto(pod.Annotations, deploymentConfig.Template.Strategy.Annotations, 0) + util.MergeInto(pod.Labels, deploymentConfig.Spec.Strategy.Labels, 0) + util.MergeInto(pod.Annotations, deploymentConfig.Spec.Strategy.Annotations, 0) pod.Spec.Containers[0].ImagePullPolicy = kapi.PullIfNotPresent diff --git a/pkg/deploy/controller/deployment/controller_test.go b/pkg/deploy/controller/deployment/controller_test.go index 9ffa3ad7d599..10e7042717b7 100644 --- a/pkg/deploy/controller/deployment/controller_test.go +++ b/pkg/deploy/controller/deployment/controller_test.go @@ -696,9 +696,9 @@ func TestDeployerCustomLabelsAndAnnotations(t *testing.T) { for _, test := range testCases { t.Logf("evaluating test case %s", test.name) config := deploytest.OkDeploymentConfig(1) - config.Template.Strategy = test.strategy - config.Template.Strategy.Labels = test.labels - config.Template.Strategy.Annotations = test.annotations + config.Spec.Strategy = test.strategy + config.Spec.Strategy.Labels = test.labels + config.Spec.Strategy.Annotations = test.annotations deployment, _ := deployutil.MakeDeployment(config, kapi.Codec) podTemplate, err := controller.makeDeployerPod(deployment) diff --git a/pkg/deploy/controller/deploymentconfig/controller.go b/pkg/deploy/controller/deploymentconfig/controller.go index 7e2245394b42..550c1c0009de 100644 --- a/pkg/deploy/controller/deploymentconfig/controller.go +++ b/pkg/deploy/controller/deploymentconfig/controller.go @@ -67,7 +67,7 @@ func NewDeploymentConfigController(kubeClient kclient.Interface, osClient osclie func (c *DeploymentConfigController) Handle(config *deployapi.DeploymentConfig) error { // There's nothing to reconcile until the version is nonzero. - if config.LatestVersion == 0 { + if config.Status.LatestVersion == 0 { glog.V(5).Infof("Waiting for first version of %s", deployutil.LabelForDeploymentConfig(config)) return nil } @@ -96,9 +96,9 @@ func (c *DeploymentConfigController) Handle(config *deployapi.DeploymentConfig) deployment.Annotations[deployapi.DeploymentStatusReasonAnnotation] = deployapi.DeploymentCancelledNewerDeploymentExists _, err := c.kubeClient.ReplicationControllers(deployment.Namespace).Update(&deployment) if err != nil { - c.recorder.Eventf(config, "DeploymentCancellationFailed", "Failed to cancel deployment %q superceded by version %d: %s", deployment.Name, config.LatestVersion, err) + c.recorder.Eventf(config, "DeploymentCancellationFailed", "Failed to cancel deployment %q superceded by version %d: %s", deployment.Name, config.Status.LatestVersion, err) } else { - c.recorder.Eventf(config, "DeploymentCancelled", "Cancelled deployment %q superceded by version %d", deployment.Name, config.LatestVersion) + c.recorder.Eventf(config, "DeploymentCancelled", "Cancelled deployment %q superceded by version %d", deployment.Name, config.Status.LatestVersion) } } } @@ -106,7 +106,7 @@ func (c *DeploymentConfigController) Handle(config *deployapi.DeploymentConfig) // Wait for deployment cancellations before reconciling or creating a new // deployment to avoid competing with existing deployment processes. if awaitingCancellations { - c.recorder.Eventf(config, "DeploymentAwaitingCancellation", "Deployment of version %d awaiting cancellation of older running deployments", config.LatestVersion) + c.recorder.Eventf(config, "DeploymentAwaitingCancellation", "Deployment of version %d awaiting cancellation of older running deployments", config.Status.LatestVersion) // raise a transientError so that the deployment config can be re-queued return transientError(fmt.Sprintf("found previous inflight deployment for %s - requeuing", deployutil.LabelForDeploymentConfig(config))) } @@ -133,10 +133,10 @@ func (c *DeploymentConfigController) Handle(config *deployapi.DeploymentConfig) if errors.IsAlreadyExists(err) { return nil } - c.recorder.Eventf(config, "DeploymentCreationFailed", "Couldn't deploy version %d: %s", config.LatestVersion, err) + c.recorder.Eventf(config, "DeploymentCreationFailed", "Couldn't deploy version %d: %s", config.Status.LatestVersion, err) return fmt.Errorf("couldn't create deployment for deployment config %s: %v", deployutil.LabelForDeploymentConfig(config), err) } - c.recorder.Eventf(config, "DeploymentCreated", "Created new deployment %q for version %d", created.Name, config.LatestVersion) + c.recorder.Eventf(config, "DeploymentCreated", "Created new deployment %q for version %d", created.Name, config.Status.LatestVersion) return nil } @@ -169,7 +169,7 @@ func (c *DeploymentConfigController) reconcileDeployments(existingDeployments *k // By default we'll assume the config replicas should be used to update the // active deployment except in special cases (like first sync or externally // updated deployments.) - activeReplicas := config.Template.ControllerTemplate.Replicas + activeReplicas := config.Spec.Replicas source := "the deploymentConfig itself (no change)" activeDeploymentExists := activeDeployment != nil @@ -209,9 +209,9 @@ func (c *DeploymentConfigController) reconcileDeployments(existingDeployments *k // Bring the config in sync with the deployment. Once we know the config // accurately represents the desired replica count of the active deployment, // we can safely reconcile deployments. - if config.Template.ControllerTemplate.Replicas != activeReplicas { - oldReplicas := config.Template.ControllerTemplate.Replicas - config.Template.ControllerTemplate.Replicas = activeReplicas + if config.Spec.Replicas != activeReplicas { + oldReplicas := config.Spec.Replicas + config.Spec.Replicas = activeReplicas _, err := c.osClient.DeploymentConfigs(config.Namespace).Update(config) if err != nil { return err diff --git a/pkg/deploy/controller/deploymentconfig/controller_test.go b/pkg/deploy/controller/deploymentconfig/controller_test.go index dbf31bc86d04..f82d81d98813 100644 --- a/pkg/deploy/controller/deploymentconfig/controller_test.go +++ b/pkg/deploy/controller/deploymentconfig/controller_test.go @@ -593,7 +593,7 @@ func TestHandleScenarios(t *testing.T) { } config := deploytest.OkDeploymentConfig(test.newVersion) - config.Template.ControllerTemplate.Replicas = test.replicas + config.Spec.Replicas = test.replicas err := controller.Handle(config) if err != nil && !test.errExpected { t.Fatalf("unexpected error: %s", err) @@ -610,7 +610,7 @@ func TestHandleScenarios(t *testing.T) { sort.Sort(deployutil.ByLatestVersionDesc(expectedDeployments)) sort.Sort(deployutil.ByLatestVersionDesc(actualDeployments)) - if e, a := test.expectedReplicas, config.Template.ControllerTemplate.Replicas; e != a { + if e, a := test.expectedReplicas, config.Spec.Replicas; e != a { t.Errorf("expected config replicas to be %d, got %d", e, a) t.Fatalf("events:\n%s", strings.Join(recorder.Events, "\t\n")) } diff --git a/pkg/deploy/controller/imagechange/controller.go b/pkg/deploy/controller/imagechange/controller.go index 911c5d2bcf23..7bb03bb32df1 100644 --- a/pkg/deploy/controller/imagechange/controller.go +++ b/pkg/deploy/controller/imagechange/controller.go @@ -37,7 +37,7 @@ func (c *ImageChangeController) Handle(imageRepo *imageapi.ImageStream) error { for _, config := range configs { glog.V(4).Infof("Detecting changed images for DeploymentConfig %s", deployutil.LabelForDeploymentConfig(config)) - for _, trigger := range config.Triggers { + for _, trigger := range config.Spec.Triggers { params := trigger.ImageChangeParams // Only automatic image change triggers should fire @@ -50,10 +50,15 @@ func (c *ImageChangeController) Handle(imageRepo *imageapi.ImageStream) error { continue } + _, tag, ok := imageapi.SplitImageStreamTag(params.From.Name) + if !ok { + return fmt.Errorf("invalid ImageStreamTag: %s", params.From.Name) + } + // Find the latest tag event for the trigger tag - latestEvent := imageapi.LatestTaggedImage(imageRepo, params.Tag) + latestEvent := imageapi.LatestTaggedImage(imageRepo, tag) if latestEvent == nil { - glog.V(5).Infof("Couldn't find latest tag event for tag %s in ImageStream %s", params.Tag, labelForRepo(imageRepo)) + glog.V(5).Infof("Couldn't find latest tag event for tag %s in ImageStream %s", tag, labelForRepo(imageRepo)) continue } @@ -95,19 +100,10 @@ func triggerMatchesImage(config *deployapi.DeploymentConfig, params *deployapi.D if len(namespace) == 0 { namespace = config.Namespace } - - return repo.Namespace == namespace && repo.Name == params.From.Name + name, _, ok := imageapi.SplitImageStreamTag(params.From.Name) + return repo.Namespace == namespace && repo.Name == name && ok } - - // This is an invalid state (as one of From.Name or RepositoryName is required), but - // account for it anyway. - if len(params.RepositoryName) == 0 { - return false - } - - // If the repo's repository information isn't yet available, we can't assume it'll match. - return len(repo.Status.DockerImageRepository) > 0 && - params.RepositoryName == repo.Status.DockerImageRepository + return false } // regenerate calls the generator to get a new config. If the newly generated @@ -121,7 +117,7 @@ func (c *ImageChangeController) regenerate(config *deployapi.DeploymentConfig) e } // No update occurred - if config.LatestVersion == newConfig.LatestVersion { + if config.Status.LatestVersion == newConfig.Status.LatestVersion { glog.V(5).Infof("No version difference for generated DeploymentConfig %s", deployutil.LabelForDeploymentConfig(config)) return nil } diff --git a/pkg/deploy/controller/imagechange/controller_test.go b/pkg/deploy/controller/imagechange/controller_test.go index 5b25a6d1fe27..a069b8ba34fd 100644 --- a/pkg/deploy/controller/imagechange/controller_test.go +++ b/pkg/deploy/controller/imagechange/controller_test.go @@ -31,7 +31,7 @@ func TestHandle_changeForNonAutomaticTag(t *testing.T) { }, listDeploymentConfigsFunc: func() ([]*deployapi.DeploymentConfig, error) { config := deployapitest.OkDeploymentConfig(1) - config.Triggers[0].ImageChangeParams.Automatic = false + config.Spec.Triggers[0].ImageChangeParams.Automatic = false return []*deployapi.DeploymentConfig{config}, nil }, @@ -93,43 +93,31 @@ func TestHandle_matchScenarios(t *testing.T) { "params.1": { Automatic: true, ContainerNames: []string{"container-1"}, - From: kapi.ObjectReference{Namespace: kapi.NamespaceDefault, Name: "repoA"}, - Tag: imageapi.DefaultImageTag, + From: kapi.ObjectReference{Namespace: kapi.NamespaceDefault, Name: imageapi.JoinImageStreamTag("repoA", imageapi.DefaultImageTag)}, LastTriggeredImage: "", }, "params.2": { Automatic: true, ContainerNames: []string{"container-1"}, - From: kapi.ObjectReference{Name: "repoA"}, - Tag: imageapi.DefaultImageTag, + From: kapi.ObjectReference{Name: imageapi.JoinImageStreamTag("repoA", imageapi.DefaultImageTag)}, LastTriggeredImage: "", }, "params.3": { Automatic: false, ContainerNames: []string{"container-1"}, - From: kapi.ObjectReference{Namespace: kapi.NamespaceDefault, Name: "repoA"}, - Tag: imageapi.DefaultImageTag, + From: kapi.ObjectReference{Namespace: kapi.NamespaceDefault, Name: imageapi.JoinImageStreamTag("repoA", imageapi.DefaultImageTag)}, LastTriggeredImage: "", }, - // This tests the deprecated RepositoryName reference "params.4": { - Automatic: true, - ContainerNames: []string{"container-1"}, - RepositoryName: "registry:8080/openshift/test-image", - Tag: imageapi.DefaultImageTag, - }, - "params.5": { Automatic: true, ContainerNames: []string{"container-1"}, - From: kapi.ObjectReference{Name: "repoA"}, - Tag: imageapi.DefaultImageTag, + From: kapi.ObjectReference{Name: imageapi.JoinImageStreamTag("repoA", imageapi.DefaultImageTag)}, LastTriggeredImage: "registry:8080/openshift/test-image@sha256:00000000000000000000000000000001", }, - "params.6": { + "params.5": { Automatic: true, ContainerNames: []string{"container-1"}, - From: kapi.ObjectReference{Namespace: kapi.NamespaceDefault, Name: "repoC"}, - Tag: imageapi.DefaultImageTag, + From: kapi.ObjectReference{Namespace: kapi.NamespaceDefault, Name: imageapi.JoinImageStreamTag("repoC", imageapi.DefaultImageTag)}, LastTriggeredImage: "", }, } @@ -158,19 +146,6 @@ func TestHandle_matchScenarios(t *testing.T) { ), }, }, - // This one includes a Status.DockerImageRepository for testing params - // which use the deprecated RepositoryName reference - "update.2": { - ObjectMeta: kapi.ObjectMeta{Name: "repoA", Namespace: kapi.NamespaceDefault}, - Status: imageapi.ImageStreamStatus{ - DockerImageRepository: "registry:8080/openshift/test-image", - Tags: tagHistoryFor( - imageapi.DefaultImageTag, - "registry:8080/openshift/test-image@sha256:00000000000000000000000000000001", - "00000000000000000000000000000001", - ), - }, - }, } scenarios := []struct { @@ -184,22 +159,16 @@ func TestHandle_matchScenarios(t *testing.T) { {"params.2", "update.1", true}, // Update from empty last image ID to a new one, but not marked automatic {"params.3", "update.1", false}, - // Deprecated RepositoryName reference where the update's - // Status.DockerImageRepository field isn't yet available - {"params.4", "update.1", false}, - // Deprecated RepositoryName reference with Status.DockerImageRepository - // now available - {"params.4", "update.2", true}, // Updated image ID is equal to the last triggered ID - {"params.5", "update.1", false}, + {"params.4", "update.1", false}, // Trigger repo reference doesn't match - {"params.6", "update.1", false}, + {"params.5", "update.1", false}, } for _, s := range scenarios { config := deployapitest.OkDeploymentConfig(0) config.Namespace = kapi.NamespaceDefault - config.Triggers = []deployapi.DeploymentTriggerPolicy{ + config.Spec.Triggers = []deployapi.DeploymentTriggerPolicy{ { Type: deployapi.DeploymentTriggerOnImageChange, ImageChangeParams: params[s.param], @@ -224,9 +193,9 @@ func TestHandle_matchScenarios(t *testing.T) { } generated = true // simulate a generation - newConfig := deployapitest.OkDeploymentConfig(config.LatestVersion + 1) + newConfig := deployapitest.OkDeploymentConfig(config.Status.LatestVersion + 1) newConfig.Namespace = config.Namespace - newConfig.Triggers = config.Triggers + newConfig.Spec.Triggers = config.Spec.Triggers return newConfig, nil }, listDeploymentConfigsFunc: func() ([]*deployapi.DeploymentConfig, error) { diff --git a/pkg/deploy/generator/config_generator.go b/pkg/deploy/generator/config_generator.go index 135847f63986..8e4f3bb06b7c 100644 --- a/pkg/deploy/generator/config_generator.go +++ b/pkg/deploy/generator/config_generator.go @@ -33,7 +33,7 @@ func (g *DeploymentConfigGenerator) Generate(ctx kapi.Context, name string) (*de configChanged := false errs := fielderrors.ValidationErrorList{} causes := []*deployapi.DeploymentCause{} - for i, trigger := range config.Triggers { + for i, trigger := range config.Spec.Triggers { params := trigger.ImageChangeParams // Only process image change triggers @@ -41,29 +41,31 @@ func (g *DeploymentConfigGenerator) Generate(ctx kapi.Context, name string) (*de continue } + name, tag, ok := imageapi.SplitImageStreamTag(params.From.Name) + if !ok { + f := fmt.Sprintf("triggers[%d].imageChange.from", i) + errs = append(errs, fielderrors.NewFieldInvalid(f, name, err.Error())) + continue + } + // Find the image repo referred to by the trigger params imageStream, err := g.findImageStream(config, params) if err != nil { f := fmt.Sprintf("triggers[%d].imageChange.from", i) - v := params.From.Name - if len(params.RepositoryName) > 0 { - f = fmt.Sprintf("triggers[%d].imageChange.repositoryName", i) - v = params.RepositoryName - } - errs = append(errs, fielderrors.NewFieldInvalid(f, v, err.Error())) + errs = append(errs, fielderrors.NewFieldInvalid(f, name, err.Error())) continue } // Find the latest tag event for the trigger tag - latestEvent := imageapi.LatestTaggedImage(imageStream, params.Tag) + latestEvent := imageapi.LatestTaggedImage(imageStream, tag) if latestEvent == nil { f := fmt.Sprintf("triggers[%d].imageChange.tag", i) - errs = append(errs, fielderrors.NewFieldInvalid(f, params.Tag, fmt.Sprintf("no image recorded for %s/%s:%s", imageStream.Namespace, imageStream.Name, params.Tag))) + errs = append(errs, fielderrors.NewFieldInvalid(f, tag, fmt.Sprintf("no image recorded for %s/%s:%s", imageStream.Namespace, imageStream.Name, tag))) continue } // Update containers - template := config.Template.ControllerTemplate.Template + template := config.Spec.Template names := sets.NewString(params.ContainerNames...) containerChanged := false for i := range template.Spec.Containers { @@ -88,8 +90,10 @@ func (g *DeploymentConfigGenerator) Generate(ctx kapi.Context, name string) (*de &deployapi.DeploymentCause{ Type: deployapi.DeploymentTriggerOnImageChange, ImageTrigger: &deployapi.DeploymentCauseImageTrigger{ - RepositoryName: latestEvent.DockerImageReference, - Tag: params.Tag, + From: kapi.ObjectReference{ + Name: imageapi.JoinImageStreamTag(imageStream.Name, tag), + Kind: "ImageStreamTag", + }, }, }) } @@ -101,37 +105,27 @@ func (g *DeploymentConfigGenerator) Generate(ctx kapi.Context, name string) (*de // Bump the version if we updated containers or if this is an initial // deployment - if configChanged || config.LatestVersion == 0 { - config.Details = &deployapi.DeploymentDetails{ + if configChanged || config.Status.LatestVersion == 0 { + config.Status.Details = &deployapi.DeploymentDetails{ Causes: causes, } - config.LatestVersion++ + config.Status.LatestVersion++ } return config, nil } func (g *DeploymentConfigGenerator) findImageStream(config *deployapi.DeploymentConfig, params *deployapi.DeploymentTriggerImageChangeParams) (*imageapi.ImageStream, error) { - // Try to find the repo by ObjectReference if len(params.From.Name) > 0 { namespace := params.From.Namespace if len(namespace) == 0 { namespace = config.Namespace } - - return g.Client.GetImageStream(kapi.WithNamespace(kapi.NewContext(), namespace), params.From.Name) - } - - // Fall back to a list based lookup on RepositoryName - repos, err := g.Client.ListImageStreams(kapi.WithNamespace(kapi.NewContext(), config.Namespace)) - if err != nil { - return nil, err - } - for _, repo := range repos.Items { - if len(repo.Status.DockerImageRepository) > 0 && - params.RepositoryName == repo.Status.DockerImageRepository { - return &repo, nil + name, _, ok := imageapi.SplitImageStreamTag(params.From.Name) + if !ok { + return nil, fmt.Errorf("invalid ImageStreamTag: %s", params.From.Name) } + return g.Client.GetImageStream(kapi.WithNamespace(kapi.NewContext(), namespace), name) } return nil, fmt.Errorf("couldn't find image stream for config %s trigger params", deployutil.LabelForDeploymentConfig(config)) } diff --git a/pkg/deploy/generator/config_generator_test.go b/pkg/deploy/generator/config_generator_test.go index b63253f73189..0cae882392da 100644 --- a/pkg/deploy/generator/config_generator_test.go +++ b/pkg/deploy/generator/config_generator_test.go @@ -66,46 +66,8 @@ func TestGenerate_fromConfigWithoutTagChange(t *testing.T) { t.Fatalf("Expected non-nil config") } - if config.LatestVersion != 1 { - t.Fatalf("Expected config LatestVersion=1, got %d", config.LatestVersion) - } -} - -func TestGenerate_deprecatedFromConfigWithoutTagChange(t *testing.T) { - generator := &DeploymentConfigGenerator{ - Client: Client{ - DCFn: func(ctx kapi.Context, id string) (*deployapi.DeploymentConfig, error) { - config := deploytest.OkDeploymentConfig(1) - config.Triggers[0] = deploytest.OkImageChangeTriggerDeprecated() - return config, nil - }, - LISFn: func(ctx kapi.Context) (*imageapi.ImageStreamList, error) { - stream := makeStream( - "test-image-stream", - imageapi.DefaultImageTag, - "registry:8080/repo1:ref1", - "00000000000000000000000000000001", - ) - stream.Status.DockerImageRepository = "registry:8080/repo1:ref1" - return &imageapi.ImageStreamList{ - Items: []imageapi.ImageStream{*stream}, - }, nil - }, - }, - } - - config, err := generator.Generate(kapi.NewDefaultContext(), "deploy1") - - if err != nil { - t.Fatalf("Unexpected error: %v", err) - } - - if config == nil { - t.Fatalf("Expected non-nil config") - } - - if config.LatestVersion != 1 { - t.Fatalf("Expected config LatestVersion=1, got %d", config.LatestVersion) + if config.Status.LatestVersion != 1 { + t.Fatalf("Expected config LatestVersion=1, got %d", config.Status.LatestVersion) } } @@ -138,13 +100,14 @@ func TestGenerate_fromZeroConfigWithoutTagChange(t *testing.T) { t.Fatalf("Expected non-nil config") } - if config.LatestVersion != 1 { - t.Fatalf("Expected config LatestVersion=1, got %d", config.LatestVersion) + if config.Status.LatestVersion != 1 { + t.Fatalf("Expected config LatestVersion=1, got %d", config.Status.LatestVersion) } } func TestGenerate_fromConfigWithUpdatedImageRef(t *testing.T) { newRepoName := "registry:8080/openshift/test-image@sha256:00000000000000000000000000000002" + streamName := "test-image-stream" newImageID := "00000000000000000000000000000002" generator := &DeploymentConfigGenerator{ @@ -154,7 +117,7 @@ func TestGenerate_fromConfigWithUpdatedImageRef(t *testing.T) { }, ISFn: func(ctx kapi.Context, name string) (*imageapi.ImageStream, error) { stream := makeStream( - "test-image-stream", + streamName, imageapi.DefaultImageTag, newRepoName, newImageID, @@ -175,23 +138,24 @@ func TestGenerate_fromConfigWithUpdatedImageRef(t *testing.T) { t.Fatalf("Expected non-nil config") } - if config.LatestVersion != 2 { - t.Fatalf("Expected config LatestVersion=2, got %d", config.LatestVersion) + if config.Status.LatestVersion != 2 { + t.Fatalf("Expected config LatestVersion=2, got %d", config.Status.LatestVersion) } - if e, a := newRepoName, config.Template.ControllerTemplate.Template.Spec.Containers[0].Image; e != a { - t.Fatalf("Expected container image %s, got %s", e, a) + if expected, actual := newRepoName, config.Spec.Template.Spec.Containers[0].Image; actual != expected { + t.Fatalf("Expected container image %q, got %q", expected, actual) } - if e, a := newRepoName, config.Triggers[0].ImageChangeParams.LastTriggeredImage; e != a { - t.Fatalf("Expected LastTriggeredImage %s, got %s", e, a) + if expected, actual := newRepoName, config.Spec.Triggers[0].ImageChangeParams.LastTriggeredImage; actual != expected { + t.Fatalf("Expected LastTriggeredImage %q, got %q", expected, actual) } - if e, a := config.Details.Causes[0].ImageTrigger.Tag, imageapi.DefaultImageTag; e != a { - t.Fatalf("Expected cause tag %s, got %s", e, a) + name, tag, _ := imageapi.SplitImageStreamTag(config.Status.Details.Causes[0].ImageTrigger.From.Name) + if actual, expected := tag, imageapi.DefaultImageTag; actual != expected { + t.Fatalf("Expected cause tag %q, got %q", expected, actual) } - if e, a := config.Details.Causes[0].ImageTrigger.RepositoryName, newRepoName; e != a { - t.Fatalf("Expected cause stream %s, got %s", e, a) + if actual, expected := name, streamName; actual != expected { + t.Fatalf("Expected cause stream %q, got %q", expected, actual) } } diff --git a/pkg/deploy/generator/generator.go b/pkg/deploy/generator/generator.go index f26dc7412f99..26e63590992a 100644 --- a/pkg/deploy/generator/generator.go +++ b/pkg/deploy/generator/generator.go @@ -28,8 +28,10 @@ func (BasicDeploymentConfigController) Generate(genericParams map[string]interfa case *kapi.ReplicationController: obj = &deployapi.DeploymentConfig{ ObjectMeta: t.ObjectMeta, - Template: deployapi.DeploymentTemplate{ - ControllerTemplate: t.Spec, + Spec: deployapi.DeploymentConfigSpec{ + Selector: t.Spec.Selector, + Replicas: t.Spec.Replicas, + Template: t.Spec.Template, }, } default: diff --git a/pkg/deploy/graph/edges.go b/pkg/deploy/graph/edges.go index 5c118403082f..de72a6429120 100644 --- a/pkg/deploy/graph/edges.go +++ b/pkg/deploy/graph/edges.go @@ -6,6 +6,7 @@ import ( osgraph "github.com/openshift/origin/pkg/api/graph" kubegraph "github.com/openshift/origin/pkg/api/kubegraph/nodes" deploygraph "github.com/openshift/origin/pkg/deploy/graph/nodes" + imageapi "github.com/openshift/origin/pkg/image/api" imagegraph "github.com/openshift/origin/pkg/image/graph/nodes" ) @@ -17,13 +18,13 @@ const ( // AddTriggerEdges creates edges that point to named Docker image repositories for each image used in the deployment. func AddTriggerEdges(g osgraph.MutableUniqueGraph, node *deploygraph.DeploymentConfigNode) *deploygraph.DeploymentConfigNode { - rcTemplate := node.DeploymentConfig.Template.ControllerTemplate.Template - if rcTemplate == nil { + podTemplate := node.DeploymentConfig.Spec.Template + if podTemplate == nil { return node } EachTemplateImage( - &rcTemplate.Spec, + &podTemplate.Spec, DeploymentConfigHasTrigger(node.DeploymentConfig), func(image TemplateImage, err error) { if err != nil { @@ -33,8 +34,8 @@ func AddTriggerEdges(g osgraph.MutableUniqueGraph, node *deploygraph.DeploymentC if len(image.From.Name) == 0 { return } - - in := imagegraph.FindOrCreateSyntheticImageStreamTagNode(g, imagegraph.MakeImageStreamTagObjectMeta(image.From.Namespace, image.From.Name, image.FromTag)) + name, tag, _ := imageapi.SplitImageStreamTag(image.From.Name) + in := imagegraph.FindOrCreateSyntheticImageStreamTagNode(g, imagegraph.MakeImageStreamTagObjectMeta(image.From.Namespace, name, tag)) g.AddEdge(in, node, TriggersDeploymentEdgeKind) return } diff --git a/pkg/deploy/graph/helpers.go b/pkg/deploy/graph/helpers.go index 5056deb40a5f..d245cd843cda 100644 --- a/pkg/deploy/graph/helpers.go +++ b/pkg/deploy/graph/helpers.go @@ -27,7 +27,7 @@ func RelevantDeployments(g osgraph.Graph, dcNode *deploygraph.DeploymentConfigNo sort.Sort(RecentDeploymentReferences(allDeployments)) - if dcNode.DeploymentConfig.LatestVersion == deployutil.DeploymentVersionFor(allDeployments[0]) { + if dcNode.DeploymentConfig.Status.LatestVersion == deployutil.DeploymentVersionFor(allDeployments[0]) { return allDeployments[0], allDeployments[1:] } @@ -55,8 +55,7 @@ type TemplateImage struct { Ref *imageapi.DockerImageReference - From *kapi.ObjectReference - FromTag string + From *kapi.ObjectReference } func EachTemplateImage(pod *kapi.PodSpec, triggerFn TriggeredByFunc, fn func(TemplateImage, error)) { @@ -80,7 +79,7 @@ type TriggeredByFunc func(container *kapi.Container) (TemplateImage, bool) func DeploymentConfigHasTrigger(config *deployapi.DeploymentConfig) TriggeredByFunc { return func(container *kapi.Container) (TemplateImage, bool) { - for _, trigger := range config.Triggers { + for _, trigger := range config.Spec.Triggers { params := trigger.ImageChangeParams if params == nil { continue @@ -90,18 +89,13 @@ func DeploymentConfigHasTrigger(config *deployapi.DeploymentConfig) TriggeredByF if len(params.From.Name) == 0 { continue } - tag := params.Tag - if len(tag) == 0 { - tag = imageapi.DefaultImageTag - } from := params.From if len(from.Namespace) == 0 { from.Namespace = config.Namespace } return TemplateImage{ - Image: container.Image, - From: &from, - FromTag: tag, + Image: container.Image, + From: &from, }, true } } diff --git a/pkg/deploy/graph/nodes/nodes.go b/pkg/deploy/graph/nodes/nodes.go index da41b7d14174..46566f3febed 100644 --- a/pkg/deploy/graph/nodes/nodes.go +++ b/pkg/deploy/graph/nodes/nodes.go @@ -19,8 +19,10 @@ func EnsureDeploymentConfigNode(g osgraph.MutableUniqueGraph, dc *depoyapi.Deplo }, ).(*DeploymentConfigNode) - rcSpecNode := kubegraph.EnsureReplicationControllerSpecNode(g, &dc.Template.ControllerTemplate, dcName) - g.AddEdge(dcNode, rcSpecNode, osgraph.ContainsEdgeKind) + if dc.Spec.Template != nil { + podTemplateSpecNode := kubegraph.EnsurePodTemplateSpecNode(g, dc.Spec.Template, dcName) + g.AddEdge(dcNode, podTemplateSpecNode, osgraph.ContainsEdgeKind) + } return dcNode } diff --git a/pkg/deploy/graph/nodes/nodes_test.go b/pkg/deploy/graph/nodes/nodes_test.go index f4cfa5ce8061..35a63a942fec 100644 --- a/pkg/deploy/graph/nodes/nodes_test.go +++ b/pkg/deploy/graph/nodes/nodes_test.go @@ -3,32 +3,60 @@ package nodes import ( "testing" + "github.com/gonum/graph/topo" + osgraph "github.com/openshift/origin/pkg/api/graph" + kubetypes "github.com/openshift/origin/pkg/api/kubegraph/nodes" deployapi "github.com/openshift/origin/pkg/deploy/api" + "github.com/openshift/origin/pkg/deploy/api/test" ) -func TestDCRCSpecNode(t *testing.T) { +func TestDCPodTemplateSpecNode(t *testing.T) { g := osgraph.New() dc := &deployapi.DeploymentConfig{} dc.Namespace = "ns" dc.Name = "foo" + dc.Spec.Template = test.OkPodTemplate() - dcNode := EnsureDeploymentConfigNode(g, dc) + _ = EnsureDeploymentConfigNode(g, dc) - if len(g.Nodes()) != 2 { - t.Errorf("expected 2 nodes, got %v", g.Nodes()) + edges := g.Edges() + if len(edges) != 2 { + t.Errorf("expected 2 edges, got %d", len(edges)) + return } - - if len(g.Edges()) != 1 { - t.Errorf("expected 2 edge, got %v", g.Edges()) + for i := range edges { + if !g.EdgeKinds(edges[i]).Has(osgraph.ContainsEdgeKind) { + t.Errorf("expected %v, got %v", osgraph.ContainsEdgeKind, g.EdgeKinds(edges[i])) + return + } } - edge := g.Edges()[0] - if !g.EdgeKinds(edge).Has(osgraph.ContainsEdgeKind) { - t.Errorf("expected %v, got %v", osgraph.ContainsEdgeKind, g.EdgeKinds(edge)) + nodes := g.Nodes() + if len(nodes) != 3 { + t.Errorf("expected 3 nodes, got %d", len(nodes)) + return + } + sorted, err := topo.Sort(g) + if err != nil { + t.Errorf("unexpected error: %v", err) + return + } + // Just to be sure + if len(sorted) != 3 { + t.Errorf("expected 3 nodes, got %d", len(sorted)) + return + } + if _, ok := sorted[0].(*DeploymentConfigNode); !ok { + t.Errorf("expected first node to be a DeploymentConfigNode") + return + } + if _, ok := sorted[1].(*kubetypes.PodTemplateSpecNode); !ok { + t.Errorf("expected second node to be a PodTemplateSpecNode") + return } - if edge.From().ID() != dcNode.ID() { - t.Errorf("expected %v, got %v", dcNode.ID(), edge.From()) + if _, ok := sorted[2].(*kubetypes.PodSpecNode); !ok { + t.Errorf("expected third node to be a PodSpecNode") } } diff --git a/pkg/deploy/registry/deployconfig/etcd/etcd.go b/pkg/deploy/registry/deployconfig/etcd/etcd.go index fa3bf30b2e15..d51e342b6685 100644 --- a/pkg/deploy/registry/deployconfig/etcd/etcd.go +++ b/pkg/deploy/registry/deployconfig/etcd/etcd.go @@ -112,11 +112,11 @@ func (r *ScaleREST) Get(ctx kapi.Context, name string) (runtime.Object, error) { CreationTimestamp: deploymentConfig.CreationTimestamp, }, Spec: extensions.ScaleSpec{ - Replicas: deploymentConfig.Template.ControllerTemplate.Replicas, + Replicas: deploymentConfig.Spec.Replicas, }, Status: extensions.ScaleStatus{ Replicas: totalReplicas, - Selector: deploymentConfig.Template.ControllerTemplate.Selector, + Selector: deploymentConfig.Spec.Selector, }, }, nil } @@ -162,7 +162,7 @@ func (r *ScaleREST) Update(ctx kapi.Context, obj runtime.Object) (runtime.Object Replicas: scale.Spec.Replicas, }, Status: extensions.ScaleStatus{ - Selector: deploymentConfig.Template.ControllerTemplate.Selector, + Selector: deploymentConfig.Spec.Selector, }, } @@ -173,8 +173,8 @@ func (r *ScaleREST) Update(ctx kapi.Context, obj runtime.Object) (runtime.Object return nil, false, err } - oldReplicas := deploymentConfig.Template.ControllerTemplate.Replicas - deploymentConfig.Template.ControllerTemplate.Replicas = scale.Spec.Replicas + oldReplicas := deploymentConfig.Spec.Replicas + deploymentConfig.Spec.Replicas = scale.Spec.Replicas if err := r.registry.UpdateDeploymentConfig(ctx, deploymentConfig); err != nil { return nil, false, err } diff --git a/pkg/deploy/registry/deployconfig/strategy_test.go b/pkg/deploy/registry/deployconfig/strategy_test.go index fd5e176254b2..e3c1f06ddc5a 100644 --- a/pkg/deploy/registry/deployconfig/strategy_test.go +++ b/pkg/deploy/registry/deployconfig/strategy_test.go @@ -19,10 +19,7 @@ func TestDeploymentConfigStrategy(t *testing.T) { } deploymentConfig := &deployapi.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "foo", Namespace: "default"}, - Template: deployapi.DeploymentTemplate{ - Strategy: deploytest.OkStrategy(), - ControllerTemplate: deploytest.OkControllerTemplate(), - }, + Spec: deploytest.OkDeploymentConfigSpec(), } Strategy.PrepareForCreate(deploymentConfig) errs := Strategy.Validate(ctx, deploymentConfig) @@ -31,10 +28,7 @@ func TestDeploymentConfigStrategy(t *testing.T) { } updatedDeploymentConfig := &deployapi.DeploymentConfig{ ObjectMeta: kapi.ObjectMeta{Name: "bar", Namespace: "default"}, - Template: deployapi.DeploymentTemplate{ - Strategy: deploytest.OkStrategy(), - ControllerTemplate: deploytest.OkControllerTemplate(), - }, + Spec: deploytest.OkDeploymentConfigSpec(), } errs = Strategy.ValidateUpdate(ctx, updatedDeploymentConfig, deploymentConfig) if len(errs) == 0 { diff --git a/pkg/deploy/registry/deploylog/rest.go b/pkg/deploy/registry/deploylog/rest.go index 79e68f43351c..8030cc82cefa 100644 --- a/pkg/deploy/registry/deploylog/rest.go +++ b/pkg/deploy/registry/deploylog/rest.go @@ -82,7 +82,7 @@ func (r *REST) Get(ctx kapi.Context, name string, opts runtime.Object) (runtime. if err != nil { return nil, errors.NewNotFound("deploymentConfig", name) } - desiredVersion := config.LatestVersion + desiredVersion := config.Status.LatestVersion if desiredVersion == 0 { return nil, errors.NewBadRequest(fmt.Sprintf("no deployment exists for deploymentConfig %q", config.Name)) } @@ -91,7 +91,7 @@ func (r *REST) Get(ctx kapi.Context, name string, opts runtime.Object) (runtime. switch { case deployLogOpts.Version == nil: // Latest - case *deployLogOpts.Version <= 0 || int(*deployLogOpts.Version) > config.LatestVersion: + case *deployLogOpts.Version <= 0 || int(*deployLogOpts.Version) > config.Status.LatestVersion: // Invalid version return nil, errors.NewBadRequest(fmt.Sprintf("invalid version for deploymentConfig %q: %d", config.Name, *deployLogOpts.Version)) default: diff --git a/pkg/deploy/registry/rollback/rollback_generator.go b/pkg/deploy/registry/rollback/rollback_generator.go index a73857fdae59..38dceca80374 100644 --- a/pkg/deploy/registry/rollback/rollback_generator.go +++ b/pkg/deploy/registry/rollback/rollback_generator.go @@ -29,40 +29,40 @@ func (g *RollbackGenerator) GenerateRollback(from, to *deployapi.DeploymentConfi // construct the candidate deploymentConfig based on the rollback spec if spec.IncludeTemplate { - if err := kapi.Scheme.Convert(&to.Template.ControllerTemplate.Template, &rollback.Template.ControllerTemplate.Template); err != nil { + if err := kapi.Scheme.Convert(&to.Spec.Template, &rollback.Spec.Template); err != nil { return nil, fmt.Errorf("couldn't copy template to rollback:: %v", err) } } if spec.IncludeReplicationMeta { - rollback.Template.ControllerTemplate.Replicas = to.Template.ControllerTemplate.Replicas - rollback.Template.ControllerTemplate.Selector = map[string]string{} - for k, v := range to.Template.ControllerTemplate.Selector { - rollback.Template.ControllerTemplate.Selector[k] = v + rollback.Spec.Replicas = to.Spec.Replicas + rollback.Spec.Selector = map[string]string{} + for k, v := range to.Spec.Selector { + rollback.Spec.Selector[k] = v } } if spec.IncludeTriggers { - if err := kapi.Scheme.Convert(&to.Triggers, &rollback.Triggers); err != nil { + if err := kapi.Scheme.Convert(&to.Spec.Triggers, &rollback.Spec.Triggers); err != nil { return nil, fmt.Errorf("couldn't copy triggers to rollback:: %v", err) } } if spec.IncludeStrategy { - if err := kapi.Scheme.Convert(&to.Template.Strategy, &rollback.Template.Strategy); err != nil { + if err := kapi.Scheme.Convert(&to.Spec.Strategy, &rollback.Spec.Strategy); err != nil { return nil, fmt.Errorf("couldn't copy strategy to rollback:: %v", err) } } // Disable any image change triggers. - for _, trigger := range rollback.Triggers { + for _, trigger := range rollback.Spec.Triggers { if trigger.Type == deployapi.DeploymentTriggerOnImageChange { trigger.ImageChangeParams.Automatic = false } } // TODO: add a new cause? - rollback.LatestVersion++ + rollback.Status.LatestVersion++ return rollback, nil } diff --git a/pkg/deploy/registry/rollback/rollback_generator_test.go b/pkg/deploy/registry/rollback/rollback_generator_test.go index e92a1f34965c..4d0e23120d08 100644 --- a/pkg/deploy/registry/rollback/rollback_generator_test.go +++ b/pkg/deploy/registry/rollback/rollback_generator_test.go @@ -11,14 +11,14 @@ import ( func TestGeneration(t *testing.T) { from := deploytest.OkDeploymentConfig(2) - from.Template.Strategy = deployapi.DeploymentStrategy{ + from.Spec.Strategy = deployapi.DeploymentStrategy{ Type: deployapi.DeploymentStrategyTypeCustom, } - from.Triggers = append(from.Triggers, deployapi.DeploymentTriggerPolicy{Type: deployapi.DeploymentTriggerOnConfigChange}) - from.Triggers = append(from.Triggers, deploytest.OkImageChangeTrigger()) - from.Template.ControllerTemplate.Template.Spec.Containers[0].Name = "changed" - from.Template.ControllerTemplate.Replicas = 5 - from.Template.ControllerTemplate.Selector = map[string]string{ + from.Spec.Triggers = append(from.Spec.Triggers, deployapi.DeploymentTriggerPolicy{Type: deployapi.DeploymentTriggerOnConfigChange}) + from.Spec.Triggers = append(from.Spec.Triggers, deploytest.OkImageChangeTrigger()) + from.Spec.Template.Spec.Containers[0].Name = "changed" + from.Spec.Replicas = 5 + from.Spec.Selector = map[string]string{ "new1": "new2", "new2": "new2", } @@ -66,7 +66,7 @@ func TestGeneration(t *testing.T) { t.Fatalf("unexpected replication meta diff: from=%v, rollback=%v", from, rollback) } - for i, trigger := range rollback.Triggers { + for i, trigger := range rollback.Spec.Triggers { if trigger.Type == deployapi.DeploymentTriggerOnImageChange && trigger.ImageChangeParams.Automatic { t.Errorf("image change trigger %d should be disabled", i) } @@ -76,17 +76,17 @@ func TestGeneration(t *testing.T) { } func hasStrategyDiff(a, b *deployapi.DeploymentConfig) bool { - return a.Template.Strategy.Type != b.Template.Strategy.Type + return a.Spec.Strategy.Type != b.Spec.Strategy.Type } func hasTriggerDiff(a, b *deployapi.DeploymentConfig) bool { - if len(a.Triggers) != len(b.Triggers) { + if len(a.Spec.Triggers) != len(b.Spec.Triggers) { return true } - for _, triggerA := range a.Triggers { + for _, triggerA := range a.Spec.Triggers { bHasTrigger := false - for _, triggerB := range b.Triggers { + for _, triggerB := range b.Spec.Triggers { if triggerB.Type == triggerA.Type { bHasTrigger = true break @@ -102,12 +102,12 @@ func hasTriggerDiff(a, b *deployapi.DeploymentConfig) bool { } func hasReplicationMetaDiff(a, b *deployapi.DeploymentConfig) bool { - if a.Template.ControllerTemplate.Replicas != b.Template.ControllerTemplate.Replicas { + if a.Spec.Replicas != b.Spec.Replicas { return true } - for keyA, valueA := range a.Template.ControllerTemplate.Selector { - if valueB, exists := b.Template.ControllerTemplate.Selector[keyA]; !exists || valueA != valueB { + for keyA, valueA := range a.Spec.Selector { + if valueB, exists := b.Spec.Selector[keyA]; !exists || valueA != valueB { return true } } @@ -116,6 +116,6 @@ func hasReplicationMetaDiff(a, b *deployapi.DeploymentConfig) bool { } func hasPodTemplateDiff(a, b *deployapi.DeploymentConfig) bool { - specA, specB := a.Template.ControllerTemplate.Template.Spec, b.Template.ControllerTemplate.Template.Spec + specA, specB := a.Spec.Template.Spec, b.Spec.Template.Spec return !kapi.Semantic.DeepEqual(specA, specB) } diff --git a/pkg/deploy/scaler/scale.go b/pkg/deploy/scaler/scale.go index 4a87e622125c..03171bc1cc5c 100644 --- a/pkg/deploy/scaler/scale.go +++ b/pkg/deploy/scaler/scale.go @@ -51,7 +51,7 @@ func (scaler *DeploymentConfigScaler) Scale(namespace, name string, newSize uint if err != nil { return err } - return wait.Poll(waitForReplicas.Interval, waitForReplicas.Timeout, controllerHasSpecifiedReplicas(scaler.clientInterface, rc, dc.Template.ControllerTemplate.Replicas)) + return wait.Poll(waitForReplicas.Interval, waitForReplicas.Timeout, controllerHasSpecifiedReplicas(scaler.clientInterface, rc, dc.Spec.Replicas)) } return nil } diff --git a/pkg/deploy/scaler/scale_test.go b/pkg/deploy/scaler/scale_test.go index bf0e5d223aa1..536d45a2f392 100644 --- a/pkg/deploy/scaler/scale_test.go +++ b/pkg/deploy/scaler/scale_test.go @@ -43,7 +43,7 @@ func TestScale(t *testing.T) { scaler := NewDeploymentConfigScaler(oc, kc) config := deploytest.OkDeploymentConfig(1) - config.Template.ControllerTemplate.Replicas = 1 + config.Spec.Replicas = 1 deployment, _ := deployutil.MakeDeployment(config, kapi.Codec) var wait *kubectl.RetryParams @@ -59,7 +59,7 @@ func TestScale(t *testing.T) { // scale replica count. scale := action.(ktestclient.UpdateAction).GetObject().(*extensions.Scale) scale.Status.Replicas = scale.Spec.Replicas - config.Template.ControllerTemplate.Replicas = scale.Spec.Replicas + config.Spec.Replicas = scale.Spec.Replicas deployment.Spec.Replicas = scale.Spec.Replicas deployment.Status.Replicas = deployment.Spec.Replicas return true, scale, nil @@ -76,7 +76,7 @@ func TestScale(t *testing.T) { } } - if e, a := config.Template.ControllerTemplate.Replicas, deployment.Spec.Replicas; e != a { + if e, a := config.Spec.Replicas, deployment.Spec.Replicas; e != a { t.Errorf("expected rc/%s replicas %d, got %d", deployment.Name, e, a) } } diff --git a/pkg/deploy/strategy/recreate/recreate.go b/pkg/deploy/strategy/recreate/recreate.go index 18b0be832d2a..f70955c0084a 100644 --- a/pkg/deploy/strategy/recreate/recreate.go +++ b/pkg/deploy/strategy/recreate/recreate.go @@ -75,7 +75,7 @@ func (s *RecreateDeploymentStrategy) DeployWithAcceptor(from *kapi.ReplicationCo return fmt.Errorf("couldn't decode config from deployment %s: %v", to.Name, err) } - params := config.Template.Strategy.RecreateParams + params := config.Spec.Strategy.RecreateParams retryParams := kubectl.NewRetryParams(s.retryPeriod, s.retryTimeout) waitParams := kubectl.NewRetryParams(s.retryPeriod, s.retryTimeout) diff --git a/pkg/deploy/strategy/recreate/recreate_test.go b/pkg/deploy/strategy/recreate/recreate_test.go index 21b1b012d158..98ac3b928842 100644 --- a/pkg/deploy/strategy/recreate/recreate_test.go +++ b/pkg/deploy/strategy/recreate/recreate_test.go @@ -44,7 +44,7 @@ func TestRecreate_initialDeployment(t *testing.T) { func TestRecreate_deploymentPreHookSuccess(t *testing.T) { config := deploytest.OkDeploymentConfig(1) - config.Template.Strategy.RecreateParams = recreateParams(deployapi.LifecycleHookFailurePolicyAbort, "") + config.Spec.Strategy.RecreateParams = recreateParams(deployapi.LifecycleHookFailurePolicyAbort, "") deployment, _ := deployutil.MakeDeployment(config, kapi.Codec) scaler := &scalertest.FakeScaler{} @@ -76,7 +76,7 @@ func TestRecreate_deploymentPreHookSuccess(t *testing.T) { func TestRecreate_deploymentPreHookFail(t *testing.T) { config := deploytest.OkDeploymentConfig(1) - config.Template.Strategy.RecreateParams = recreateParams(deployapi.LifecycleHookFailurePolicyAbort, "") + config.Spec.Strategy.RecreateParams = recreateParams(deployapi.LifecycleHookFailurePolicyAbort, "") deployment, _ := deployutil.MakeDeployment(config, kapi.Codec) scaler := &scalertest.FakeScaler{} @@ -106,7 +106,7 @@ func TestRecreate_deploymentPreHookFail(t *testing.T) { func TestRecreate_deploymentPostHookSuccess(t *testing.T) { config := deploytest.OkDeploymentConfig(1) - config.Template.Strategy.RecreateParams = recreateParams("", deployapi.LifecycleHookFailurePolicyAbort) + config.Spec.Strategy.RecreateParams = recreateParams("", deployapi.LifecycleHookFailurePolicyAbort) deployment, _ := deployutil.MakeDeployment(config, kapi.Codec) scaler := &scalertest.FakeScaler{} @@ -138,7 +138,7 @@ func TestRecreate_deploymentPostHookSuccess(t *testing.T) { func TestRecreate_deploymentPostHookFail(t *testing.T) { config := deploytest.OkDeploymentConfig(1) - config.Template.Strategy.RecreateParams = recreateParams("", deployapi.LifecycleHookFailurePolicyAbort) + config.Spec.Strategy.RecreateParams = recreateParams("", deployapi.LifecycleHookFailurePolicyAbort) deployment, _ := deployutil.MakeDeployment(config, kapi.Codec) scaler := &scalertest.FakeScaler{} diff --git a/pkg/deploy/strategy/rolling/rolling.go b/pkg/deploy/strategy/rolling/rolling.go index 87ee9ae2b401..cc813943868d 100644 --- a/pkg/deploy/strategy/rolling/rolling.go +++ b/pkg/deploy/strategy/rolling/rolling.go @@ -100,7 +100,7 @@ func (s *RollingDeploymentStrategy) Deploy(from *kapi.ReplicationController, to return fmt.Errorf("couldn't decode DeploymentConfig from deployment %s: %v", deployutil.LabelForDeployment(to), err) } - params := config.Template.Strategy.RollingParams + params := config.Spec.Strategy.RollingParams updateAcceptor := s.getUpdateAcceptor(time.Duration(*params.TimeoutSeconds) * time.Second) // If there's no prior deployment, delegate to another strategy since the diff --git a/pkg/deploy/strategy/rolling/rolling_test.go b/pkg/deploy/strategy/rolling/rolling_test.go index 420a79e8ce8a..195a5b063180 100644 --- a/pkg/deploy/strategy/rolling/rolling_test.go +++ b/pkg/deploy/strategy/rolling/rolling_test.go @@ -39,7 +39,7 @@ func TestRolling_deployInitial(t *testing.T) { } config := deploytest.OkDeploymentConfig(1) - config.Template.Strategy = deploytest.OkRollingStrategy() + config.Spec.Strategy = deploytest.OkRollingStrategy() deployment, _ := deployutil.MakeDeployment(config, kapi.Codec) err := strategy.Deploy(nil, deployment, 2) if err != nil { @@ -52,10 +52,10 @@ func TestRolling_deployInitial(t *testing.T) { func TestRolling_deployRolling(t *testing.T) { latestConfig := deploytest.OkDeploymentConfig(1) - latestConfig.Template.Strategy = deploytest.OkRollingStrategy() + latestConfig.Spec.Strategy = deploytest.OkRollingStrategy() latest, _ := deployutil.MakeDeployment(latestConfig, kapi.Codec) config := deploytest.OkDeploymentConfig(2) - config.Template.Strategy = deploytest.OkRollingStrategy() + config.Spec.Strategy = deploytest.OkRollingStrategy() deployment, _ := deployutil.MakeDeployment(config, kapi.Codec) deployments := map[string]*kapi.ReplicationController{ @@ -139,7 +139,7 @@ func TestRolling_deployRolling(t *testing.T) { func TestRolling_deployRollingHooks(t *testing.T) { config := deploytest.OkDeploymentConfig(1) - config.Template.Strategy = deploytest.OkRollingStrategy() + config.Spec.Strategy = deploytest.OkRollingStrategy() latest, _ := deployutil.MakeDeployment(config, kapi.Codec) var hookError error @@ -191,7 +191,7 @@ func TestRolling_deployRollingHooks(t *testing.T) { for _, tc := range cases { config := deploytest.OkDeploymentConfig(2) - config.Template.Strategy.RollingParams = tc.params + config.Spec.Strategy.RollingParams = tc.params deployment, _ := deployutil.MakeDeployment(config, kapi.Codec) deployments[deployment.Name] = deployment hookError = nil @@ -250,7 +250,7 @@ func TestRolling_deployInitialHooks(t *testing.T) { for _, tc := range cases { config := deploytest.OkDeploymentConfig(2) - config.Template.Strategy.RollingParams = tc.params + config.Spec.Strategy.RollingParams = tc.params deployment, _ := deployutil.MakeDeployment(config, kapi.Codec) hookError = nil if tc.hookShouldFail { diff --git a/pkg/deploy/strategy/support/lifecycle.go b/pkg/deploy/strategy/support/lifecycle.go index 2110f4af1b1f..40d01b614dad 100644 --- a/pkg/deploy/strategy/support/lifecycle.go +++ b/pkg/deploy/strategy/support/lifecycle.go @@ -103,7 +103,7 @@ func (e *HookExecutor) executeExecNewPod(hook *deployapi.LifecycleHook, deployme } // Build a pod spec from the hook config and deployment - podSpec, err := makeHookPod(hook, deployment, &config.Template.Strategy, label) + podSpec, err := makeHookPod(hook, deployment, &config.Spec.Strategy, label) if err != nil { return err } diff --git a/pkg/deploy/strategy/support/lifecycle_test.go b/pkg/deploy/strategy/support/lifecycle_test.go index 0d0656b842cf..301a8bafeddb 100644 --- a/pkg/deploy/strategy/support/lifecycle_test.go +++ b/pkg/deploy/strategy/support/lifecycle_test.go @@ -156,7 +156,7 @@ func TestHookExecutor_makeHookPodInvalidContainerRef(t *testing.T) { config := deploytest.OkDeploymentConfig(1) deployment, _ := deployutil.MakeDeployment(config, kapi.Codec) - _, err := makeHookPod(hook, deployment, &config.Template.Strategy, "hook") + _, err := makeHookPod(hook, deployment, &config.Spec.Strategy, "hook") if err == nil { t.Fatalf("expected an error") @@ -382,7 +382,7 @@ func TestHookExecutor_makeHookPod(t *testing.T) { for _, test := range tests { t.Logf("evaluating test: %s", test.name) config, deployment := deployment("deployment", "test", test.strategyLabels, test.strategyAnnotations) - pod, err := makeHookPod(test.hook, deployment, &config.Template.Strategy, "hook") + pod, err := makeHookPod(test.hook, deployment, &config.Spec.Strategy, "hook") if err != nil { t.Fatalf("unexpected error: %s", err) } @@ -409,7 +409,7 @@ func TestHookExecutor_makeHookPodRestart(t *testing.T) { config := deploytest.OkDeploymentConfig(1) deployment, _ := deployutil.MakeDeployment(config, kapi.Codec) - pod, err := makeHookPod(hook, deployment, &config.Template.Strategy, "hook") + pod, err := makeHookPod(hook, deployment, &config.Spec.Strategy, "hook") if err != nil { t.Fatalf("unexpected error: %s", err) } @@ -532,8 +532,12 @@ func deployment(name, namespace string, strategyLabels, strategyAnnotations map[ Name: name, Namespace: namespace, }, - LatestVersion: 1, - Template: deployapi.DeploymentTemplate{ + Status: deployapi.DeploymentConfigStatus{ + LatestVersion: 1, + }, + Spec: deployapi.DeploymentConfigSpec{ + Replicas: 1, + Selector: map[string]string{"a": "b"}, Strategy: deployapi.DeploymentStrategy{ Type: deployapi.DeploymentStrategyTypeRecreate, Resources: kapi.ResourceRequirements{ @@ -545,62 +549,58 @@ func deployment(name, namespace string, strategyLabels, strategyAnnotations map[ Labels: strategyLabels, Annotations: strategyAnnotations, }, - ControllerTemplate: kapi.ReplicationControllerSpec{ - Replicas: 1, - Selector: map[string]string{"a": "b"}, - Template: &kapi.PodTemplateSpec{ - Spec: kapi.PodSpec{ - Containers: []kapi.Container{ - { - Name: "container1", - Image: "registry:8080/repo1:ref1", - Env: []kapi.EnvVar{ - { - Name: "ENV1", - Value: "VAL1", - }, - }, - ImagePullPolicy: kapi.PullIfNotPresent, - Resources: kapi.ResourceRequirements{ - Limits: kapi.ResourceList{ - kapi.ResourceCPU: resource.MustParse("10"), - kapi.ResourceMemory: resource.MustParse("10M"), - }, + Template: &kapi.PodTemplateSpec{ + Spec: kapi.PodSpec{ + Containers: []kapi.Container{ + { + Name: "container1", + Image: "registry:8080/repo1:ref1", + Env: []kapi.EnvVar{ + { + Name: "ENV1", + Value: "VAL1", }, - VolumeMounts: []kapi.VolumeMount{ - { - Name: "volume-2", - ReadOnly: true, - MountPath: "/mnt/volume-2", - }, + }, + ImagePullPolicy: kapi.PullIfNotPresent, + Resources: kapi.ResourceRequirements{ + Limits: kapi.ResourceList{ + kapi.ResourceCPU: resource.MustParse("10"), + kapi.ResourceMemory: resource.MustParse("10M"), }, }, - { - Name: "container2", - Image: "registry:8080/repo1:ref2", - ImagePullPolicy: kapi.PullIfNotPresent, + VolumeMounts: []kapi.VolumeMount{ + { + Name: "volume-2", + ReadOnly: true, + MountPath: "/mnt/volume-2", + }, }, }, - Volumes: []kapi.Volume{ - { - Name: "volume-1", - }, - { - Name: "volume-2", - }, + { + Name: "container2", + Image: "registry:8080/repo1:ref2", + ImagePullPolicy: kapi.PullIfNotPresent, }, - RestartPolicy: kapi.RestartPolicyAlways, - DNSPolicy: kapi.DNSClusterFirst, - ImagePullSecrets: []kapi.LocalObjectReference{ - { - Name: "secret-1", - }, + }, + Volumes: []kapi.Volume{ + { + Name: "volume-1", + }, + { + Name: "volume-2", }, }, - ObjectMeta: kapi.ObjectMeta{ - Labels: map[string]string{"a": "b"}, + RestartPolicy: kapi.RestartPolicyAlways, + DNSPolicy: kapi.DNSClusterFirst, + ImagePullSecrets: []kapi.LocalObjectReference{ + { + Name: "secret-1", + }, }, }, + ObjectMeta: kapi.ObjectMeta{ + Labels: map[string]string{"a": "b"}, + }, }, }, } diff --git a/pkg/deploy/util/util.go b/pkg/deploy/util/util.go index dfd7254225bd..81e9ce465454 100644 --- a/pkg/deploy/util/util.go +++ b/pkg/deploy/util/util.go @@ -17,19 +17,19 @@ import ( // LatestDeploymentNameForConfig returns a stable identifier for config based on its version. func LatestDeploymentNameForConfig(config *deployapi.DeploymentConfig) string { - return fmt.Sprintf("%s-%d", config.Name, config.LatestVersion) + return fmt.Sprintf("%s-%d", config.Name, config.Status.LatestVersion) } // LatestDeploymentInfo returns info about the latest deployment for a config, // or nil if there is no latest deployment. The latest deployment is not // always the same as the active deployment. func LatestDeploymentInfo(config *deployapi.DeploymentConfig, deployments *api.ReplicationControllerList) (bool, *api.ReplicationController) { - if config.LatestVersion == 0 || len(deployments.Items) == 0 { + if config.Status.LatestVersion == 0 || len(deployments.Items) == 0 { return false, nil } sort.Sort(ByLatestVersionDesc(deployments.Items)) candidate := &deployments.Items[0] - return DeploymentVersionFor(candidate) == config.LatestVersion, candidate + return DeploymentVersionFor(candidate) == config.Status.LatestVersion, candidate } // ActiveDeployment returns the latest complete deployment, or nil if there is @@ -62,7 +62,7 @@ func LabelForDeployment(deployment *api.ReplicationController) string { // LabelForDeploymentConfig builds a string identifier for a DeploymentConfig. func LabelForDeploymentConfig(config *deployapi.DeploymentConfig) string { - return fmt.Sprintf("%s/%s:%d", config.Namespace, config.Name, config.LatestVersion) + return fmt.Sprintf("%s/%s:%d", config.Namespace, config.Name, config.Status.LatestVersion) } // DeploymentNameForConfigVersion returns the name of the version-th deployment @@ -97,7 +97,7 @@ func AnyDeployerPodSelector() labels.Selector { // HasChangeTrigger returns whether the provided deployment configuration has // a config change trigger or not func HasChangeTrigger(config *deployapi.DeploymentConfig) bool { - for _, trigger := range config.Triggers { + for _, trigger := range config.Spec.Triggers { if trigger.Type == deployapi.DeploymentTriggerOnConfigChange { return true } @@ -142,7 +142,7 @@ func MakeDeployment(config *deployapi.DeploymentConfig, codec runtime.Codec) (*a deploymentName := LatestDeploymentNameForConfig(config) podSpec := api.PodSpec{} - if err := api.Scheme.Convert(&config.Template.ControllerTemplate.Template.Spec, &podSpec); err != nil { + if err := api.Scheme.Convert(&config.Spec.Template.Spec, &podSpec); err != nil { return nil, fmt.Errorf("couldn't clone podSpec: %v", err) } @@ -159,26 +159,26 @@ func MakeDeployment(config *deployapi.DeploymentConfig, codec runtime.Codec) (*a // to the controller, and that multiple deployment controllers for the same config don't // manipulate each others' pods. selector := map[string]string{} - for k, v := range config.Template.ControllerTemplate.Selector { + for k, v := range config.Spec.Selector { selector[k] = v } selector[deployapi.DeploymentConfigLabel] = config.Name selector[deployapi.DeploymentLabel] = deploymentName podLabels := make(labels.Set) - for k, v := range config.Template.ControllerTemplate.Template.Labels { + for k, v := range config.Spec.Template.Labels { podLabels[k] = v } podLabels[deployapi.DeploymentConfigLabel] = config.Name podLabels[deployapi.DeploymentLabel] = deploymentName podAnnotations := make(labels.Set) - for k, v := range config.Template.ControllerTemplate.Template.Annotations { + for k, v := range config.Spec.Template.Annotations { podAnnotations[k] = v } podAnnotations[deployapi.DeploymentAnnotation] = deploymentName podAnnotations[deployapi.DeploymentConfigAnnotation] = config.Name - podAnnotations[deployapi.DeploymentVersionAnnotation] = strconv.Itoa(config.LatestVersion) + podAnnotations[deployapi.DeploymentVersionAnnotation] = strconv.Itoa(config.Status.LatestVersion) deployment := &api.ReplicationController{ ObjectMeta: api.ObjectMeta{ @@ -187,9 +187,9 @@ func MakeDeployment(config *deployapi.DeploymentConfig, codec runtime.Codec) (*a deployapi.DeploymentConfigAnnotation: config.Name, deployapi.DeploymentStatusAnnotation: string(deployapi.DeploymentStatusNew), deployapi.DeploymentEncodedConfigAnnotation: encodedConfig, - deployapi.DeploymentVersionAnnotation: strconv.Itoa(config.LatestVersion), + deployapi.DeploymentVersionAnnotation: strconv.Itoa(config.Status.LatestVersion), // This is the target replica count for the new deployment. - deployapi.DesiredReplicasAnnotation: strconv.Itoa(config.Template.ControllerTemplate.Replicas), + deployapi.DesiredReplicasAnnotation: strconv.Itoa(config.Spec.Replicas), deployapi.DeploymentReplicasAnnotation: strconv.Itoa(0), }, Labels: controllerLabels, diff --git a/pkg/deploy/util/util_test.go b/pkg/deploy/util/util_test.go index 6e5d1e1ef713..6c50cbca4c83 100644 --- a/pkg/deploy/util/util_test.go +++ b/pkg/deploy/util/util_test.go @@ -72,7 +72,7 @@ func TestMakeDeploymentOk(t *testing.T) { expectedAnnotations := map[string]string{ deployapi.DeploymentConfigAnnotation: config.Name, deployapi.DeploymentStatusAnnotation: string(deployapi.DeploymentStatusNew), - deployapi.DeploymentVersionAnnotation: strconv.Itoa(config.LatestVersion), + deployapi.DeploymentVersionAnnotation: strconv.Itoa(config.Status.LatestVersion), } for key, expected := range expectedAnnotations { @@ -84,7 +84,7 @@ func TestMakeDeploymentOk(t *testing.T) { expectedAnnotations = map[string]string{ deployapi.DeploymentAnnotation: deployment.Name, deployapi.DeploymentConfigAnnotation: config.Name, - deployapi.DeploymentVersionAnnotation: strconv.Itoa(config.LatestVersion), + deployapi.DeploymentVersionAnnotation: strconv.Itoa(config.Status.LatestVersion), } for key, expected := range expectedAnnotations { diff --git a/pkg/diagnostics/cluster/router.go b/pkg/diagnostics/cluster/router.go index 6895eba6592c..0a3b598adc48 100644 --- a/pkg/diagnostics/cluster/router.go +++ b/pkg/diagnostics/cluster/router.go @@ -137,7 +137,7 @@ func (d *ClusterRouter) getRouterDC(r types.DiagnosticResult) *osapi.DeploymentC } func (d *ClusterRouter) getRouterPods(dc *osapi.DeploymentConfig, r types.DiagnosticResult) *kapi.PodList { - pods, err := d.KubeClient.Pods(kapi.NamespaceDefault).List(labels.SelectorFromSet(dc.Template.ControllerTemplate.Selector), fields.Everything()) + pods, err := d.KubeClient.Pods(kapi.NamespaceDefault).List(labels.SelectorFromSet(dc.Spec.Selector), fields.Everything()) if err != nil { r.Error("DClu2004", err, fmt.Sprintf("Finding pods for '%s' DeploymentConfig failed. This should never happen. Error: (%[2]T) %[2]v", routerName, err)) return nil diff --git a/pkg/generate/app/app.go b/pkg/generate/app/app.go index fd13fb3749ad..a41dd7150bcf 100644 --- a/pkg/generate/app/app.go +++ b/pkg/generate/app/app.go @@ -311,19 +311,17 @@ func (r *DeploymentConfigRef) DeploymentConfig() (*deployapi.DeploymentConfig, e ObjectMeta: kapi.ObjectMeta{ Name: r.Name, }, - Template: deployapi.DeploymentTemplate{ - ControllerTemplate: kapi.ReplicationControllerSpec{ - Replicas: 1, - Selector: selector, - Template: &kapi.PodTemplateSpec{ - ObjectMeta: kapi.ObjectMeta{ - Labels: selector, - }, - Spec: template, + Spec: deployapi.DeploymentConfigSpec{ + Replicas: 1, + Selector: selector, + Template: &kapi.PodTemplateSpec{ + ObjectMeta: kapi.ObjectMeta{ + Labels: selector, }, + Spec: template, }, + Triggers: triggers, }, - Triggers: triggers, }, nil } diff --git a/pkg/generate/app/cmd/newapp_test.go b/pkg/generate/app/cmd/newapp_test.go index 2c9319635b3e..eaaa2e8d7121 100644 --- a/pkg/generate/app/cmd/newapp_test.go +++ b/pkg/generate/app/cmd/newapp_test.go @@ -908,7 +908,7 @@ func TestRunAll(t *testing.T) { imageStreams = append(imageStreams, tp) case *deployapi.DeploymentConfig: got["deploymentConfig"] = append(got["deploymentConfig"], tp.Name) - if podTemplate := tp.Template.ControllerTemplate.Template; podTemplate != nil { + if podTemplate := tp.Spec.Template; podTemplate != nil { for _, volume := range podTemplate.Spec.Volumes { if volume.VolumeSource.EmptyDir != nil { gotVolumes[volume.Name] = "EmptyDir" @@ -923,9 +923,9 @@ func TestRunAll(t *testing.T) { } } if test.config.Labels != nil { - if !mapContains(test.config.Labels, tp.Template.ControllerTemplate.Selector) { + if !mapContains(test.config.Labels, tp.Spec.Selector) { t.Errorf("%s: did not get expected deployment config rc selector. Expected: %v. Got: %v", - test.name, test.config.Labels, tp.Template.ControllerTemplate.Selector) + test.name, test.config.Labels, tp.Spec.Selector) } } } diff --git a/pkg/generate/app/imageref.go b/pkg/generate/app/imageref.go index 860ddc52eb21..bf8b77af46fc 100644 --- a/pkg/generate/app/imageref.go +++ b/pkg/generate/app/imageref.go @@ -288,18 +288,17 @@ func (r *ImageRef) DeployableContainer() (container *kapi.Container, triggers [] imageChangeParams := &deployapi.DeploymentTriggerImageChangeParams{ Automatic: true, ContainerNames: []string{name}, - Tag: tag, } if r.Stream != nil { imageChangeParams.From = kapi.ObjectReference{ - Kind: "ImageStream", - Name: r.Stream.Name, + Kind: "ImageStreamTag", + Name: imageapi.JoinImageStreamTag(r.Stream.Name, tag), Namespace: r.Stream.Namespace, } } else { imageChangeParams.From = kapi.ObjectReference{ - Kind: "ImageStream", - Name: name, + Kind: "ImageStreamTag", + Name: imageapi.JoinImageStreamTag(name, tag), } } triggers = []deployapi.DeploymentTriggerPolicy{ diff --git a/pkg/generate/app/imageref_test.go b/pkg/generate/app/imageref_test.go index ee1642886c38..7d5c3b0aad46 100644 --- a/pkg/generate/app/imageref_test.go +++ b/pkg/generate/app/imageref_test.go @@ -100,17 +100,17 @@ func TestSimpleDeploymentConfig(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - if config.Name != "origin" || len(config.Triggers) != 2 || config.Template.ControllerTemplate.Template.Spec.Containers[0].Image != image.Reference.String() { + if config.Name != "origin" || len(config.Spec.Triggers) != 2 || config.Spec.Template.Spec.Containers[0].Image != image.Reference.String() { t.Errorf("unexpected value: %#v", config) } - for _, trigger := range config.Triggers { + for _, trigger := range config.Spec.Triggers { if trigger.Type == deployapi.DeploymentTriggerOnImageChange { from := trigger.ImageChangeParams.From - if from.Kind != "ImageStream" { - t.Errorf("unexpected from kind in image change trigger") + if from.Kind != "ImageStreamTag" { + t.Errorf("unexpected from.kind in image change trigger: %s", from.Kind) } - if from.Name != "origin" && from.Namespace != "openshift" { - t.Errorf("unexpected from name and namespace in image change trigger: %s, %s", from.Name, from.Namespace) + if from.Name != "origin:latest" && from.Namespace != "openshift" { + t.Errorf("unexpected from.name %q and from.namespace %q in image change trigger", from.Name, from.Namespace) } } } diff --git a/pkg/generate/app/pipeline.go b/pkg/generate/app/pipeline.go index 319d1ab3e8e4..23916de0e0e0 100644 --- a/pkg/generate/app/pipeline.go +++ b/pkg/generate/app/pipeline.go @@ -330,12 +330,12 @@ func AddServices(objects Objects, firstPortOnly bool) Objects { Labels: t.Labels, }, Spec: kapi.ServiceSpec{ - Selector: t.Template.ControllerTemplate.Selector, + Selector: t.Spec.Selector, }, } svcPorts := map[string]struct{}{} - for _, container := range t.Template.ControllerTemplate.Template.Spec.Containers { + for _, container := range t.Spec.Template.Spec.Containers { ports := sortablePorts(container.Ports) sort.Sort(&ports) for _, p := range ports { diff --git a/pkg/generate/app/pipeline_test.go b/pkg/generate/app/pipeline_test.go index 6374fccc2c3a..cb45e40baa12 100644 --- a/pkg/generate/app/pipeline_test.go +++ b/pkg/generate/app/pipeline_test.go @@ -45,14 +45,12 @@ func fakeDeploymentConfig(name string, containers ...containerDesc) *deployapi.D ObjectMeta: kapi.ObjectMeta{ Name: name, }, - Template: deployapi.DeploymentTemplate{ - ControllerTemplate: kapi.ReplicationControllerSpec{ - Replicas: 1, - Selector: map[string]string{"name": "test"}, - Template: &kapi.PodTemplateSpec{ - Spec: kapi.PodSpec{ - Containers: specContainers, - }, + Spec: deployapi.DeploymentConfigSpec{ + Replicas: 1, + Selector: map[string]string{"name": "test"}, + Template: &kapi.PodTemplateSpec{ + Spec: kapi.PodSpec{ + Containers: specContainers, }, }, }, diff --git a/pkg/image/prune/imagepruner.go b/pkg/image/prune/imagepruner.go index 9c59d8e6386b..eced8bf482c4 100644 --- a/pkg/image/prune/imagepruner.go +++ b/pkg/image/prune/imagepruner.go @@ -459,7 +459,7 @@ func addDeploymentConfigsToGraph(g graph.Graph, dcs *deployapi.DeploymentConfigL dc := &dcs.Items[i] glog.V(4).Infof("Examining DeploymentConfig %s/%s", dc.Namespace, dc.Name) dcNode := deploygraph.EnsureDeploymentConfigNode(g, dc) - addPodSpecToGraph(g, &dc.Template.ControllerTemplate.Template.Spec, dcNode) + addPodSpecToGraph(g, &dc.Spec.Template.Spec, dcNode) } } diff --git a/pkg/image/prune/imagepruner_test.go b/pkg/image/prune/imagepruner_test.go index ebc05bc8bc08..14ed718ad256 100644 --- a/pkg/image/prune/imagepruner_test.go +++ b/pkg/image/prune/imagepruner_test.go @@ -241,11 +241,9 @@ func dc(namespace, name string, containerImages ...string) deployapi.DeploymentC Namespace: namespace, Name: name, }, - Template: deployapi.DeploymentTemplate{ - ControllerTemplate: kapi.ReplicationControllerSpec{ - Template: &kapi.PodTemplateSpec{ - Spec: podSpec(containerImages...), - }, + Spec: deployapi.DeploymentConfigSpec{ + Template: &kapi.PodTemplateSpec{ + Spec: podSpec(containerImages...), }, }, } diff --git a/pkg/ipfailover/keepalived/generator.go b/pkg/ipfailover/keepalived/generator.go index c7c8dd5c1399..44d68f4a5ed4 100644 --- a/pkg/ipfailover/keepalived/generator.go +++ b/pkg/ipfailover/keepalived/generator.go @@ -170,23 +170,20 @@ func GenerateDeploymentConfig(name string, options *ipfailover.IPFailoverConfigC Name: name, Labels: selector, }, - Triggers: []dapi.DeploymentTriggerPolicy{ - {Type: dapi.DeploymentTriggerOnConfigChange}, - }, - Template: dapi.DeploymentTemplate{ + Spec: dapi.DeploymentConfigSpec{ Strategy: dapi.DeploymentStrategy{ Type: dapi.DeploymentStrategyTypeRecreate, }, - // TODO: v0.1 requires a manual resize of the // replicas to match current cluster state. // In the future, the PerNodeController in // kubernetes would remove the need for this // manual intervention. - ControllerTemplate: kapi.ReplicationControllerSpec{ - Replicas: options.Replicas, - Selector: selector, - Template: podTemplate, + Replicas: options.Replicas, + Selector: selector, + Template: podTemplate, + Triggers: []dapi.DeploymentTriggerPolicy{ + {Type: dapi.DeploymentTriggerOnConfigChange}, }, }, }, nil diff --git a/pkg/ipfailover/keepalived/generator_test.go b/pkg/ipfailover/keepalived/generator_test.go index 3be9283f0ef9..aa0d689d6349 100644 --- a/pkg/ipfailover/keepalived/generator_test.go +++ b/pkg/ipfailover/keepalived/generator_test.go @@ -95,12 +95,11 @@ func TestGenerateDeploymentConfig(t *testing.T) { t.Errorf("Test case for %s got DeploymentConfig name %v where %v was expected", tc.Name, dc.Name, tc.Name) } - controller := dc.Template.ControllerTemplate - if controller.Replicas != tc.Replicas { - t.Errorf("Test case for %s got controller replicas %v where %v was expected", tc.Name, controller.Replicas, tc.Replicas) + if dc.Spec.Replicas != tc.Replicas { + t.Errorf("Test case for %s got controller replicas %v where %v was expected", tc.Name, dc.Spec.Replicas, tc.Replicas) } - podSpec := controller.Template.Spec + podSpec := dc.Spec.Template.Spec if !podSpec.SecurityContext.HostNetwork { t.Errorf("Test case for %s got HostNetwork disabled where HostNetwork was expected to be enabled", tc.Name) } diff --git a/pkg/util/labels.go b/pkg/util/labels.go index 98b49babdab1..9212fa08f63c 100644 --- a/pkg/util/labels.go +++ b/pkg/util/labels.go @@ -176,20 +176,20 @@ func AddObjectAnnotations(obj runtime.Object, annotations map[string]string) err // addDeploymentConfigNestedLabels adds new label(s) to a nested labels of a single DeploymentConfig object func addDeploymentConfigNestedLabels(obj *deployapi.DeploymentConfig, labels labels.Set) error { - if obj.Template.ControllerTemplate.Template.Labels == nil { - obj.Template.ControllerTemplate.Template.Labels = make(map[string]string) + if obj.Spec.Template.Labels == nil { + obj.Spec.Template.Labels = make(map[string]string) } - if err := MergeInto(obj.Template.ControllerTemplate.Template.Labels, labels, OverwriteExistingDstKey); err != nil { + if err := MergeInto(obj.Spec.Template.Labels, labels, OverwriteExistingDstKey); err != nil { return fmt.Errorf("unable to add labels to Template.DeploymentConfig.Template.ControllerTemplate.Template: %v", err) } return nil } func addDeploymentConfigNestedAnnotations(obj *deployapi.DeploymentConfig, annotations map[string]string) error { - if obj.Template.ControllerTemplate.Template.Annotations == nil { - obj.Template.ControllerTemplate.Template.Annotations = make(map[string]string) + if obj.Spec.Template.Annotations == nil { + obj.Spec.Template.Annotations = make(map[string]string) } - if err := MergeInto(obj.Template.ControllerTemplate.Template.Annotations, annotations, OverwriteExistingDstKey); err != nil { + if err := MergeInto(obj.Spec.Template.Annotations, annotations, OverwriteExistingDstKey); err != nil { return fmt.Errorf("unable to add annotations to Template.DeploymentConfig.Template.ControllerTemplate.Template: %v", err) } return nil diff --git a/pkg/util/labels_test.go b/pkg/util/labels_test.go index 07cd8e355116..a0b56bc89117 100644 --- a/pkg/util/labels_test.go +++ b/pkg/util/labels_test.go @@ -108,12 +108,10 @@ func TestAddConfigLabels(t *testing.T) { ObjectMeta: kapi.ObjectMeta{ Labels: map[string]string{"foo": "first value"}, }, - Template: deployapi.DeploymentTemplate{ - ControllerTemplate: kapi.ReplicationControllerSpec{ - Template: &kapi.PodTemplateSpec{ - ObjectMeta: kapi.ObjectMeta{ - Labels: map[string]string{"foo": "first value"}, - }, + Spec: deployapi.DeploymentConfigSpec{ + Template: &kapi.PodTemplateSpec{ + ObjectMeta: kapi.ObjectMeta{ + Labels: map[string]string{"foo": "first value"}, }, }, }, @@ -156,7 +154,7 @@ func TestAddConfigLabels(t *testing.T) { t.Errorf("Unexpected labels on testCase[%v]. Expected: %#v, got: %#v.", i, e, a) } case *deployapi.DeploymentConfig: - if e, a := test.expectedLabels, objType.Template.ControllerTemplate.Template.Labels; !reflect.DeepEqual(e, a) { + if e, a := test.expectedLabels, objType.Spec.Template.Labels; !reflect.DeepEqual(e, a) { t.Errorf("Unexpected labels on testCase[%v]. Expected: %#v, got: %#v.", i, e, a) } } diff --git a/test/fixtures/app-scenarios/new-project-deployed-app.yaml b/test/fixtures/app-scenarios/new-project-deployed-app.yaml index 909eae626e5a..293980f63ce0 100644 --- a/test/fixtures/app-scenarios/new-project-deployed-app.yaml +++ b/test/fixtures/app-scenarios/new-project-deployed-app.yaml @@ -8,7 +8,6 @@ items: name: ruby-sample-build template: application-template-stibuild name: ruby-sample-build - namespace: example spec: output: to: @@ -47,7 +46,6 @@ items: name: ruby-sample-build template: application-template-stibuild name: ruby-sample-build-1 - namespace: example spec: output: to: @@ -70,7 +68,7 @@ items: config: kind: BuildConfig name: ruby-sample-build - namespace: example + phase: Complete startTimestamp: 2015-04-07T04:12:21Z - apiVersion: v1beta3 @@ -86,7 +84,6 @@ items: labels: template: application-template-stibuild name: database-2 - namespace: example spec: replicas: 1 selector: @@ -143,7 +140,6 @@ items: labels: template: application-template-stibuild name: database-1 - namespace: example spec: replicas: 1 selector: @@ -194,7 +190,6 @@ items: labels: template: application-template-stibuild name: database - namespace: example spec: replicas: 1 selector: @@ -245,14 +240,13 @@ items: openshift.io/deployment-config.name: frontend openshift.io/deployment.phase: Failed openshift.io/deployment-config.latest-version: "2" - openshift.io/encoded-deployment-config: '{"kind":"DeploymentConfig","apiVersion":"v1beta1","metadata":{"name":"frontend","namespace":"test","selfLink":"/osapi/v1beta1/watch/deploymentConfigs/frontend","uid":"471f24e3-dcdc-11e4-968a-080027c5bfa9","resourceVersion":"346","creationTimestamp":"2015-04-07T04:12:17Z","labels":{"template":"application-template-stibuild"}},"triggers":[{"type":"ImageChange","imageChangeParams":{"automatic":true,"containerNames":["ruby-helloworld"],"from":{"kind":"ImageRepository","name":"origin-ruby-sample"},"tag":"latest","lastTriggeredImage":"172.30.17.139:5000/test/origin-ruby-sample:73214fafa244cb8abbe55273dac5d237a589a5fc7ac09926a1756a42c21e8a58"}}],"template":{"strategy":{"type":"Recreate"},"controllerTemplate":{"replicas":1,"replicaSelector":{"name":"frontend"},"podTemplate":{"desiredState":{"manifest":{"version":"v1beta2","id":"","volumes":null,"containers":[{"name":"ruby-helloworld","image":"172.30.17.139:5000/test/origin-ruby-sample:73214fafa244cb8abbe55273dac5d237a589a5fc7ac09926a1756a42c21e8a58","ports":[{"containerPort":8080,"protocol":"TCP"}],"env":[{"name":"ADMIN_USERNAME","key":"ADMIN_USERNAME","value":"adminNPX"},{"name":"ADMIN_PASSWORD","key":"ADMIN_PASSWORD","value":"7q1IdEao"},{"name":"MYSQL_USER","key":"MYSQL_USER","value":"user1CY"},{"name":"MYSQL_PASSWORD","key":"MYSQL_PASSWORD","value":"FfyXmsGG"},{"name":"MYSQL_DATABASE","key":"MYSQL_DATABASE","value":"root"}],"resources":{},"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"PullIfNotPresent","capabilities":{}}],"restartPolicy":{"always":{}},"dnsPolicy":"ClusterFirst"}},"labels":{"name":"frontend","template":"application-template-stibuild"}}}},"latestVersion":1,"details":{"causes":[{"type":"ImageChange","imageTrigger":{"repositoryName":"172.30.17.139:5000/test/origin-ruby-sample:73214fafa244cb8abbe55273dac5d237a589a5fc7ac09926a1756a42c21e8a58","tag":"latest"}}]}}' + openshift.io/encoded-deployment-config: '{"kind":"DeploymentConfig","apiVersion":"v1beta1","metadata":{"name":"frontend","namespace":"test","selfLink":"/osapi/v1beta1/watch/deploymentConfigs/frontend","uid":"471f24e3-dcdc-11e4-968a-080027c5bfa9","resourceVersion":"346","creationTimestamp":"2015-04-07T04:12:17Z","labels":{"template":"application-template-stibuild"}},"triggers":[{"type":"ImageChange","imageChangeParams":{"automatic":true,"containerNames":["ruby-helloworld"],"from":{"kind":"ImageStreamTag","name":"origin-ruby-sample:latest"},"tag":"latest","lastTriggeredImage":"172.30.17.139:5000/test/origin-ruby-sample:73214fafa244cb8abbe55273dac5d237a589a5fc7ac09926a1756a42c21e8a58"}}],"template":{"strategy":{"type":"Recreate"},"controllerTemplate":{"replicas":1,"replicaSelector":{"name":"frontend"},"podTemplate":{"desiredState":{"manifest":{"version":"v1beta2","id":"","volumes":null,"containers":[{"name":"ruby-helloworld","image":"172.30.17.139:5000/test/origin-ruby-sample:73214fafa244cb8abbe55273dac5d237a589a5fc7ac09926a1756a42c21e8a58","ports":[{"containerPort":8080,"protocol":"TCP"}],"env":[{"name":"ADMIN_USERNAME","key":"ADMIN_USERNAME","value":"adminNPX"},{"name":"ADMIN_PASSWORD","key":"ADMIN_PASSWORD","value":"7q1IdEao"},{"name":"MYSQL_USER","key":"MYSQL_USER","value":"user1CY"},{"name":"MYSQL_PASSWORD","key":"MYSQL_PASSWORD","value":"FfyXmsGG"},{"name":"MYSQL_DATABASE","key":"MYSQL_DATABASE","value":"root"}],"resources":{},"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"PullIfNotPresent","capabilities":{}}],"restartPolicy":{"always":{}},"dnsPolicy":"ClusterFirst"}},"labels":{"name":"frontend","template":"application-template-stibuild"}}}},"latestVersion":1,"details":{"causes":[{"type":"ImageChange","imageTrigger":{"repositoryName":"172.30.17.139:5000/test/origin-ruby-sample:73214fafa244cb8abbe55273dac5d237a589a5fc7ac09926a1756a42c21e8a58","tag":"latest"}}]}}' openshift.io/deployment.status-reason: unable to contact server pod: deploy-frontend-17mza9 creationTimestamp: 2015-04-07T04:12:53Z labels: template: application-template-stibuild name: frontend-2 - namespace: example spec: replicas: 1 selector: @@ -307,13 +301,12 @@ items: openshift.io/deployment-config.name: frontend openshift.io/deployment.phase: Complete openshift.io/deployment-config.latest-version: "1" - openshift.io/encoded-deployment-config: '{"kind":"DeploymentConfig","apiVersion":"v1beta1","metadata":{"name":"frontend","namespace":"test","selfLink":"/osapi/v1beta1/watch/deploymentConfigs/frontend","uid":"471f24e3-dcdc-11e4-968a-080027c5bfa9","resourceVersion":"346","creationTimestamp":"2015-04-07T04:12:17Z","labels":{"template":"application-template-stibuild"}},"triggers":[{"type":"ImageChange","imageChangeParams":{"automatic":true,"containerNames":["ruby-helloworld"],"from":{"kind":"ImageRepository","name":"origin-ruby-sample"},"tag":"latest","lastTriggeredImage":"172.30.17.139:5000/test/origin-ruby-sample:73214fafa244cb8abbe55273dac5d237a589a5fc7ac09926a1756a42c21e8a58"}}],"template":{"strategy":{"type":"Recreate"},"controllerTemplate":{"replicas":1,"replicaSelector":{"name":"frontend"},"podTemplate":{"desiredState":{"manifest":{"version":"v1beta2","id":"","volumes":null,"containers":[{"name":"ruby-helloworld","image":"172.30.17.139:5000/test/origin-ruby-sample:73214fafa244cb8abbe55273dac5d237a589a5fc7ac09926a1756a42c21e8a58","ports":[{"containerPort":8080,"protocol":"TCP"}],"env":[{"name":"ADMIN_USERNAME","key":"ADMIN_USERNAME","value":"adminNPX"},{"name":"ADMIN_PASSWORD","key":"ADMIN_PASSWORD","value":"7q1IdEao"},{"name":"MYSQL_USER","key":"MYSQL_USER","value":"user1CY"},{"name":"MYSQL_PASSWORD","key":"MYSQL_PASSWORD","value":"FfyXmsGG"},{"name":"MYSQL_DATABASE","key":"MYSQL_DATABASE","value":"root"}],"resources":{},"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"PullIfNotPresent","capabilities":{}}],"restartPolicy":{"always":{}},"dnsPolicy":"ClusterFirst"}},"labels":{"name":"frontend","template":"application-template-stibuild"}}}},"latestVersion":1,"details":{"causes":[{"type":"ImageChange","imageTrigger":{"repositoryName":"172.30.17.139:5000/test/origin-ruby-sample:73214fafa244cb8abbe55273dac5d237a589a5fc7ac09926a1756a42c21e8a58","tag":"latest"}}]}}' + openshift.io/encoded-deployment-config: '{"kind":"DeploymentConfig","apiVersion":"v1beta1","metadata":{"name":"frontend","namespace":"test","selfLink":"/osapi/v1beta1/watch/deploymentConfigs/frontend","uid":"471f24e3-dcdc-11e4-968a-080027c5bfa9","resourceVersion":"346","creationTimestamp":"2015-04-07T04:12:17Z","labels":{"template":"application-template-stibuild"}},"triggers":[{"type":"ImageChange","imageChangeParams":{"automatic":true,"containerNames":["ruby-helloworld"],"from":{"kind":"ImageStreamTag","name":"origin-ruby-sample:latest"},"tag":"latest","lastTriggeredImage":"172.30.17.139:5000/test/origin-ruby-sample:73214fafa244cb8abbe55273dac5d237a589a5fc7ac09926a1756a42c21e8a58"}}],"template":{"strategy":{"type":"Recreate"},"controllerTemplate":{"replicas":1,"replicaSelector":{"name":"frontend"},"podTemplate":{"desiredState":{"manifest":{"version":"v1beta2","id":"","volumes":null,"containers":[{"name":"ruby-helloworld","image":"172.30.17.139:5000/test/origin-ruby-sample:73214fafa244cb8abbe55273dac5d237a589a5fc7ac09926a1756a42c21e8a58","ports":[{"containerPort":8080,"protocol":"TCP"}],"env":[{"name":"ADMIN_USERNAME","key":"ADMIN_USERNAME","value":"adminNPX"},{"name":"ADMIN_PASSWORD","key":"ADMIN_PASSWORD","value":"7q1IdEao"},{"name":"MYSQL_USER","key":"MYSQL_USER","value":"user1CY"},{"name":"MYSQL_PASSWORD","key":"MYSQL_PASSWORD","value":"FfyXmsGG"},{"name":"MYSQL_DATABASE","key":"MYSQL_DATABASE","value":"root"}],"resources":{},"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"PullIfNotPresent","capabilities":{}}],"restartPolicy":{"always":{}},"dnsPolicy":"ClusterFirst"}},"labels":{"name":"frontend","template":"application-template-stibuild"}}}},"latestVersion":1,"details":{"causes":[{"type":"ImageChange","imageTrigger":{"repositoryName":"172.30.17.139:5000/test/origin-ruby-sample:73214fafa244cb8abbe55273dac5d237a589a5fc7ac09926a1756a42c21e8a58","tag":"latest"}}]}}' pod: deploy-frontend-17mza9 creationTimestamp: 2015-04-07T04:12:53Z labels: template: application-template-stibuild name: frontend-1 - namespace: example spec: replicas: 1 selector: @@ -368,7 +361,6 @@ items: labels: template: application-template-stibuild name: frontend - namespace: example spec: replicas: 1 selector: @@ -415,8 +407,8 @@ items: containerNames: - ruby-helloworld from: - kind: ImageRepository - name: origin-ruby-sample + kind: ImageStreamTag + name: origin-ruby-sample:latest lastTriggeredImage: 172.30.17.139:5000/test/origin-ruby-sample:73214fafa244cb8abbe55273dac5d237a589a5fc7ac09926a1756a42c21e8a58 type: ImageChange status: @@ -435,7 +427,6 @@ items: labels: template: application-template-stibuild name: database - namespace: example spec: portalIP: 172.30.17.240 ports: @@ -456,7 +447,6 @@ items: labels: template: application-template-stibuild name: frontend - namespace: example spec: portalIP: 172.30.17.154 ports: @@ -479,7 +469,6 @@ items: labels: template: application-template-stibuild name: frontend - namespace: example resourceVersion: "393" spec: host: frontend-example.router.default.svc.cluster.local diff --git a/test/fixtures/app-scenarios/new-project-no-build.yaml b/test/fixtures/app-scenarios/new-project-no-build.yaml index b675b9261618..24676cd25a4f 100644 --- a/test/fixtures/app-scenarios/new-project-no-build.yaml +++ b/test/fixtures/app-scenarios/new-project-no-build.yaml @@ -5,7 +5,6 @@ items: metadata: creationTimestamp: 2015-04-06T21:02:00Z name: sinatra-example-2 - namespace: example spec: output: to: @@ -36,7 +35,6 @@ items: metadata: creationTimestamp: 2015-04-06T21:02:00Z name: sinatra-example-2 - namespace: example spec: replicas: 1 selector: @@ -73,8 +71,8 @@ items: containerNames: - sinatra-example-2 from: - kind: ImageRepository - name: sinatra-example-2 + kind: ImageStreamTag + name: sinatra-example-2:latest lastTriggeredImage: "" type: ImageChange status: {} @@ -83,7 +81,6 @@ items: metadata: creationTimestamp: 2015-04-06T21:18:56Z name: sinatra-example-2 - namespace: example spec: {} status: dockerImageRepository: "" @@ -92,7 +89,6 @@ items: metadata: creationTimestamp: 2015-04-06T21:02:00Z name: sinatra-example-2 - namespace: example spec: portalIP: 172.30.17.48 ports: diff --git a/test/fixtures/app-scenarios/new-project-one-build.yaml b/test/fixtures/app-scenarios/new-project-one-build.yaml index 825a8372a057..e9b25d7b8b5a 100644 --- a/test/fixtures/app-scenarios/new-project-one-build.yaml +++ b/test/fixtures/app-scenarios/new-project-one-build.yaml @@ -109,8 +109,8 @@ items: containerNames: - sinatra-example-1 from: - kind: ImageRepository - name: sinatra-example-1 + kind: ImageStreamTag + name: sinatra-example-1:latest lastTriggeredImage: "" type: ImageChange status: {} diff --git a/test/fixtures/app-scenarios/new-project-two-deployment-configs.yaml b/test/fixtures/app-scenarios/new-project-two-deployment-configs.yaml index ef69519342fc..1f954e7611c4 100644 --- a/test/fixtures/app-scenarios/new-project-two-deployment-configs.yaml +++ b/test/fixtures/app-scenarios/new-project-two-deployment-configs.yaml @@ -5,7 +5,6 @@ items: metadata: creationTimestamp: 2015-04-06T21:02:00Z name: sinatra-app-example - namespace: example spec: output: to: @@ -36,7 +35,6 @@ items: metadata: creationTimestamp: 2015-04-06T21:18:56Z name: sinatra-app-example - namespace: example spec: {} status: dockerImageRepository: "" @@ -47,7 +45,6 @@ items: labels: buildconfig: sinatra-app-example name: sinatra-app-example-1 - namespace: example spec: output: to: @@ -81,7 +78,6 @@ items: metadata: creationTimestamp: 2015-04-06T21:02:00Z name: sinatra-app-example-a - namespace: example spec: replicas: 1 selector: @@ -118,8 +114,8 @@ items: containerNames: - sinatra-app-example from: - kind: ImageRepository - name: sinatra-app-example + kind: ImageStreamTag + name: sinatra-app-example:latest lastTriggeredImage: "" type: ImageChange status: {} @@ -128,7 +124,6 @@ items: metadata: creationTimestamp: 2015-04-06T21:02:00Z name: sinatra-app-example-b - namespace: example spec: replicas: 1 selector: @@ -165,8 +160,8 @@ items: containerNames: - sinatra-app-example from: - kind: ImageRepository - name: sinatra-app-example + kind: ImageStreamTag + name: sinatra-app-example:latest lastTriggeredImage: "" type: ImageChange status: {} @@ -175,7 +170,6 @@ items: metadata: creationTimestamp: 2015-04-06T21:02:00Z name: sinatra-app-example - namespace: example spec: portalIP: 172.30.17.49 ports: diff --git a/test/integration/deploy_trigger_test.go b/test/integration/deploy_trigger_test.go index 07c704ecef98..129e8a774e0b 100644 --- a/test/integration/deploy_trigger_test.go +++ b/test/integration/deploy_trigger_test.go @@ -59,7 +59,7 @@ func TestTriggers_manual(t *testing.T) { config := deploytest.OkDeploymentConfig(0) config.Namespace = testutil.Namespace() - config.Triggers = []deployapi.DeploymentTriggerPolicy{ + config.Spec.Triggers = []deployapi.DeploymentTriggerPolicy{ { Type: deployapi.DeploymentTriggerManual, }, @@ -81,7 +81,7 @@ func TestTriggers_manual(t *testing.T) { if err != nil { return err } - if config.LatestVersion != 1 { + if config.Status.LatestVersion != 1 { t.Fatalf("Generated deployment should have version 1: %#v", config) } t.Logf("config(1): %#v", config) @@ -199,8 +199,8 @@ waitForNewConfig: newConfig = event.Object.(*deployapi.DeploymentConfig) // Multiple updates to the config can be expected (e.g. status // updates), so wait for a significant update (e.g. version). - if newConfig.LatestVersion > 0 { - if e, a := updatedPullSpec, newConfig.Template.ControllerTemplate.Template.Spec.Containers[0].Image; e != a { + if newConfig.Status.LatestVersion > 0 { + if e, a := updatedPullSpec, newConfig.Spec.Template.Spec.Containers[0].Image; e != a { t.Fatalf("unexpected image for pod template container 0; expected %q, got %q", e, a) } break waitForNewConfig @@ -218,7 +218,7 @@ func TestTriggers_configChange(t *testing.T) { config := deploytest.OkDeploymentConfig(0) config.Namespace = testutil.Namespace() - config.Triggers[0] = deploytest.OkConfigChangeTrigger() + config.Spec.Triggers[0] = deploytest.OkConfigChangeTrigger() var err error watch, err := openshift.KubeClient.ReplicationControllers(testutil.Namespace()).Watch(labels.Everything(), fields.Everything(), "0") @@ -253,7 +253,7 @@ func TestTriggers_configChange(t *testing.T) { return err } - config.Template.ControllerTemplate.Template.Spec.Containers[0].Env[0].Value = "UPDATED" + config.Spec.Template.Spec.Containers[0].Env[0].Value = "UPDATED" // before we update the config, we need to update the state of the existing deployment // this is required to be done manually since the deployment and deployer pod controllers are not run in this test