Move kubeproxy ComponentConfig external types to `k8s.io/kube-proxy` #67688

Lion-Wei · 2018-08-22T04:10:38Z

What this PR does / why we need it:
This PR implements most of kubernetes/community#2354 for the kube-proxy.
The PR:

Moves k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig as-is to k8s.io/kubernetes/pkg/proxy/apis/config as agreed
Moves the external types to the new staging repo k8s.io/kube-proxy, in the k8s.io/kube-proxy/config/v1beta1 package.
Makes k8s.io/kubernetes/pkg/proxy/apis/config/v1beta1 source the types from k8s.io/kube-proxy/config/v1beta1. The defaulting and conversion code is kept in this package as before.
All references to these packages have been updated.

Ref #67233

Special notes for your reviewer:

Release note:

kube-proxy v1beta1 external ComponentConfig types are now available in the `k8s.io/kube-proxy` repo

luxas

Thanks for this PR, great work @Lion-Wei 🎉 👏!!

Quick comment on the commit structure I'd like to see:

Move pkg/proxy/apis/kubeproxyconfig to pkg/proxy/apis/config. All files should be moved and package names should be updated
Rename all references in the rest of the codebase to pkg/proxy/apis/config instead
Start referencing ClientConnectionConfiguration from k8s.io/apimachinery/pkg/apis/config instead of duplicating it in the package
Add k8s.io/kube-proxy/config, move external types there from pkg/proxy/apis/config/v1alpha1.
All autogenerated stuff in the last commit

Alternatively, break out the two first commits in a separate PR (move pkg/proxy/apis/{kubeproxy,}config), and the third commit (move ClientConnectionConfiguration reference) to a separate PR as well. So then we'd get two PRs first that are more scoped and hence easier to merge.

luxas · 2018-08-22T15:27:46Z

pkg/proxy/apis/kubeproxyconfig/v1alpha1/register.go

