github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Conversions were mutating the internal object

Browse Source 
Internal objects can be shared, it is not allowed to mutate an internal
object in conversion.
This commit is contained in:
Clayton Coleman
2016-05-19 17:53:59 -04:00
parent ef952efb82
commit 997d55d796
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
pkg/api/v1/conversion.go
View File

@@ -274,15 +274,14 @@ func Convert_api_PodStatusResult_To_v1_PodStatusResult(in *api.PodStatusResult,
} }
out.Annotations[PodInitContainerStatusesAnnotationKey] = string(value) out.Annotations[PodInitContainerStatusesAnnotationKey] = string(value)
} else { } else {
delete(in.Annotations, PodInitContainerStatusesAnnotationKey) delete(out.Annotations, PodInitContainerStatusesAnnotationKey)
} }
return nil return nil
} }
func Convert_v1_PodStatusResult_To_api_PodStatusResult(in *PodStatusResult, out *api.PodStatusResult, s conversion.Scope) error { func Convert_v1_PodStatusResult_To_api_PodStatusResult(in *PodStatusResult, out *api.PodStatusResult, s conversion.Scope) error {
// TODO: when we move init container to beta, remove these conversions // TODO: when we move init container to beta, remove these conversions
if value := in.Annotations[PodInitContainerStatusesAnnotationKey]; len(value) > 0 { if value, ok := in.Annotations[PodInitContainerStatusesAnnotationKey]; ok {
delete(in.Annotations, PodInitContainerStatusesAnnotationKey)
var values []ContainerStatus var values []ContainerStatus
if err := json.Unmarshal([]byte(value), &values); err != nil { if err := json.Unmarshal([]byte(value), &values); err != nil {
return err return err
@@ -290,7 +289,11 @@ func Convert_v1_PodStatusResult_To_api_PodStatusResult(in *PodStatusResult, out
in.Status.InitContainerStatuses = values in.Status.InitContainerStatuses = values
} }
return autoConvert_v1_PodStatusResult_To_api_PodStatusResult(in, out, s) if err := autoConvert_v1_PodStatusResult_To_api_PodStatusResult(in, out, s); err != nil {
return err
}
delete(out.Annotations, PodInitContainerStatusesAnnotationKey)
return nil
} }
func Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(in *api.PodTemplateSpec, out *PodTemplateSpec, s conversion.Scope) error { func Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(in *api.PodTemplateSpec, out *PodTemplateSpec, s conversion.Scope) error {
@@ -316,8 +319,7 @@ func Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(in *api.PodTemplateSpec,
func Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in *PodTemplateSpec, out *api.PodTemplateSpec, s conversion.Scope) error { func Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in *PodTemplateSpec, out *api.PodTemplateSpec, s conversion.Scope) error {
// TODO: when we move init container to beta, remove these conversions // TODO: when we move init container to beta, remove these conversions
if value := in.Annotations[PodInitContainersAnnotationKey]; len(value) > 0 { if value, ok := in.Annotations[PodInitContainersAnnotationKey]; ok {
delete(in.Annotations, PodInitContainersAnnotationKey)
var values []Container var values []Container
if err := json.Unmarshal([]byte(value), &values); err != nil { if err := json.Unmarshal([]byte(value), &values); err != nil {
return err return err
@@ -325,7 +327,11 @@ func Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in *PodTemplateSpec, out
in.Spec.InitContainers = values in.Spec.InitContainers = values
} }
return autoConvert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in, out, s) if err := autoConvert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in, out, s); err != nil {
return err
}
delete(out.Annotations, PodInitContainersAnnotationKey)
return nil
} }
// The following two PodSpec conversions are done here to support ServiceAccount // The following two PodSpec conversions are done here to support ServiceAccount
@@ -533,7 +539,7 @@ func Convert_api_Pod_To_v1_Pod(in *api.Pod, out *Pod, s conversion.Scope) error
} }
out.Annotations[PodInitContainerStatusesAnnotationKey] = string(value) out.Annotations[PodInitContainerStatusesAnnotationKey] = string(value)
} else { } else {
delete(in.Annotations, PodInitContainerStatusesAnnotationKey) delete(out.Annotations, PodInitContainerStatusesAnnotationKey)
} }
// We need to reset certain fields for mirror pods from pre-v1.1 kubelet // We need to reset certain fields for mirror pods from pre-v1.1 kubelet
@@ -552,16 +558,14 @@ func Convert_api_Pod_To_v1_Pod(in *api.Pod, out *Pod, s conversion.Scope) error
func Convert_v1_Pod_To_api_Pod(in *Pod, out *api.Pod, s conversion.Scope) error { func Convert_v1_Pod_To_api_Pod(in *Pod, out *api.Pod, s conversion.Scope) error {
// TODO: when we move init container to beta, remove these conversions // TODO: when we move init container to beta, remove these conversions
if value := in.Annotations[PodInitContainersAnnotationKey]; len(value) > 0 { if value, ok := in.Annotations[PodInitContainersAnnotationKey]; ok {
delete(in.Annotations, PodInitContainersAnnotationKey)
var values []Container var values []Container
if err := json.Unmarshal([]byte(value), &values); err != nil { if err := json.Unmarshal([]byte(value), &values); err != nil {
return err return err
} }
in.Spec.InitContainers = values in.Spec.InitContainers = values
} }
if value := in.Annotations[PodInitContainerStatusesAnnotationKey]; len(value) > 0 { if value, ok := in.Annotations[PodInitContainerStatusesAnnotationKey]; ok {
delete(in.Annotations, PodInitContainerStatusesAnnotationKey)
var values []ContainerStatus var values []ContainerStatus
if err := json.Unmarshal([]byte(value), &values); err != nil { if err := json.Unmarshal([]byte(value), &values); err != nil {
return err return err
@@ -569,7 +573,12 @@ func Convert_v1_Pod_To_api_Pod(in *Pod, out *api.Pod, s conversion.Scope) error
in.Status.InitContainerStatuses = values in.Status.InitContainerStatuses = values
} }
return autoConvert_v1_Pod_To_api_Pod(in, out, s) if err := autoConvert_v1_Pod_To_api_Pod(in, out, s); err != nil {
return err
}
delete(out.Annotations, PodInitContainersAnnotationKey)
delete(out.Annotations, PodInitContainerStatusesAnnotationKey)
return nil
} }
func Convert_api_ServiceSpec_To_v1_ServiceSpec(in *api.ServiceSpec, out *ServiceSpec, s conversion.Scope) error { func Convert_api_ServiceSpec_To_v1_ServiceSpec(in *api.ServiceSpec, out *ServiceSpec, s conversion.Scope) error {