Remove unnecessary custom conversion functions by liggitt · Pull Request #77346 · kubernetes/kubernetes

liggitt · 2019-05-02T16:22:48Z

/kind cleanup

What this PR does / why we need it:

Several custom conversion functions around pod and container security context structs were not required.

Dropping this streamlines addition of new fields to these structs, since the auto-generated conversion will automatically add copies for the new fields, instead of having to manually update the custom functions

Resolves unit test failures in #77147

Does this PR introduce a user-facing change?:

NONE

/sig api-machinery
/cc @sttts

liggitt · 2019-05-02T16:25:27Z

pkg/apis/core/v1/conversion.go

 	return nil
 }

-func Convert_core_SecurityContext_To_v1_SecurityContext(in *core.SecurityContext, out *v1.SecurityContext, s conversion.Scope) error {


compare with autogenerated function:

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

Lines 6816 to 6827 in c3e8a43

func autoConvert_core_SecurityContext_To_v1_SecurityContext(in *core.SecurityContext, out *v1.SecurityContext, s conversion.Scope) error {

out.Capabilities = (*v1.Capabilities)(unsafe.Pointer(in.Capabilities))

out.Privileged = (*bool)(unsafe.Pointer(in.Privileged))

out.SELinuxOptions = (*v1.SELinuxOptions)(unsafe.Pointer(in.SELinuxOptions))

out.RunAsUser = (*int64)(unsafe.Pointer(in.RunAsUser))

out.RunAsGroup = (*int64)(unsafe.Pointer(in.RunAsGroup))

out.RunAsNonRoot = (*bool)(unsafe.Pointer(in.RunAsNonRoot))

out.ReadOnlyRootFilesystem = (*bool)(unsafe.Pointer(in.ReadOnlyRootFilesystem))

out.AllowPrivilegeEscalation = (*bool)(unsafe.Pointer(in.AllowPrivilegeEscalation))

out.ProcMount = (*v1.ProcMountType)(unsafe.Pointer(in.ProcMount))

return nil

}

(the Convert_... functions being called were the autogenerated ones)

liggitt · 2019-05-02T16:26:09Z

pkg/apis/core/v1/conversion.go

-	return nil
-}
-
-func Convert_core_PodSecurityContext_To_v1_PodSecurityContext(in *core.PodSecurityContext, out *v1.PodSecurityContext, s conversion.Scope) error {


compare with autogenerated function:

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

Lines 5524 to 5537 in c3e8a43

func autoConvert_core_PodSecurityContext_To_v1_PodSecurityContext(in *core.PodSecurityContext, out *v1.PodSecurityContext, s conversion.Scope) error {

// INFO: in.HostNetwork opted out of conversion generation

// INFO: in.HostPID opted out of conversion generation

// INFO: in.HostIPC opted out of conversion generation

// INFO: in.ShareProcessNamespace opted out of conversion generation

out.SELinuxOptions = (*v1.SELinuxOptions)(unsafe.Pointer(in.SELinuxOptions))

out.RunAsUser = (*int64)(unsafe.Pointer(in.RunAsUser))

out.RunAsGroup = (*int64)(unsafe.Pointer(in.RunAsGroup))

out.RunAsNonRoot = (*bool)(unsafe.Pointer(in.RunAsNonRoot))

out.SupplementalGroups = *(*[]int64)(unsafe.Pointer(&in.SupplementalGroups))

out.FSGroup = (*int64)(unsafe.Pointer(in.FSGroup))

out.Sysctls = *(*[]v1.Sysctl)(unsafe.Pointer(&in.Sysctls))

return nil

}

(the Convert_... functions being called were the autogenerated ones)

liggitt · 2019-05-02T16:26:55Z

pkg/apis/core/v1/conversion.go

-	return nil
-}
-
-func Convert_v1_PodSecurityContext_To_core_PodSecurityContext(in *v1.PodSecurityContext, out *core.PodSecurityContext, s conversion.Scope) error {


compare with autogenerated function:

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

Lines 5513 to 5522 in c3e8a43

func autoConvert_v1_PodSecurityContext_To_core_PodSecurityContext(in *v1.PodSecurityContext, out *core.PodSecurityContext, s conversion.Scope) error {

out.SELinuxOptions = (*core.SELinuxOptions)(unsafe.Pointer(in.SELinuxOptions))

out.RunAsUser = (*int64)(unsafe.Pointer(in.RunAsUser))

out.RunAsGroup = (*int64)(unsafe.Pointer(in.RunAsGroup))

out.RunAsNonRoot = (*bool)(unsafe.Pointer(in.RunAsNonRoot))

out.SupplementalGroups = *(*[]int64)(unsafe.Pointer(&in.SupplementalGroups))

out.FSGroup = (*int64)(unsafe.Pointer(in.FSGroup))

out.Sysctls = *(*[]core.Sysctl)(unsafe.Pointer(&in.Sysctls))

return nil

}

(the Convert_... functions being called were the autogenerated ones)

liggitt · 2019-05-02T16:27:44Z

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

-	} else {
-		out.SecurityContext = nil
-	}
+	out.SecurityContext = (*core.SecurityContext)(unsafe.Pointer(in.SecurityContext))


not defining a custom function means this can collapse to a direct memory copy

liggitt · 2019-05-02T16:27:53Z

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

-	} else {
-		out.SecurityContext = nil
-	}
+	out.SecurityContext = (*v1.SecurityContext)(unsafe.Pointer(in.SecurityContext))


ditto on direct memory copy

liggitt · 2019-05-02T16:28:13Z

/priority backlog

liggitt · 2019-05-02T18:06:07Z

/retest

smarterclayton · 2019-05-02T18:29:15Z

/lgtm
/approve

k8s-ci-robot · 2019-05-02T18:29:44Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, smarterclayton

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~pkg/apis/core/OWNERS~~ [liggitt,smarterclayton]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

liggitt added 2 commits May 2, 2019 12:17

Remove unnecessary custom conversions

38fbcb7

generated

20ce402

k8s-ci-robot added the release-note-none Denotes a PR that doesn't merit a release note. label May 2, 2019

k8s-ci-robot requested a review from sttts May 2, 2019 16:22

liggitt commented May 2, 2019

View reviewed changes

k8s-ci-robot added priority/backlog Higher priority than priority/awaiting-more-evidence. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels May 2, 2019

liggitt mentioned this pull request May 2, 2019

Adding a new WindowsSecurityOptions struct #77147

Merged

k8s-ci-robot assigned smarterclayton May 2, 2019

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 2, 2019

k8s-ci-robot merged commit a6e5cb2 into kubernetes:master May 2, 2019

liggitt deleted the remove-custom-conversion branch May 6, 2019 18:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove unnecessary custom conversion functions#77346

Remove unnecessary custom conversion functions#77346
k8s-ci-robot merged 2 commits intokubernetes:masterfrom
liggitt:remove-custom-conversion

liggitt commented May 2, 2019 •

edited

Loading

Uh oh!

liggitt May 2, 2019

Uh oh!

liggitt May 2, 2019

Uh oh!

liggitt May 2, 2019

Uh oh!

liggitt May 2, 2019

Uh oh!

liggitt May 2, 2019

Uh oh!

liggitt commented May 2, 2019

Uh oh!

liggitt commented May 2, 2019

Uh oh!

smarterclayton commented May 2, 2019

Uh oh!

k8s-ci-robot commented May 2, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	func autoConvert_core_SecurityContext_To_v1_SecurityContext(in core.SecurityContext, out v1.SecurityContext, s conversion.Scope) error {
	out.Capabilities = (*v1.Capabilities)(unsafe.Pointer(in.Capabilities))
	out.Privileged = (*bool)(unsafe.Pointer(in.Privileged))
	out.SELinuxOptions = (*v1.SELinuxOptions)(unsafe.Pointer(in.SELinuxOptions))
	out.RunAsUser = (*int64)(unsafe.Pointer(in.RunAsUser))
	out.RunAsGroup = (*int64)(unsafe.Pointer(in.RunAsGroup))
	out.RunAsNonRoot = (*bool)(unsafe.Pointer(in.RunAsNonRoot))
	out.ReadOnlyRootFilesystem = (*bool)(unsafe.Pointer(in.ReadOnlyRootFilesystem))
	out.AllowPrivilegeEscalation = (*bool)(unsafe.Pointer(in.AllowPrivilegeEscalation))
	out.ProcMount = (*v1.ProcMountType)(unsafe.Pointer(in.ProcMount))
	return nil
	}

	func autoConvert_core_PodSecurityContext_To_v1_PodSecurityContext(in core.PodSecurityContext, out v1.PodSecurityContext, s conversion.Scope) error {
	// INFO: in.HostNetwork opted out of conversion generation
	// INFO: in.HostPID opted out of conversion generation
	// INFO: in.HostIPC opted out of conversion generation
	// INFO: in.ShareProcessNamespace opted out of conversion generation
	out.SELinuxOptions = (*v1.SELinuxOptions)(unsafe.Pointer(in.SELinuxOptions))
	out.RunAsUser = (*int64)(unsafe.Pointer(in.RunAsUser))
	out.RunAsGroup = (*int64)(unsafe.Pointer(in.RunAsGroup))
	out.RunAsNonRoot = (*bool)(unsafe.Pointer(in.RunAsNonRoot))
	out.SupplementalGroups = ([]int64)(unsafe.Pointer(&in.SupplementalGroups))
	out.FSGroup = (*int64)(unsafe.Pointer(in.FSGroup))
	out.Sysctls = ([]v1.Sysctl)(unsafe.Pointer(&in.Sysctls))
	return nil
	}

	func autoConvert_v1_PodSecurityContext_To_core_PodSecurityContext(in v1.PodSecurityContext, out core.PodSecurityContext, s conversion.Scope) error {
	out.SELinuxOptions = (*core.SELinuxOptions)(unsafe.Pointer(in.SELinuxOptions))
	out.RunAsUser = (*int64)(unsafe.Pointer(in.RunAsUser))
	out.RunAsGroup = (*int64)(unsafe.Pointer(in.RunAsGroup))
	out.RunAsNonRoot = (*bool)(unsafe.Pointer(in.RunAsNonRoot))
	out.SupplementalGroups = ([]int64)(unsafe.Pointer(&in.SupplementalGroups))
	out.FSGroup = (*int64)(unsafe.Pointer(in.FSGroup))
	out.Sysctls = ([]core.Sysctl)(unsafe.Pointer(&in.Sysctls))
	return nil
	}

Conversation

liggitt commented May 2, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

liggitt May 2, 2019

Choose a reason for hiding this comment

Uh oh!

liggitt May 2, 2019

Choose a reason for hiding this comment

Uh oh!

liggitt May 2, 2019

Choose a reason for hiding this comment

Uh oh!

liggitt May 2, 2019

Choose a reason for hiding this comment

Uh oh!

liggitt May 2, 2019

Choose a reason for hiding this comment

Uh oh!

liggitt commented May 2, 2019

Uh oh!

liggitt commented May 2, 2019

Uh oh!

smarterclayton commented May 2, 2019

Uh oh!

k8s-ci-robot commented May 2, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

liggitt commented May 2, 2019 •

edited

Loading