Skip to content

Commit c41b903

Browse files
committed
generated
1 parent a03cce3 commit c41b903

File tree

206 files changed

+1604
-3486
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+1604
-3486
lines changed

pkg/apps/apis/apps/v1/zz_generated.conversion.go

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ package v1
77
import (
88
v1 "github.com/openshift/api/apps/v1"
99
apps "github.com/openshift/origin/pkg/apps/apis/apps"
10-
core_v1 "k8s.io/api/core/v1"
10+
api_core_v1 "k8s.io/api/core/v1"
1111
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1212
conversion "k8s.io/apimachinery/pkg/conversion"
1313
runtime "k8s.io/apimachinery/pkg/runtime"
14-
api "k8s.io/kubernetes/pkg/api"
15-
api_v1 "k8s.io/kubernetes/pkg/api/v1"
14+
core "k8s.io/kubernetes/pkg/apis/core"
15+
core_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
1616
unsafe "unsafe"
1717
)
1818

@@ -75,9 +75,9 @@ func autoConvert_v1_CustomDeploymentStrategyParams_To_apps_CustomDeploymentStrat
7575
out.Image = in.Image
7676
if in.Environment != nil {
7777
in, out := &in.Environment, &out.Environment
78-
*out = make([]api.EnvVar, len(*in))
78+
*out = make([]core.EnvVar, len(*in))
7979
for i := range *in {
80-
if err := api_v1.Convert_v1_EnvVar_To_api_EnvVar(&(*in)[i], &(*out)[i], s); err != nil {
80+
if err := core_v1.Convert_v1_EnvVar_To_core_EnvVar(&(*in)[i], &(*out)[i], s); err != nil {
8181
return err
8282
}
8383
}
@@ -97,9 +97,9 @@ func autoConvert_apps_CustomDeploymentStrategyParams_To_v1_CustomDeploymentStrat
9797
out.Image = in.Image
9898
if in.Environment != nil {
9999
in, out := &in.Environment, &out.Environment
100-
*out = make([]core_v1.EnvVar, len(*in))
100+
*out = make([]api_core_v1.EnvVar, len(*in))
101101
for i := range *in {
102-
if err := api_v1.Convert_api_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil {
102+
if err := core_v1.Convert_core_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil {
103103
return err
104104
}
105105
}
@@ -154,7 +154,7 @@ func Convert_apps_DeploymentCause_To_v1_DeploymentCause(in *apps.DeploymentCause
154154
}
155155

156156
func autoConvert_v1_DeploymentCauseImageTrigger_To_apps_DeploymentCauseImageTrigger(in *v1.DeploymentCauseImageTrigger, out *apps.DeploymentCauseImageTrigger, s conversion.Scope) error {
157-
if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil {
157+
if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.From, &out.From, s); err != nil {
158158
return err
159159
}
160160
return nil
@@ -166,7 +166,7 @@ func Convert_v1_DeploymentCauseImageTrigger_To_apps_DeploymentCauseImageTrigger(
166166
}
167167

168168
func autoConvert_apps_DeploymentCauseImageTrigger_To_v1_DeploymentCauseImageTrigger(in *apps.DeploymentCauseImageTrigger, out *v1.DeploymentCauseImageTrigger, s conversion.Scope) error {
169-
if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil {
169+
if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil {
170170
return err
171171
}
172172
return nil
@@ -179,7 +179,7 @@ func Convert_apps_DeploymentCauseImageTrigger_To_v1_DeploymentCauseImageTrigger(
179179

180180
func autoConvert_v1_DeploymentCondition_To_apps_DeploymentCondition(in *v1.DeploymentCondition, out *apps.DeploymentCondition, s conversion.Scope) error {
181181
out.Type = apps.DeploymentConditionType(in.Type)
182-
out.Status = api.ConditionStatus(in.Status)
182+
out.Status = core.ConditionStatus(in.Status)
183183
out.LastUpdateTime = in.LastUpdateTime
184184
out.LastTransitionTime = in.LastTransitionTime
185185
out.Reason = apps.DeploymentConditionReason(in.Reason)
@@ -194,7 +194,7 @@ func Convert_v1_DeploymentCondition_To_apps_DeploymentCondition(in *v1.Deploymen
194194

195195
func autoConvert_apps_DeploymentCondition_To_v1_DeploymentCondition(in *apps.DeploymentCondition, out *v1.DeploymentCondition, s conversion.Scope) error {
196196
out.Type = v1.DeploymentConditionType(in.Type)
197-
out.Status = core_v1.ConditionStatus(in.Status)
197+
out.Status = api_core_v1.ConditionStatus(in.Status)
198198
out.LastUpdateTime = in.LastUpdateTime
199199
out.LastTransitionTime = in.LastTransitionTime
200200
out.Reason = string(in.Reason)
@@ -310,7 +310,7 @@ func Convert_apps_DeploymentConfigRollback_To_v1_DeploymentConfigRollback(in *ap
310310
}
311311

312312
func autoConvert_v1_DeploymentConfigRollbackSpec_To_apps_DeploymentConfigRollbackSpec(in *v1.DeploymentConfigRollbackSpec, out *apps.DeploymentConfigRollbackSpec, s conversion.Scope) error {
313-
if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil {
313+
if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.From, &out.From, s); err != nil {
314314
return err
315315
}
316316
out.Revision = in.Revision
@@ -327,7 +327,7 @@ func Convert_v1_DeploymentConfigRollbackSpec_To_apps_DeploymentConfigRollbackSpe
327327
}
328328

329329
func autoConvert_apps_DeploymentConfigRollbackSpec_To_v1_DeploymentConfigRollbackSpec(in *apps.DeploymentConfigRollbackSpec, out *v1.DeploymentConfigRollbackSpec, s conversion.Scope) error {
330-
if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil {
330+
if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil {
331331
return err
332332
}
333333
out.Revision = in.Revision
@@ -366,8 +366,8 @@ func autoConvert_v1_DeploymentConfigSpec_To_apps_DeploymentConfigSpec(in *v1.Dep
366366
out.Selector = *(*map[string]string)(unsafe.Pointer(&in.Selector))
367367
if in.Template != nil {
368368
in, out := &in.Template, &out.Template
369-
*out = new(api.PodTemplateSpec)
370-
if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(*in, *out, s); err != nil {
369+
*out = new(core.PodTemplateSpec)
370+
if err := core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(*in, *out, s); err != nil {
371371
return err
372372
}
373373
} else {
@@ -404,8 +404,8 @@ func autoConvert_apps_DeploymentConfigSpec_To_v1_DeploymentConfigSpec(in *apps.D
404404
out.Selector = *(*map[string]string)(unsafe.Pointer(&in.Selector))
405405
if in.Template != nil {
406406
in, out := &in.Template, &out.Template
407-
*out = new(core_v1.PodTemplateSpec)
408-
if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(*in, *out, s); err != nil {
407+
*out = new(api_core_v1.PodTemplateSpec)
408+
if err := core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(*in, *out, s); err != nil {
409409
return err
410410
}
411411
} else {
@@ -624,7 +624,7 @@ func autoConvert_v1_DeploymentStrategy_To_apps_DeploymentStrategy(in *v1.Deploym
624624
} else {
625625
out.RollingParams = nil
626626
}
627-
if err := api_v1.Convert_v1_ResourceRequirements_To_api_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil {
627+
if err := core_v1.Convert_v1_ResourceRequirements_To_core_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil {
628628
return err
629629
}
630630
out.Labels = *(*map[string]string)(unsafe.Pointer(&in.Labels))
@@ -667,7 +667,7 @@ func autoConvert_apps_DeploymentStrategy_To_v1_DeploymentStrategy(in *apps.Deplo
667667
} else {
668668
out.RollingParams = nil
669669
}
670-
if err := api_v1.Convert_api_ResourceRequirements_To_v1_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil {
670+
if err := core_v1.Convert_core_ResourceRequirements_To_v1_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil {
671671
return err
672672
}
673673
out.Labels = *(*map[string]string)(unsafe.Pointer(&in.Labels))
@@ -684,7 +684,7 @@ func Convert_apps_DeploymentStrategy_To_v1_DeploymentStrategy(in *apps.Deploymen
684684
func autoConvert_v1_DeploymentTriggerImageChangeParams_To_apps_DeploymentTriggerImageChangeParams(in *v1.DeploymentTriggerImageChangeParams, out *apps.DeploymentTriggerImageChangeParams, s conversion.Scope) error {
685685
out.Automatic = in.Automatic
686686
out.ContainerNames = *(*[]string)(unsafe.Pointer(&in.ContainerNames))
687-
if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil {
687+
if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.From, &out.From, s); err != nil {
688688
return err
689689
}
690690
out.LastTriggeredImage = in.LastTriggeredImage
@@ -694,7 +694,7 @@ func autoConvert_v1_DeploymentTriggerImageChangeParams_To_apps_DeploymentTrigger
694694
func autoConvert_apps_DeploymentTriggerImageChangeParams_To_v1_DeploymentTriggerImageChangeParams(in *apps.DeploymentTriggerImageChangeParams, out *v1.DeploymentTriggerImageChangeParams, s conversion.Scope) error {
695695
out.Automatic = in.Automatic
696696
out.ContainerNames = *(*[]string)(unsafe.Pointer(&in.ContainerNames))
697-
if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil {
697+
if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil {
698698
return err
699699
}
700700
out.LastTriggeredImage = in.LastTriggeredImage
@@ -743,9 +743,9 @@ func autoConvert_v1_ExecNewPodHook_To_apps_ExecNewPodHook(in *v1.ExecNewPodHook,
743743
out.Command = *(*[]string)(unsafe.Pointer(&in.Command))
744744
if in.Env != nil {
745745
in, out := &in.Env, &out.Env
746-
*out = make([]api.EnvVar, len(*in))
746+
*out = make([]core.EnvVar, len(*in))
747747
for i := range *in {
748-
if err := api_v1.Convert_v1_EnvVar_To_api_EnvVar(&(*in)[i], &(*out)[i], s); err != nil {
748+
if err := core_v1.Convert_v1_EnvVar_To_core_EnvVar(&(*in)[i], &(*out)[i], s); err != nil {
749749
return err
750750
}
751751
}
@@ -766,9 +766,9 @@ func autoConvert_apps_ExecNewPodHook_To_v1_ExecNewPodHook(in *apps.ExecNewPodHoo
766766
out.Command = *(*[]string)(unsafe.Pointer(&in.Command))
767767
if in.Env != nil {
768768
in, out := &in.Env, &out.Env
769-
*out = make([]core_v1.EnvVar, len(*in))
769+
*out = make([]api_core_v1.EnvVar, len(*in))
770770
for i := range *in {
771-
if err := api_v1.Convert_api_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil {
771+
if err := core_v1.Convert_core_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil {
772772
return err
773773
}
774774
}
@@ -975,7 +975,7 @@ func autoConvert_apps_RollingDeploymentStrategyParams_To_v1_RollingDeploymentStr
975975

976976
func autoConvert_v1_TagImageHook_To_apps_TagImageHook(in *v1.TagImageHook, out *apps.TagImageHook, s conversion.Scope) error {
977977
out.ContainerName = in.ContainerName
978-
if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.To, &out.To, s); err != nil {
978+
if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.To, &out.To, s); err != nil {
979979
return err
980980
}
981981
return nil
@@ -988,7 +988,7 @@ func Convert_v1_TagImageHook_To_apps_TagImageHook(in *v1.TagImageHook, out *apps
988988

989989
func autoConvert_apps_TagImageHook_To_v1_TagImageHook(in *apps.TagImageHook, out *v1.TagImageHook, s conversion.Scope) error {
990990
out.ContainerName = in.ContainerName
991-
if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.To, &out.To, s); err != nil {
991+
if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.To, &out.To, s); err != nil {
992992
return err
993993
}
994994
return nil

0 commit comments

Comments
 (0)