Skip to content

Commit a6e5cb2

Browse files
authored
Merge pull request kubernetes#77346 from liggitt/remove-custom-conversion
Remove unnecessary custom conversion functions
2 parents c3e8a43 + 20ce402 commit a6e5cb2

File tree

2 files changed

+21
-159
lines changed

2 files changed

+21
-159
lines changed

pkg/apis/core/v1/conversion.go

Lines changed: 0 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -357,88 +357,6 @@ func Convert_v1_Secret_To_core_Secret(in *v1.Secret, out *core.Secret, s convers
357357
return nil
358358
}
359359

360-
func Convert_core_SecurityContext_To_v1_SecurityContext(in *core.SecurityContext, out *v1.SecurityContext, s conversion.Scope) error {
361-
if in.Capabilities != nil {
362-
out.Capabilities = new(v1.Capabilities)
363-
if err := Convert_core_Capabilities_To_v1_Capabilities(in.Capabilities, out.Capabilities, s); err != nil {
364-
return err
365-
}
366-
} else {
367-
out.Capabilities = nil
368-
}
369-
out.Privileged = in.Privileged
370-
if in.SELinuxOptions != nil {
371-
out.SELinuxOptions = new(v1.SELinuxOptions)
372-
if err := Convert_core_SELinuxOptions_To_v1_SELinuxOptions(in.SELinuxOptions, out.SELinuxOptions, s); err != nil {
373-
return err
374-
}
375-
} else {
376-
out.SELinuxOptions = nil
377-
}
378-
out.RunAsUser = in.RunAsUser
379-
out.RunAsGroup = in.RunAsGroup
380-
out.RunAsNonRoot = in.RunAsNonRoot
381-
out.ReadOnlyRootFilesystem = in.ReadOnlyRootFilesystem
382-
out.AllowPrivilegeEscalation = in.AllowPrivilegeEscalation
383-
if in.ProcMount != nil {
384-
pm := string(*in.ProcMount)
385-
pmt := v1.ProcMountType(pm)
386-
out.ProcMount = &pmt
387-
}
388-
return nil
389-
}
390-
391-
func Convert_core_PodSecurityContext_To_v1_PodSecurityContext(in *core.PodSecurityContext, out *v1.PodSecurityContext, s conversion.Scope) error {
392-
out.SupplementalGroups = in.SupplementalGroups
393-
if in.SELinuxOptions != nil {
394-
out.SELinuxOptions = new(v1.SELinuxOptions)
395-
if err := Convert_core_SELinuxOptions_To_v1_SELinuxOptions(in.SELinuxOptions, out.SELinuxOptions, s); err != nil {
396-
return err
397-
}
398-
} else {
399-
out.SELinuxOptions = nil
400-
}
401-
out.RunAsUser = in.RunAsUser
402-
out.RunAsGroup = in.RunAsGroup
403-
out.RunAsNonRoot = in.RunAsNonRoot
404-
out.FSGroup = in.FSGroup
405-
if in.Sysctls != nil {
406-
out.Sysctls = make([]v1.Sysctl, len(in.Sysctls))
407-
for i, sysctl := range in.Sysctls {
408-
if err := Convert_core_Sysctl_To_v1_Sysctl(&sysctl, &out.Sysctls[i], s); err != nil {
409-
return err
410-
}
411-
}
412-
}
413-
return nil
414-
}
415-
416-
func Convert_v1_PodSecurityContext_To_core_PodSecurityContext(in *v1.PodSecurityContext, out *core.PodSecurityContext, s conversion.Scope) error {
417-
out.SupplementalGroups = in.SupplementalGroups
418-
if in.SELinuxOptions != nil {
419-
out.SELinuxOptions = new(core.SELinuxOptions)
420-
if err := Convert_v1_SELinuxOptions_To_core_SELinuxOptions(in.SELinuxOptions, out.SELinuxOptions, s); err != nil {
421-
return err
422-
}
423-
} else {
424-
out.SELinuxOptions = nil
425-
}
426-
out.RunAsUser = in.RunAsUser
427-
out.RunAsGroup = in.RunAsGroup
428-
out.RunAsNonRoot = in.RunAsNonRoot
429-
out.FSGroup = in.FSGroup
430-
if in.Sysctls != nil {
431-
out.Sysctls = make([]core.Sysctl, len(in.Sysctls))
432-
for i, sysctl := range in.Sysctls {
433-
if err := Convert_v1_Sysctl_To_core_Sysctl(&sysctl, &out.Sysctls[i], s); err != nil {
434-
return err
435-
}
436-
}
437-
}
438-
439-
return nil
440-
}
441-
442360
// +k8s:conversion-fn=copy-only
443361
func Convert_v1_ResourceList_To_core_ResourceList(in *v1.ResourceList, out *core.ResourceList, s conversion.Scope) error {
444362
if *in == nil {

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

Lines changed: 21 additions & 77 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)