kubeadm: print the join command #70795

yuexiao-wang · 2018-11-08T12:31:03Z

Signed-off-by: yuexiao-wang wang.yuexiao@zte.com.cn

What type of PR is this?

Uncomment only one, leave it on its own line:

/kind api-change
/kind bug

/kind cleanup

/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:
move printJoinCommand out of runInit and create a new function to print the join command.

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/kubeadm#1163
Fixes # kubernetes/kubeadm#1233

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

k8s-ci-robot · 2018-11-08T12:31:11Z

Hi @yuexiao-wang. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

neolit123

thanks for this WIP @yuexiao-wang
added one initial comment.

neolit123 · 2018-11-08T18:36:19Z

cmd/kubeadm/app/cmd/init.go

@@ -154,6 +154,32 @@ func NewCmdInit(out io.Writer) *cobra.Command {
 			// TODO: the code in runInit should be progressively converted in phases; each phase will be exposed
 			// via the subcommands automatically created by initRunner.BindToCommand
 			err = runInit(&data, out)
+
+			// printing the join command should happen after all the phases in init have finished
+			showJoinCommand := func(i *initData, out io.Writer) error {


let's not have it as a anonymous function but rather define it in the file level:

func showJoinCommand(....) {

Thanks, I will fix it

neolit123 · 2018-11-08T18:37:29Z

/kind cleanup
/priority important-soon

yagonobre · 2018-11-08T19:51:21Z

cmd/kubeadm/app/cmd/init.go

+				}
+
+				// Prints the join command, multiple times in case the user has multiple tokens
+				for _, token := range tokens {


You can use initData.Tokens

Yes, agree with it.
Thanks.

yuexiao-wang · 2018-11-10T03:29:01Z

PR is updated

neolit123 · 2018-11-10T03:37:04Z

cmd/kubeadm/app/cmd/init.go

+
+	// Prints the join command, multiple times in case the user has multiple tokens
+	for _, token := range tokens {
+		if err := printJoinCommand(out, adminKubeConfigPath, token, i.skipTokenPrint); err != nil {


initData already holds a method to get the kubeconfig path:
adminKubeConfigPath -> i.KubeConfigPath()
it can replace the code above :)

_, kubeConfigDir, _, _, err := getDirectoriesToUse(i.dryRun, i.dryRunDir, i.cfg.CertificatesDir) if err != nil { return errors.Wrap(err, "failed to get directories to use") } adminKubeConfigPath := filepath.Join(kubeConfigDir, kubeadmconstants.AdminKubeConfigFileName)

fabriziopandini

@yuexiao-wang thanks!
Looks ok, but we still need some PR to merge

fabriziopandini · 2018-11-10T13:51:52Z

cmd/kubeadm/app/cmd/init.go

@@ -458,19 +460,16 @@ func (d initData) Tokens() []string {

 // runInit executes master node provisioning
 func runInit(i *initData, out io.Writer) error {


I'm expecting this PR to remove this func after rebasing when all the phases merge

yuexiao-wang · 2018-11-10T14:48:24Z

/test pull-kubernetes-verify
/test pull-kubernetes-integration

yuexiao-wang · 2018-11-11T15:11:46Z

/retest

yuexiao-wang · 2018-11-12T08:15:59Z

/retest

fabriziopandini · 2018-11-13T06:58:30Z

/milestone v1.13

… init have finished Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>

neolit123 · 2018-11-13T12:05:29Z

cmd/kubeadm/app/cmd/init.go

@@ -397,6 +400,9 @@ func (d initData) KubeConfigDir() string {

 // KubeConfigPath returns the path to the kubeconfig file to use for connecting to Kubernetes
 func (d initData) KubeConfigPath() string {
+	if d.dryRun {
+		d.kubeconfigPath = filepath.Join(d.dryRunDir, kubeadmconstants.AdminKubeConfigFileName)


that was a bug indeed, thanks for fixing. @yuexiao-wang

thanks for your help

neolit123 · 2018-11-13T12:27:48Z

/lgtm
/hold

fabriziopandini

@yuexiao-wang many thanks!
/approve
/lgtm

k8s-ci-robot · 2018-11-13T13:43:17Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini, yuexiao-wang

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]

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

neolit123 · 2018-11-13T13:47:38Z

/hold cancel

k8s-ci-robot requested review from stealthybox and timothysc November 8, 2018 12:31

k8s-ci-robot added area/kubeadm sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Nov 8, 2018

neolit123 reviewed Nov 8, 2018

View reviewed changes

yagonobre reviewed Nov 8, 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 Nov 9, 2018

yuexiao-wang force-pushed the print-join-command branch from 89a608a to 231e3be Compare November 10, 2018 03:20

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

yuexiao-wang force-pushed the print-join-command branch from 231e3be to 75e7153 Compare November 10, 2018 03:27

neolit123 reviewed Nov 10, 2018

View reviewed changes

yuexiao-wang force-pushed the print-join-command branch 3 times, most recently from fb0bf65 to 7ad7cd6 Compare November 10, 2018 06:52

k8s-ci-robot assigned neolit123 Nov 10, 2018

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 10, 2018

fabriziopandini reviewed Nov 10, 2018

View reviewed changes

yuexiao-wang changed the title ~~[WIP]kubeadm: print the join command~~ kubeadm: print the join command Nov 10, 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 Nov 10, 2018

yuexiao-wang force-pushed the print-join-command branch from 7ad7cd6 to 389f8b6 Compare November 10, 2018 15:29

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 10, 2018

k8s-ci-robot added this to the v1.13 milestone Nov 13, 2018

yuexiao-wang force-pushed the print-join-command branch from 389f8b6 to 5851fd5 Compare November 13, 2018 10:56

k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 13, 2018

kubeadm: print the join command should happen after all the phases in…

5851fd5

… init have finished Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>

neolit123 reviewed Nov 13, 2018

View reviewed changes

k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Nov 13, 2018

k8s-ci-robot assigned fabriziopandini Nov 13, 2018

fabriziopandini approved these changes Nov 13, 2018

View reviewed changes

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

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 13, 2018

k8s-ci-robot merged commit bfb9529 into kubernetes:master Nov 13, 2018

neolit123 mentioned this pull request Nov 13, 2018

tracking issue for kubeadm init phases kubernetes/kubeadm#1163

Closed

17 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

kubeadm: print the join command #70795

kubeadm: print the join command #70795

yuexiao-wang commented Nov 8, 2018 •

edited

k8s-ci-robot commented Nov 8, 2018

neolit123 left a comment

neolit123 Nov 8, 2018

yuexiao-wang Nov 9, 2018

neolit123 commented Nov 8, 2018

yagonobre Nov 8, 2018

yuexiao-wang Nov 9, 2018

yuexiao-wang commented Nov 10, 2018

neolit123 Nov 10, 2018

yuexiao-wang Nov 10, 2018 •

edited

fabriziopandini left a comment

fabriziopandini Nov 10, 2018

yuexiao-wang commented Nov 10, 2018

yuexiao-wang commented Nov 11, 2018

yuexiao-wang commented Nov 12, 2018

fabriziopandini commented Nov 13, 2018

neolit123 Nov 13, 2018

yuexiao-wang Nov 13, 2018

neolit123 commented Nov 13, 2018

fabriziopandini left a comment

k8s-ci-robot commented Nov 13, 2018

neolit123 commented Nov 13, 2018

		@@ -458,19 +460,16 @@ func (d initData) Tokens() []string {

		// runInit executes master node provisioning
		func runInit(i *initData, out io.Writer) error {

kubeadm: print the join command #70795

kubeadm: print the join command #70795

Conversation

yuexiao-wang commented Nov 8, 2018 • edited

k8s-ci-robot commented Nov 8, 2018

neolit123 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

neolit123 commented Nov 8, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yuexiao-wang commented Nov 10, 2018

Choose a reason for hiding this comment

yuexiao-wang Nov 10, 2018 • edited

Choose a reason for hiding this comment

fabriziopandini left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yuexiao-wang commented Nov 10, 2018

yuexiao-wang commented Nov 11, 2018

yuexiao-wang commented Nov 12, 2018

fabriziopandini commented Nov 13, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

neolit123 commented Nov 13, 2018

fabriziopandini left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Nov 13, 2018

neolit123 commented Nov 13, 2018

yuexiao-wang commented Nov 8, 2018 •

edited

yuexiao-wang Nov 10, 2018 •

edited