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.

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

Small CSR tweaks #1758

Merged
merged 2 commits into from
Jan 27, 2022
Merged

Small CSR tweaks #1758

merged 2 commits into from
Jan 27, 2022

Conversation

kron4eg
Copy link
Member

@kron4eg kron4eg commented Jan 27, 2022

What this PR does / why we need it:
Addressing some review comments from #1750 (review)

Does this PR introduce a user-facing change?:

NONE

Signed-off-by: Artiom Diomin <kron82@gmail.com>
Signed-off-by: Artiom Diomin <kron82@gmail.com>
@kubermatic-bot kubermatic-bot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 27, 2022
Copy link
Member

@ahmedwaleedmalik ahmedwaleedmalik left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 27, 2022
@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahmedwaleedmalik, kron4eg

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

@@ -235,26 +234,26 @@ func approvePendingCSR(s *state.State, node *kubeoneapi.HostConfig, conn ssh.Con

func validateCSR(spec certificatesv1.CertificateSigningRequestSpec, node *kubeoneapi.HostConfig) error {
if fmt.Sprintf("%s:%s", nodeUser, node.Hostname) != spec.Username {
return errors.New("")
return fmt.Errorf("CSR username %q and node hostname %q do not match", spec.Username, node.Hostname)
Copy link
Member

Choose a reason for hiding this comment

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

I guess this should be errors.New instead.

Copy link
Member Author

Choose a reason for hiding this comment

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

I like Errorf better since it manifests that "format" is used

Copy link
Member

Choose a reason for hiding this comment

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

There’s also Errorf in the errors package, so we get to use same package everywhere. Just a nit though.

@xmudrii
Copy link
Member

xmudrii commented Jan 27, 2022

/lgtm cancel

@kubermatic-bot kubermatic-bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 27, 2022
@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 27, 2022
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: cb646696cfcd61e47f3dfa460e50b2a3bea2d717

@kubermatic-bot kubermatic-bot merged commit 3229c10 into kubermatic:master Jan 27, 2022
@kubermatic-bot kubermatic-bot added this to the KubeOne 1.4 milestone Jan 27, 2022
@kron4eg kron4eg deleted the small-csr-tweaks branch January 28, 2022 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants