Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move kubelet ComponentConfig external types to k8s.io/kubelet #67263

Merged
merged 4 commits into from
Sep 2, 2018
Merged

Move kubelet ComponentConfig external types to k8s.io/kubelet #67263

merged 4 commits into from
Sep 2, 2018

Conversation

luxas
Copy link
Member

@luxas luxas commented Aug 10, 2018 •
edited

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

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

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
ref: kubernetes/community#2354

Special notes for your reviewer:

This PR depends on getting #67780 merged first.

Release note:

kubelet v1beta1 external ComponentConfig types are now available in the `k8s.io/kubelet` repo

/assign @sttts @mtaufen @liggitt

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Aug 10, 2018
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/kubeadm sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. labels Aug 10, 2018
@luxas luxas force-pushed the move_kubelet_config_staging branch from 0cd5923 to 0a5d6dc Compare August 10, 2018 18:32
@mtaufen
Copy link
Contributor

mtaufen commented Aug 11, 2018

We should double check for any links on the docs website that point to the things we are moving. I don't think it should be a problem (those links should always point to release branches, not master), but worth double-checking.

mtaufen
mtaufen reviewed Aug 11, 2018
View reviewed changes
cmd/kubeadm/app/componentconfigs/defaults.go Outdated
@@ -108,7 +109,7 @@ func DefaultKubeletConfiguration(internalcfg *kubeadmapi.InitConfiguration) {
externalkubeletcfg.HealthzBindAddress = "127.0.0.1"
externalkubeletcfg.HealthzPort = utilpointer.Int32Ptr(10248)

kubeletconfigv1beta1.SetDefaults_KubeletConfiguration(externalkubeletcfg)
kubeletconfigmetav1beta1.SetDefaults_KubeletConfiguration(externalkubeletcfg)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do this instead of scheme.Default(externalkubeletcfg)?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm, not for any specific reason I think. That is probably the better implementation option of these two.

mtaufen
mtaufen reviewed Aug 11, 2018
View reviewed changes
cmd/kubeadm/app/componentconfigs/BUILD Outdated
@@ -15,9 +15,8 @@ go_library(
"//cmd/kubeadm/app/apis/kubeadm/v1alpha3:go_default_library",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this BUILD file needs to be regenerated.

W0810 18:56:11.947] GoCompile: missing strict dependencies:
W0810 18:56:11.947] 	/bazel-scratch/.cache/bazel/_bazel_root/e9f728bbd90b3fba632eb31b20e1dacd/sandbox/linux-sandbox/3155/execroot/__main__/cmd/kubeadm/app/componentconfigs/defaults.go: import of "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1"
W0810 18:56:11.947] Known dependencies are:
W0810 18:56:11.948] 	k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm
W0810 18:56:11.948] 	k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha3
W0810 18:56:11.948] 	k8s.io/kubernetes/cmd/kubeadm/app/constants
W0810 18:56:11.948] 	k8s.io/kubernetes/cmd/kubeadm/app/util
W0810 18:56:11.948] 	k8s.io/kubernetes/pkg/kubelet/apis/config
W0810 18:56:11.948] 	k8s.io/kubernetes/pkg/kubelet/apis/config/validation
W0810 18:56:11.948] 	k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig
W0810 18:56:11.948] 	k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1
W0810 18:56:11.948] 	k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/validation
W0810 18:56:11.948] 	k8s.io/apimachinery/pkg/apis/meta/v1
W0810 18:56:11.948] 	k8s.io/apimachinery/pkg/runtime
W0810 18:56:11.948] 	k8s.io/apimachinery/pkg/runtime/schema
W0810 18:56:11.949] 	k8s.io/apimachinery/pkg/runtime/serializer
W0810 18:56:11.949] 	k8s.io/apimachinery/pkg/util/runtime
W0810 18:56:11.949] 	k8s.io/apimachinery/pkg/util/validation/field
W0810 18:56:11.949] 	k8s.io/kubelet/config/v1beta1
W0810 18:56:11.949] 	k8s.io/utils/pointer
W0810 18:56:11.949] 	k8s.io/apimachinery/pkg/apis/meta/v1
W0810 18:56:11.949] 	k8s.io/apimachinery/pkg/runtime
W0810 18:56:11.949] 	k8s.io/apimachinery/pkg/runtime/schema
W0810 18:56:11.949] 	k8s.io/apimachinery/pkg/runtime/serializer
W0810 18:56:11.949] 	k8s.io/apimachinery/pkg/util/runtime
W0810 18:56:11.949] 	k8s.io/apimachinery/pkg/util/validation/field
W0810 18:56:11.949] 	k8s.io/kubelet/config/v1beta1
W0810 18:56:11.949] 	k8s.io/utils/pointer
W0810 18:56:11.950] Check that imports in Go sources match importpath attributes in deps.
W0810 18:56:12.147] INFO: Elapsed time: 30.734s, Critical Path: 8.79s
W0810 18:56:12.149] INFO: 3480 processes: 3387 remote cache hit, 1 linux-sandbox, 92 local.
W0810 18:56:12.150] FAILED: Build did NOT complete successfully

@luxas luxas force-pushed the move_kubelet_config_staging branch from 3db8470 to 24124dc Compare August 12, 2018 16:35
@stewart-yu stewart-yu mentioned this pull request Aug 12, 2018
Closed
15 tasks
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 18, 2018
@luxas luxas mentioned this pull request Aug 23, 2018
Merged
@luxas
Copy link
Member Author

luxas commented Aug 23, 2018

Split this out to #67780 as the first scoped PR.

@dims
Copy link
Member

dims commented Aug 24, 2018

/uncc

@k8s-ci-robot k8s-ci-robot removed the request for review from dims August 24, 2018 12:49
@luxas luxas force-pushed the move_kubelet_config_staging branch from 4d83980 to 7ef34c4 Compare August 29, 2018 17:17
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Aug 29, 2018
@luxas luxas force-pushed the move_kubelet_config_staging branch from 7ef34c4 to 220f9a5 Compare August 30, 2018 17:07
@liggitt liggitt removed their assignment Aug 31, 2018
@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

11 similar comments
@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 1, 2018
@k8s-ci-robot
Copy link
Contributor

New changes are detected. LGTM label has been removed.

@luxas luxas force-pushed the move_kubelet_config_staging branch from e755f4b to 8b6a7ee Compare September 2, 2018 11:39
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Sep 2, 2018
@luxas
Copy link
Member Author

luxas commented Sep 2, 2018

I'm re-applying the LGTM label, as I now rebased the PR (the need for a rebase was the cause of the failing tests retried by fejta-bot).
All tests are green, and I fixed the nit in the README.

@luxas luxas added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 2, 2018
@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 65566, 67959, 68029, 68017, 67263). If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md.

@k8s-github-robot k8s-github-robot merged commit 3a8a711 into kubernetes:master Sep 2, 2018
@dims dims mentioned this pull request Sep 4, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sttts sttts sttts left review comments

@mtaufen mtaufen mtaufen left review comments

@caesarxuchao caesarxuchao Awaiting requested review from caesarxuchao

Assignees

@sttts sttts

@mtaufen mtaufen

@thockin thockin

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubeadm area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
v1.12
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@luxas @mtaufen @dims @thockin @fejta-bot @sttts @k8s-ci-robot @k8s-github-robot @liggitt