@@ -30,21 +30,13 @@ var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha
 var (
 	// TODO: move SchemeBuilder with zz_generated.deepcopy.go to k8s.io/api.


remove these comments here

luxas · 2018-08-22T15:28:17Z

staging/src/k8s.io/kube-proxy/config/v1alpha1/register.go

+var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"}
+
+var (
+	// TODO: move SchemeBuilder with zz_generated.deepcopy.go to k8s.io/api.


remove these comments, only misleading

ping pls remove

luxas · 2018-08-22T15:29:49Z

pkg/proxy/apis/config/doc.go

@@ -16,4 +16,4 @@ limitations under the License.

 // +k8s:deepcopy-gen=package

-package kubeproxyconfig // import "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig"
+package config // import "k8s.io/kubernetes/pkg/proxy/apis/config"


this should probably be done already in the first commit, as well as moving OWNERS and BUILD I think

luxas · 2018-08-22T15:30:34Z

vendor/k8s.io/kube-proxy

@@ -0,0 +1 @@
+../../staging/src/k8s.io/kube-proxy/


do this already in the first commit

xiangpengzhao · 2018-08-23T02:17:47Z

pkg/proxy/apis/config/v1alpha1/defaults.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2015 The Kubernetes Authors.
+Copyright 2018 The Kubernetes Authors.


Moving and changing the existing files don't necessarily change the year here, IMO. @bgrant0607 WDYT?

Fixed, thanks.

sttts · 2018-08-23T15:03:46Z

pkg/proxy/apis/kubeproxyconfig/v1alpha1/doc.go


-package v1alpha1 // import "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1"
+package v1alpha1 // import "k8s.io/kubernetes/pkg/proxy/apis/config/v1alpha1"


please add the GroupName tag

sttts · 2018-08-23T15:04:43Z

staging/src/k8s.io/kube-proxy/config/v1alpha1/doc.go

+
+// +k8s:deepcopy-gen=package
+
+package v1alpha1 // import "k8s.io/kube-proxy/config/v1alpha1"


please add the GroupName tag

sttts · 2018-08-23T15:05:08Z

Sgtm. Some nit.

sttts · 2018-08-23T15:06:23Z

If the staging dir is new, don't forget the meta files like COPYRIGHT, OWNER, etc.

luxas · 2018-08-23T19:05:15Z

Additionally, the golint ignore list needs to be updated, import-boss files needs to be updated with the new location to whitelist, and a Godeps file needs to be created

Lion-Wei · 2018-08-25T10:36:20Z

@sttts @luxas Thanks for reviewing.
I reorganized the commit for the sake of reviewing, and all previous comment are addressed. Please take another look, thanks.

Lion-Wei · 2018-08-27T10:52:54Z

/test pull-kubernetes-e2e-kops-aws

luxas

/approve
Thanks a lot @Lion-Wei 👍 !!
This LGTM, except for the networking.k8s.io groupname tag error. Please fix then this is ok by me

luxas · 2018-08-27T11:14:19Z

pkg/proxy/apis/config/v1alpha1/types.go

 // KubeProxyIPTablesConfiguration contains iptables-related configuration
 // details for the Kubernetes proxy server.
 type KubeProxyIPTablesConfiguration struct {
 	// masqueradeBit is the bit of the iptables fwmark space to use for SNAT if using
 	// the pure iptables proxy mode. Values must be within the range [0, 31].
 	MasqueradeBit *int32 `json:"masqueradeBit"`
-	// masqueradeAll tells kube-proxy to SNAT everything if using the pure iptables proxy mode.
+	// masqueradeAll tells kube-proxy to SNAT everything if using the pure iptables proxy mode.cmd/kubeadm/app/apis/kubeadm/v1alpha3/conversion.go


this seems like a small copy-paste error

luxas · 2018-08-27T11:15:20Z

pkg/proxy/apis/config/v1alpha1/doc.go

 // +k8s:defaulter-gen=TypeMeta
-
+// +k8s:defaulter-gen-input=../../../../../vendor/k8s.io/kube-proxy/config/v1alpha1
+// +groupName=networking.k8s.io


this is not true I think, should be kubeproxy.config.k8s.io I'm pretty sure

luxas · 2018-08-27T11:15:40Z

pkg/proxy/apis/config/v1alpha1/register.go

@@ -30,21 +30,13 @@ var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha
 var (
 	// TODO: move SchemeBuilder with zz_generated.deepcopy.go to k8s.io/api.


this comment can/should be removed

luxas · 2018-08-27T11:15:57Z

staging/src/k8s.io/kube-proxy/config/v1alpha1/doc.go

+*/
+
+// +k8s:deepcopy-gen=package
+// +groupName=networking.k8s.io


should be kubeproxy.config.k8s.io

luxas · 2018-08-27T11:16:10Z

staging/src/k8s.io/kube-proxy/config/v1alpha1/register.go

+var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"}
+
+var (
+	// TODO: move SchemeBuilder with zz_generated.deepcopy.go to k8s.io/api.


ping pls remove

…g/apis/config

Lion-Wei · 2018-08-28T01:23:46Z

@luxas Thanks. Sorry about all the careless mistake. All fixed. : )
@sttts @thockin @liggitt @deads2k Please take another look, thanks.

thockin · 2018-08-28T02:48:29Z

/lgtm
/approve

k8s-ci-robot · 2018-08-28T02:48:35Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Lion-Wei, luxas, thockin

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~api/OWNERS~~ [thockin]
~~cmd/OWNERS~~ [thockin]
~~hack/OWNERS~~ [thockin]
~~pkg/OWNERS~~ [thockin]
~~staging/OWNERS~~ [thockin]
~~vendor/OWNERS~~ [thockin]

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

k8s-github-robot · 2018-08-28T05:18:16Z

Automatic merge from submit-queue (batch tested with PRs 64597, 67854, 67734, 67917, 67688). If you want to cherry-pick this change to another branch, please follow the instructions here.

k8s-ci-robot requested review from caesarxuchao and dchen1107 August 22, 2018 04:11

luxas reviewed Aug 22, 2018

View reviewed changes

luxas assigned sttts, luxas, thockin, xiangpengzhao, liggitt and deads2k Aug 22, 2018

stewart-yu mentioned this pull request Aug 22, 2018

Work tracker for moving ComponentConfig types to staging repos #67233

Closed

15 tasks

luxas changed the title ~~[wip]Move kubeproxy ComponentConfig external types to k8s.io/kube-proxy~~ WIP: Move kubeproxy ComponentConfig external types to k8s.io/kube-proxy Aug 22, 2018

xiangpengzhao reviewed Aug 23, 2018

View reviewed changes

sttts reviewed Aug 23, 2018

View reviewed changes

k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Aug 25, 2018

Lion-Wei changed the title ~~WIP: Move kubeproxy ComponentConfig external types to k8s.io/kube-proxy~~ Move kubeproxy ComponentConfig external types to k8s.io/kube-proxy Aug 25, 2018

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 25, 2018

Move pkg/proxy/apis/kubeproxyconfig to pkg/proxy/apis/config

6a048c3

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 27, 2018

luxas approved these changes Aug 27, 2018

View reviewed changes

liangwei added 3 commits August 28, 2018 09:10

referencing ClientConnectionConfiguration from k8s.io/apimachinery/pk…

152e326

…g/apis/config

move external kube-proxy componentConfig to k8s.io/kube-proxy/config/

37e6266

update autogenerated file

4715380

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 28, 2018

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 28, 2018

k8s-github-robot merged commit 029bb4e into kubernetes:master Aug 28, 2018

dims mentioned this pull request Sep 4, 2018

Please create repositories for component config types for - controller-manager/proxy/scheduler/kubelet kubernetes/community#2627

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move kubeproxy ComponentConfig external types to `k8s.io/kube-proxy` #67688

Move kubeproxy ComponentConfig external types to `k8s.io/kube-proxy` #67688

Lion-Wei commented Aug 22, 2018

luxas left a comment

luxas Aug 22, 2018

luxas Aug 22, 2018

luxas Aug 27, 2018

luxas Aug 22, 2018

luxas Aug 22, 2018

xiangpengzhao Aug 23, 2018

Lion-Wei Aug 28, 2018

sttts Aug 23, 2018

sttts Aug 23, 2018

sttts commented Aug 23, 2018

sttts commented Aug 23, 2018

luxas commented Aug 23, 2018

Lion-Wei commented Aug 25, 2018

Lion-Wei commented Aug 27, 2018

luxas left a comment

luxas Aug 27, 2018

luxas Aug 27, 2018

luxas Aug 27, 2018

luxas Aug 27, 2018

luxas Aug 27, 2018

Lion-Wei commented Aug 28, 2018

thockin commented Aug 28, 2018

k8s-ci-robot commented Aug 28, 2018

k8s-github-robot commented Aug 28, 2018

		@@ -30,21 +30,13 @@ var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha
		var (
		// TODO: move SchemeBuilder with zz_generated.deepcopy.go to k8s.io/api.


		package v1alpha1 // import "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1"
		package v1alpha1 // import "k8s.io/kubernetes/pkg/proxy/apis/config/v1alpha1"


		// +k8s:deepcopy-gen=package

		package v1alpha1 // import "k8s.io/kube-proxy/config/v1alpha1"

		@@ -0,0 +1 @@
		../../staging/src/k8s.io/kube-proxy/

Move kubeproxy ComponentConfig external types to k8s.io/kube-proxy #67688

Move kubeproxy ComponentConfig external types to k8s.io/kube-proxy #67688

Conversation

Lion-Wei commented Aug 22, 2018

luxas left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sttts commented Aug 23, 2018

sttts commented Aug 23, 2018

luxas commented Aug 23, 2018

Lion-Wei commented Aug 25, 2018

Lion-Wei commented Aug 27, 2018

luxas left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Lion-Wei commented Aug 28, 2018

thockin commented Aug 28, 2018

k8s-ci-robot commented Aug 28, 2018

k8s-github-robot commented Aug 28, 2018

Move kubeproxy ComponentConfig external types to `k8s.io/kube-proxy` #67688

Move kubeproxy ComponentConfig external types to `k8s.io/kube-proxy` #67688