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

Node Bootstrap Fix Ups #5309

Merged
merged 2 commits into from
Jun 12, 2018
Merged

Node Bootstrap Fix Ups #5309

merged 2 commits into from
Jun 12, 2018

Conversation

gambol99
Copy link
Contributor

  • following the suggestions made in the initial PR Node Bootstrap Tokens #5253
  • fixing up the variable name to following a more suitable convention
  • fixing up the paths to use a strings.Join rather than a fiddly

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 11, 2018
@gambol99 gambol99 changed the title Node Bootstrap Fixes Node Bootstrap Fix Ups Jun 11, 2018
@gambol99
Copy link
Contributor Author

/assign @justinsb ... adding the suggestions made in the original PR

@gambol99
Copy link
Contributor Author

/test pull-kops-verify-gofmt

@gambol99
Copy link
Contributor Author

/test pull-kops-verify-govet

justinsb
justinsb reviewed Jun 11, 2018
View reviewed changes
nodeup/pkg/model/context.go
@@ -313,8 +313,8 @@ func (c *NodeupModelContext) KubectlPath() string {

// BuildCertificatePairTask creates the tasks to pull down the certificate and private key
func (c *NodeupModelContext) BuildCertificatePairTask(ctx *fi.ModelBuilderContext, key, path, filename string) error {
certificateName := fmt.Sprintf("%s/%s.pem", strings.TrimSuffix(path, "/"), filename)
keyName := fmt.Sprintf("%s/%s-key.pem", strings.TrimSuffix(path, "/"), filename)
certificateName := strings.Join([]string{path, filename + ".pem"}, "/")
Copy link
Member

Choose a reason for hiding this comment

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

I actually meant filepath.Join https://golang.org/pkg/path/filepath/#Join but this works...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

aahh .. didn't know there was a filepath.Join .. actually that's better as does Clean() for us .. no need to Trim

@justinsb
Copy link
Member

/approve
/lgtm

Thanks @gambol99

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 11, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gambol99, justinsb

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:

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

@k8s-ci-robot k8s-ci-robot merged commit d9694a2 into kubernetes:master Jun 12, 2018
@gambol99 gambol99 deleted the node_auth_fixup branch February 22, 2019 09:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinsb justinsb justinsb left review comments

Assignees

@justinsb justinsb

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@gambol99 @justinsb @k8s-ci-robot