@@ -7,12 +7,12 @@ package v1
7
7
import (
8
8
v1 "github.com/openshift/api/apps/v1"
9
9
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"
11
11
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
12
12
conversion "k8s.io/apimachinery/pkg/conversion"
13
13
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"
16
16
unsafe "unsafe"
17
17
)
18
18
@@ -75,9 +75,9 @@ func autoConvert_v1_CustomDeploymentStrategyParams_To_apps_CustomDeploymentStrat
75
75
out .Image = in .Image
76
76
if in .Environment != nil {
77
77
in , out := & in .Environment , & out .Environment
78
- * out = make ([]api .EnvVar , len (* in ))
78
+ * out = make ([]core .EnvVar , len (* in ))
79
79
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 {
81
81
return err
82
82
}
83
83
}
@@ -97,9 +97,9 @@ func autoConvert_apps_CustomDeploymentStrategyParams_To_v1_CustomDeploymentStrat
97
97
out .Image = in .Image
98
98
if in .Environment != nil {
99
99
in , out := & in .Environment , & out .Environment
100
- * out = make ([]core_v1 .EnvVar , len (* in ))
100
+ * out = make ([]api_core_v1 .EnvVar , len (* in ))
101
101
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 {
103
103
return err
104
104
}
105
105
}
@@ -154,7 +154,7 @@ func Convert_apps_DeploymentCause_To_v1_DeploymentCause(in *apps.DeploymentCause
154
154
}
155
155
156
156
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 {
158
158
return err
159
159
}
160
160
return nil
@@ -166,7 +166,7 @@ func Convert_v1_DeploymentCauseImageTrigger_To_apps_DeploymentCauseImageTrigger(
166
166
}
167
167
168
168
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 {
170
170
return err
171
171
}
172
172
return nil
@@ -179,7 +179,7 @@ func Convert_apps_DeploymentCauseImageTrigger_To_v1_DeploymentCauseImageTrigger(
179
179
180
180
func autoConvert_v1_DeploymentCondition_To_apps_DeploymentCondition (in * v1.DeploymentCondition , out * apps.DeploymentCondition , s conversion.Scope ) error {
181
181
out .Type = apps .DeploymentConditionType (in .Type )
182
- out .Status = api .ConditionStatus (in .Status )
182
+ out .Status = core .ConditionStatus (in .Status )
183
183
out .LastUpdateTime = in .LastUpdateTime
184
184
out .LastTransitionTime = in .LastTransitionTime
185
185
out .Reason = apps .DeploymentConditionReason (in .Reason )
@@ -194,7 +194,7 @@ func Convert_v1_DeploymentCondition_To_apps_DeploymentCondition(in *v1.Deploymen
194
194
195
195
func autoConvert_apps_DeploymentCondition_To_v1_DeploymentCondition (in * apps.DeploymentCondition , out * v1.DeploymentCondition , s conversion.Scope ) error {
196
196
out .Type = v1 .DeploymentConditionType (in .Type )
197
- out .Status = core_v1 .ConditionStatus (in .Status )
197
+ out .Status = api_core_v1 .ConditionStatus (in .Status )
198
198
out .LastUpdateTime = in .LastUpdateTime
199
199
out .LastTransitionTime = in .LastTransitionTime
200
200
out .Reason = string (in .Reason )
@@ -310,7 +310,7 @@ func Convert_apps_DeploymentConfigRollback_To_v1_DeploymentConfigRollback(in *ap
310
310
}
311
311
312
312
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 {
314
314
return err
315
315
}
316
316
out .Revision = in .Revision
@@ -327,7 +327,7 @@ func Convert_v1_DeploymentConfigRollbackSpec_To_apps_DeploymentConfigRollbackSpe
327
327
}
328
328
329
329
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 {
331
331
return err
332
332
}
333
333
out .Revision = in .Revision
@@ -366,8 +366,8 @@ func autoConvert_v1_DeploymentConfigSpec_To_apps_DeploymentConfigSpec(in *v1.Dep
366
366
out .Selector = * (* map [string ]string )(unsafe .Pointer (& in .Selector ))
367
367
if in .Template != nil {
368
368
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 {
371
371
return err
372
372
}
373
373
} else {
@@ -404,8 +404,8 @@ func autoConvert_apps_DeploymentConfigSpec_To_v1_DeploymentConfigSpec(in *apps.D
404
404
out .Selector = * (* map [string ]string )(unsafe .Pointer (& in .Selector ))
405
405
if in .Template != nil {
406
406
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 {
409
409
return err
410
410
}
411
411
} else {
@@ -624,7 +624,7 @@ func autoConvert_v1_DeploymentStrategy_To_apps_DeploymentStrategy(in *v1.Deploym
624
624
} else {
625
625
out .RollingParams = nil
626
626
}
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 {
628
628
return err
629
629
}
630
630
out .Labels = * (* map [string ]string )(unsafe .Pointer (& in .Labels ))
@@ -667,7 +667,7 @@ func autoConvert_apps_DeploymentStrategy_To_v1_DeploymentStrategy(in *apps.Deplo
667
667
} else {
668
668
out .RollingParams = nil
669
669
}
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 {
671
671
return err
672
672
}
673
673
out .Labels = * (* map [string ]string )(unsafe .Pointer (& in .Labels ))
@@ -684,7 +684,7 @@ func Convert_apps_DeploymentStrategy_To_v1_DeploymentStrategy(in *apps.Deploymen
684
684
func autoConvert_v1_DeploymentTriggerImageChangeParams_To_apps_DeploymentTriggerImageChangeParams (in * v1.DeploymentTriggerImageChangeParams , out * apps.DeploymentTriggerImageChangeParams , s conversion.Scope ) error {
685
685
out .Automatic = in .Automatic
686
686
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 {
688
688
return err
689
689
}
690
690
out .LastTriggeredImage = in .LastTriggeredImage
@@ -694,7 +694,7 @@ func autoConvert_v1_DeploymentTriggerImageChangeParams_To_apps_DeploymentTrigger
694
694
func autoConvert_apps_DeploymentTriggerImageChangeParams_To_v1_DeploymentTriggerImageChangeParams (in * apps.DeploymentTriggerImageChangeParams , out * v1.DeploymentTriggerImageChangeParams , s conversion.Scope ) error {
695
695
out .Automatic = in .Automatic
696
696
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 {
698
698
return err
699
699
}
700
700
out .LastTriggeredImage = in .LastTriggeredImage
@@ -743,9 +743,9 @@ func autoConvert_v1_ExecNewPodHook_To_apps_ExecNewPodHook(in *v1.ExecNewPodHook,
743
743
out .Command = * (* []string )(unsafe .Pointer (& in .Command ))
744
744
if in .Env != nil {
745
745
in , out := & in .Env , & out .Env
746
- * out = make ([]api .EnvVar , len (* in ))
746
+ * out = make ([]core .EnvVar , len (* in ))
747
747
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 {
749
749
return err
750
750
}
751
751
}
@@ -766,9 +766,9 @@ func autoConvert_apps_ExecNewPodHook_To_v1_ExecNewPodHook(in *apps.ExecNewPodHoo
766
766
out .Command = * (* []string )(unsafe .Pointer (& in .Command ))
767
767
if in .Env != nil {
768
768
in , out := & in .Env , & out .Env
769
- * out = make ([]core_v1 .EnvVar , len (* in ))
769
+ * out = make ([]api_core_v1 .EnvVar , len (* in ))
770
770
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 {
772
772
return err
773
773
}
774
774
}
@@ -975,7 +975,7 @@ func autoConvert_apps_RollingDeploymentStrategyParams_To_v1_RollingDeploymentStr
975
975
976
976
func autoConvert_v1_TagImageHook_To_apps_TagImageHook (in * v1.TagImageHook , out * apps.TagImageHook , s conversion.Scope ) error {
977
977
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 {
979
979
return err
980
980
}
981
981
return nil
@@ -988,7 +988,7 @@ func Convert_v1_TagImageHook_To_apps_TagImageHook(in *v1.TagImageHook, out *apps
988
988
989
989
func autoConvert_apps_TagImageHook_To_v1_TagImageHook (in * apps.TagImageHook , out * v1.TagImageHook , s conversion.Scope ) error {
990
990
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 {
992
992
return err
993
993
}
994
994
return nil
0 commit comments