Skip to content

K
k3s
Commit 1f6bc94b authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #39713 from k82cn/init_container_defaults

Automatic merge from submit-queue Set defaults of init containers. fixes #38542
parents 15f04689 7b7a7599
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 12 deletions
pkg/api/v1/conversion.go
View file @ 1f6bc94b
...@@ -481,10 +481,16 @@ func Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in *PodTemplateSpec, out ...@@ -481,10 +481,16 @@ func Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in *PodTemplateSpec, out
in.Spec.InitContainers = values in.Spec.InitContainers = values
// Call defaulters explicitly until annotations are removed // Call defaulters explicitly until annotations are removed
for i := range in.Spec.InitContainers { tmpPodTemp := &PodTemplate{
c := &in.Spec.InitContainers[i] Template: PodTemplateSpec{
SetDefaults_Container(c) Spec: PodSpec{
HostNetwork: in.Spec.HostNetwork,
InitContainers: values,
},
},
} }
SetObjectDefaults_PodTemplate(tmpPodTemp)
in.Spec.InitContainers = tmpPodTemp.Template.Spec.InitContainers
} }
if err := autoConvert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in, out, s); err != nil { if err := autoConvert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in, out, s); err != nil {
...@@ -604,10 +610,14 @@ func Convert_v1_Pod_To_api_Pod(in *Pod, out *api.Pod, s conversion.Scope) error ...@@ -604,10 +610,14 @@ func Convert_v1_Pod_To_api_Pod(in *Pod, out *api.Pod, s conversion.Scope) error
// back to the caller. // back to the caller.
in.Spec.InitContainers = values in.Spec.InitContainers = values
// Call defaulters explicitly until annotations are removed // Call defaulters explicitly until annotations are removed
for i := range in.Spec.InitContainers { tmpPod := &Pod{
c := &in.Spec.InitContainers[i] Spec: PodSpec{
SetDefaults_Container(c) HostNetwork: in.Spec.HostNetwork,
InitContainers: values,
},
} }
SetObjectDefaults_Pod(tmpPod)
in.Spec.InitContainers = tmpPod.Spec.InitContainers
} }
// If there is a beta annotation, copy to alpha key. // If there is a beta annotation, copy to alpha key.
// See commit log for PR #31026 for why we do this. // See commit log for PR #31026 for why we do this.
......
staging/src/k8s.io/client-go/pkg/api/v1/conversion.go
View file @ 1f6bc94b
...@@ -481,10 +481,16 @@ func Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in *PodTemplateSpec, out ...@@ -481,10 +481,16 @@ func Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in *PodTemplateSpec, out
in.Spec.InitContainers = values in.Spec.InitContainers = values
// Call defaulters explicitly until annotations are removed // Call defaulters explicitly until annotations are removed
for i := range in.Spec.InitContainers { tmpPodTemp := &PodTemplate{
c := &in.Spec.InitContainers[i] Template: PodTemplateSpec{
SetDefaults_Container(c) Spec: PodSpec{
HostNetwork: in.Spec.HostNetwork,
InitContainers: values,
},
},
} }
SetObjectDefaults_PodTemplate(tmpPodTemp)
in.Spec.InitContainers = tmpPodTemp.Template.Spec.InitContainers
} }
if err := autoConvert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in, out, s); err != nil { if err := autoConvert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in, out, s); err != nil {
...@@ -604,10 +610,14 @@ func Convert_v1_Pod_To_api_Pod(in *Pod, out *api.Pod, s conversion.Scope) error ...@@ -604,10 +610,14 @@ func Convert_v1_Pod_To_api_Pod(in *Pod, out *api.Pod, s conversion.Scope) error
// back to the caller. // back to the caller.
in.Spec.InitContainers = values in.Spec.InitContainers = values
// Call defaulters explicitly until annotations are removed // Call defaulters explicitly until annotations are removed
for i := range in.Spec.InitContainers { tmpPod := &Pod{
c := &in.Spec.InitContainers[i] Spec: PodSpec{
SetDefaults_Container(c) HostNetwork: in.Spec.HostNetwork,
InitContainers: values,
},
} }
SetObjectDefaults_Pod(tmpPod)
in.Spec.InitContainers = tmpPod.Spec.InitContainers
} }
// If there is a beta annotation, copy to alpha key. // If there is a beta annotation, copy to alpha key.
// See commit log for PR #31026 for why we do this. // See commit log for PR #31026 for why we do this.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment