Created
July 18, 2015 00:25
-
-
Save timstclair/519cfc2796176ef4ee99 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/pkg/api/v1/conversion_generated.go b/pkg/api/v1/conversion_generated.go | |
index d98300a..91b2b68 100644 | |
--- a/pkg/api/v1/conversion_generated.go | |
+++ b/pkg/api/v1/conversion_generated.go | |
@@ -1472,6 +1472,68 @@ func convert_api_PodProxyOptions_To_v1_PodProxyOptions(in *api.PodProxyOptions, | |
return nil | |
} | |
+func convert_api_PodSpec_To_v1_PodSpec(in *api.PodSpec, out *PodSpec, s conversion.Scope) error { | |
+ if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { | |
+ defaulting.(func(*api.PodSpec))(in) | |
+ } | |
+ if in.Volumes != nil { | |
+ out.Volumes = make([]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([]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 = 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 = 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 | |
+ out.HostNetwork = in.HostNetwork | |
+ if in.ImagePullSecrets != nil { | |
+ out.ImagePullSecrets = make([]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 convert_api_PodStatus_To_v1_PodStatus(in *api.PodStatus, out *PodStatus, s conversion.Scope) error { | |
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { | |
defaulting.(func(*api.PodStatus))(in) | |
@@ -3722,6 +3784,68 @@ func convert_v1_PodProxyOptions_To_api_PodProxyOptions(in *PodProxyOptions, out | |
return nil | |
} | |
+func convert_v1_PodSpec_To_api_PodSpec(in *PodSpec, out *api.PodSpec, s conversion.Scope) error { | |
+ if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { | |
+ defaulting.(func(*PodSpec))(in) | |
+ } | |
+ if in.Volumes != nil { | |
+ out.Volumes = make([]api.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([]api.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 = api.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 = api.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 | |
+ out.HostNetwork = in.HostNetwork | |
+ if in.ImagePullSecrets != nil { | |
+ out.ImagePullSecrets = make([]api.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 convert_v1_PodStatus_To_api_PodStatus(in *PodStatus, out *api.PodStatus, s conversion.Scope) error { | |
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { | |
defaulting.(func(*PodStatus))(in) | |
@@ -4601,6 +4725,7 @@ func init() { | |
convert_api_PodList_To_v1_PodList, | |
convert_api_PodLogOptions_To_v1_PodLogOptions, | |
convert_api_PodProxyOptions_To_v1_PodProxyOptions, | |
+ convert_api_PodSpec_To_v1_PodSpec, | |
convert_api_PodStatusResult_To_v1_PodStatusResult, | |
convert_api_PodStatus_To_v1_PodStatus, | |
convert_api_PodTemplateList_To_v1_PodTemplateList, | |
@@ -4713,6 +4838,7 @@ func init() { | |
convert_v1_PodList_To_api_PodList, | |
convert_v1_PodLogOptions_To_api_PodLogOptions, | |
convert_v1_PodProxyOptions_To_api_PodProxyOptions, | |
+ convert_v1_PodSpec_To_api_PodSpec, | |
convert_v1_PodStatusResult_To_api_PodStatusResult, | |
convert_v1_PodStatus_To_api_PodStatus, | |
convert_v1_PodTemplateList_To_api_PodTemplateList, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/pkg/api/v1/deep_copy_generated.go b/pkg/api/v1/deep_copy_generated.go | |
index b61b2cd..950bbb6 100644 | |
--- a/pkg/api/v1/deep_copy_generated.go | |
+++ b/pkg/api/v1/deep_copy_generated.go | |
@@ -1311,7 +1311,6 @@ func deepCopy_v1_PodSpec(in PodSpec, out *PodSpec, c *conversion.Cloner) error { | |
out.NodeSelector = nil | |
} | |
out.ServiceAccountName = in.ServiceAccountName | |
- out.DeprecatedServiceAccount = in.DeprecatedServiceAccount | |
out.NodeName = in.NodeName | |
out.HostNetwork = in.HostNetwork | |
if in.ImagePullSecrets != nil { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment