kubeadm: Move .NodeName and .CRISocket to a common sub-struct #64210

luxas · 2018-05-23T15:55:09Z

What this PR does / why we need it:
Regroups some common fields for kubeadm init and kubeadm join only used for the initial node registration.
Lets the user specify ExtraArgs to the kubelet.
Now also runs the dynamic env file creation for kubeadm join.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes kubernetes/kubeadm#847
Follows-up #63887
Related to kubernetes/kubeadm#822

Special notes for your reviewer: WIP, but please review so we can finalize the direction of the PR

Release note:

[action required] `.NodeName` and `.CRISocket` in the `MasterConfiguration` and `NodeConfiguration` v1alpha1 API objects are now `.NodeRegistration.Name` and `.NodeRegistration.CRISocket` respectively in the v1alpha2 API. The `.NoTaintMaster` field has been removed in the v1alpha2 API.

@kubernetes/sig-cluster-lifecycle-pr-reviews @liztio

timothysc

Minor nits then lgtm

timothysc · 2018-05-25T19:36:58Z

cmd/kubeadm/app/apis/kubeadm/types.go

+
+	// ExtraArgs passes through extra arguments to the kubelet. The arguments here are passed to the kubelet command line via the environment file
+	// kubeadm writes at runtime for the kubelet to source.
+	ExtraArgs map[string]string


Given that this is the Kubelet ExtraArgs it's not entirely clear from a developer UX.

For example:
NodeRegistrationOptions.ExtraArgs

vs.
KubeletRegistrationOptions.ExtraArgs or
NodeRegistrationOptions.KubeletExtraArgs.

I'll change this after we've discussed the naming with @fabriziopandini in the SIG meeting

timothysc · 2018-05-25T19:44:02Z

cmd/kubeadm/app/util/apiclient/idempotency.go

+
+// PatchNode tries to patch a node using the following client, executing patchFn for the actual mutating logic
+func PatchNode(client clientset.Interface, nodeName string, patchFn func(*v1.Node)) error {
+	// Loop on every falsy return. Return with an error if raised. Exit successfully if true is returned.


false return.

timothysc · 2018-05-25T19:49:35Z

cmd/kubeadm/app/util/apiclient/idempotency.go

@@ -186,3 +192,49 @@ func CreateOrUpdateClusterRoleBinding(client clientset.Interface, clusterRoleBin
 	}
 	return nil
 }
+
+// PatchNode tries to patch a node using the following client, executing patchFn for the actual mutating logic
+func PatchNode(client clientset.Interface, nodeName string, patchFn func(*v1.Node)) error {


Do you patch b/c dynamic kubelet config is not default?

No this is used when e.g. setting the master label/taint, and generically modifying the Node object.

fabriziopandini · 2018-05-26T22:07:07Z

cmd/kubeadm/app/apis/kubeadm/types.go

@@ -136,6 +129,27 @@ type API struct {
 	BindPort int32
 }

+// NodeRegistrationOptions holds fields that relate to registering a new master or node to the cluster, either via "kubeadm init" or "kubeadm join"
+type NodeRegistrationOptions struct {


If we are considering convergence towards cluster API, the corresponding object is named machineSpec.
WDYT? it is too early for starting to unify naming?

i think we should stick with something custom like NodeRegistrationOptions for now, mostly because of the ExtraArgs field, assuming it's going to be replaced with a config map eventually (i.e. graduate out of using args?). at a later point we can start converging towards the MachineSpec.

2c.

fabriziopandini · 2018-05-26T22:10:46Z

cmd/kubeadm/app/apis/kubeadm/validation/validation.go

@@ -56,7 +56,8 @@ func ValidateMasterConfiguration(c *kubeadm.MasterConfiguration) field.ErrorList
 	allErrs = append(allErrs, ValidateCertSANs(c.Etcd.ServerCertSANs, field.NewPath("etcd").Child("serverCertSANs"))...)
 	allErrs = append(allErrs, ValidateCertSANs(c.Etcd.PeerCertSANs, field.NewPath("etcd").Child("peerCertSANs"))...)
 	allErrs = append(allErrs, ValidateAbsolutePath(c.CertificatesDir, field.NewPath("certificatesDir"))...)
-	allErrs = append(allErrs, ValidateNodeName(c.NodeName, field.NewPath("nodeName"))...)
+	allErrs = append(allErrs, ValidateNodeName(c.NodeRegistration.Name, field.NewPath("nodeRegistration").Child("name"))...)


What about creating validateNodeRegistrationOptions ?

PS. It seems that ValidateNodeConfiguration doesn't validate node name and crisocket... could you kindly fix it?

This is WIP, thanks for keeping me honest fixing this as well

fabriziopandini · 2018-05-26T22:28:32Z

cmd/kubeadm/app/apis/kubeadm/types.go

+	// empty slice, i.e. `taints: {}` in the YAML file. This field is solely used for Node registration.
+	Taints []v1.Taint
+
+	// ExtraArgs passes through extra arguments to the kubelet. The arguments here are passed to the kubelet command line via the environment file


What about adding a note that explain difference between extra args and KubeletConfiguration (machine specific vs cluster wide)

Very good point 👍

fabriziopandini · 2018-05-29T18:34:13Z

As per slack discussion we move on with this PR as it is. Small bits will follow
/lgtm
/approve

timothysc

/lgtm

Please open an issue to determine long term plan for translating <> machinespec.

k8s-ci-robot · 2018-05-29T19:59:19Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini, luxas, timothysc

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:

~~cmd/kubeadm/OWNERS~~ [fabriziopandini,luxas,timothysc]

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-05-30T05:39:51Z

[MILESTONENOTIFIER] Milestone Pull Request: Up-to-date for process

@fabriziopandini @luxas @timothysc

Pull Request Labels

sig/cluster-lifecycle: Pull Request will be escalated to these SIGs if needed.
priority/important-soon: Escalate to the pull request owners and SIG owner; move out of milestone after several unsuccessful escalation attempts.
kind/feature: New functionality.

Help

fejta-bot · 2018-05-30T10:26:21Z

/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-github-robot · 2018-05-30T17:09:07Z

Automatic merge from submit-queue (batch tested with PRs 64322, 64210, 64458, 64232, 64370). If you want to cherry-pick this change to another branch, please follow the instructions here.

luxas assigned timothysc May 23, 2018

k8s-ci-robot requested review from dixudx and timothysc May 23, 2018 15:55

k8s-ci-robot added the area/kubeadm label May 23, 2018

timothysc reviewed May 25, 2018

View reviewed changes

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 26, 2018

fabriziopandini reviewed May 26, 2018

View reviewed changes

luxas assigned fabriziopandini May 29, 2018

luxas added 3 commits May 29, 2018 17:51

kubeadm: Move .NodeName and .CRISocket to a common sub-struct

b48f23b

Update unit tests to use the new NodeRegistration object

fd47f8b

autogenerated

8bcbc1e

luxas force-pushed the kubeadm_kubelet_extraargs branch from b66dfe3 to 8bcbc1e Compare May 29, 2018 14:52

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 29, 2018

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

timothysc approved these changes May 29, 2018

View reviewed changes

luxas added this to the v1.11 milestone May 30, 2018

luxas added the status/approved-for-milestone label May 30, 2018

k8s-github-robot added the milestone/incomplete-labels label May 30, 2018

luxas added kind/feature Categorizes issue or PR as related to a new feature. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. labels May 30, 2018

k8s-github-robot removed the milestone/incomplete-labels label May 30, 2018

k8s-github-robot merged commit 31815fc into kubernetes:master May 30, 2018

ijc mentioned this pull request Jun 15, 2018

Use noTaintMaster in kubeadm.conf linuxkit/kubernetes#72

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

kubeadm: Move .NodeName and .CRISocket to a common sub-struct #64210

kubeadm: Move .NodeName and .CRISocket to a common sub-struct #64210

luxas commented May 23, 2018

timothysc left a comment

timothysc May 25, 2018

luxas May 29, 2018

timothysc May 25, 2018

luxas May 29, 2018

timothysc May 25, 2018

luxas May 29, 2018

fabriziopandini May 26, 2018

neolit123 May 29, 2018

fabriziopandini May 26, 2018

fabriziopandini May 26, 2018

luxas May 29, 2018

fabriziopandini May 26, 2018

luxas May 29, 2018

fabriziopandini commented May 29, 2018

timothysc left a comment

k8s-ci-robot commented May 29, 2018

k8s-github-robot commented May 30, 2018

fejta-bot commented May 30, 2018

k8s-github-robot commented May 30, 2018

kubeadm: Move .NodeName and .CRISocket to a common sub-struct #64210

kubeadm: Move .NodeName and .CRISocket to a common sub-struct #64210

Conversation

luxas commented May 23, 2018

timothysc 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

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

fabriziopandini commented May 29, 2018

timothysc left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented May 29, 2018

k8s-github-robot commented May 30, 2018

fejta-bot commented May 30, 2018

k8s-github-robot commented May 30, 2018