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 join #355

Merged
merged 1 commit into from
Nov 5, 2018
Merged

Node join #355

merged 1 commit into from
Nov 5, 2018

Conversation

vincepri
Copy link
Member

@vincepri vincepri commented Nov 1, 2018 •
edited
Loading

What this PR does / why we need it:

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 #266

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

Release note:

@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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 1, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri

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 added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Nov 1, 2018
chuckha
chuckha reviewed Nov 1, 2018
View reviewed changes
Copy link
Contributor

@chuckha chuckha left a comment

Choose a reason for hiding this comment

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

first pass

pkg/cloud/aws/services/interfaces.go Outdated Show resolved Hide resolved
pkg/cloud/aws/services/userdata/bastion.go Outdated Show resolved Hide resolved
pkg/cloud/aws/services/userdata/bastion.go Outdated Show resolved Hide resolved
pkg/cloud/aws/services/userdata/bastion.go Show resolved Hide resolved
pkg/cloud/aws/services/userdata/bastion.go Outdated Show resolved Hide resolved
pkg/cloud/aws/services/userdata/controlplane.go Show resolved Hide resolved
pkg/cloud/aws/services/userdata/controlplane.go Show resolved Hide resolved
pkg/cloud/aws/services/userdata/node.go Show resolved Hide resolved
pkg/cloud/aws/services/userdata/userdata.go Show resolved Hide resolved
pkg/deployer/deployer.go
@@ -0,0 +1,91 @@
package deployer
Copy link
Contributor

Choose a reason for hiding this comment

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

please add tests for this. they don't have to be comprehensive, just basic tests that will let us add new tests in future as bugs come up

This comment was marked as resolved.

Sign in to view

Copy link
Member Author

Choose a reason for hiding this comment

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

Can I open an issue to add tests and address it later? This PR is already kinda big

Copy link
Contributor

Choose a reason for hiding this comment

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

yeah fine with me

detiber
detiber reviewed Nov 1, 2018
View reviewed changes
pkg/cloud/aws/services/ec2/instances.go Outdated Show resolved Hide resolved
pkg/cloud/aws/services/userdata/node.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Nov 2, 2018
@vincepri
Copy link
Member Author

vincepri commented Nov 2, 2018

@chuckha @detiber ptal :)

detiber
detiber reviewed Nov 2, 2018
View reviewed changes
config/manager/manager.yaml Outdated Show resolved Hide resolved
pkg/cloud/aws/services/userdata/node.go Outdated Show resolved Hide resolved
pkg/cloud/aws/services/userdata/node.go Show resolved Hide resolved
@vincepri vincepri force-pushed the node-join branch 3 times, most recently from 1e38e64 to 486b269 Compare November 3, 2018 00:41
chuckha
chuckha reviewed Nov 5, 2018
View reviewed changes
Copy link
Contributor

@chuckha chuckha left a comment

Choose a reason for hiding this comment

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

Looking even better!

In future it would help a bit if you put vendor/generated code in one commit and all the other stuff in another commit, but i don't think it was too bad in this case

pkg/apis/awsprovider/v1alpha1/awsclusterproviderconfig_types.go
@@ -35,6 +35,12 @@ type AWSClusterProviderConfig struct {

// SSHKeyName is the name of the ssh key to attach to the bastion host.
SSHKeyName string `json:"sshKeyName,omitempty"`

// CACertificate is a PEM encoded CA Certificate for the control plane nodes.
CACertificate []byte `json:"caCertificate,omitempty"`
Copy link
Contributor

Choose a reason for hiding this comment

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

What's the reason for moving this to config from status?

Copy link
Member

Choose a reason for hiding this comment

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

Total hack for #348

Copy link
Member

Choose a reason for hiding this comment

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

That, but it does allow for a user to override the CA material for a cluster... In the future we may want to extend this to a type that could be either defined inline or a reference to an external source of truth (k8s secret, aws ssm, etc)

Copy link
Member Author

@vincepri vincepri Nov 5, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

In addition to the other points, it also allows to retain the certificates on pivot, which wasn't happening before.

pkg/deployer/deployer.go
@@ -0,0 +1,91 @@
package deployer

This comment was marked as resolved.

Sign in to view

pkg/cloud/aws/actuators/machine/actuator.go Show resolved Hide resolved
pkg/cloud/aws/services/userdata/node.go Outdated Show resolved Hide resolved
pkg/cloud/aws/services/userdata/controlplane.go Outdated Show resolved Hide resolved
pkg/cloud/aws/services/userdata/node.go Show resolved Hide resolved
pkg/cloud/aws/services/userdata/node.go Outdated Show resolved Hide resolved
pkg/cloud/aws/services/userdata/userdata.go Outdated Show resolved Hide resolved
pkg/tokens/tokens.go Show resolved Hide resolved
pkg/tokens/tokens.go Outdated Show resolved Hide resolved
@vincepri vincepri changed the title WIP: Node join Node join Nov 5, 2018
@k8s-ci-robot 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 5, 2018
@liztio
Copy link
Contributor

liztio commented Nov 5, 2018

/test pull-cluster-api-provider-aws-bazel-tes

@chuckha
Copy link
Contributor

chuckha commented Nov 5, 2018

/test pull-cluster-api-provider-aws-bazel-test

@vincepri vincepri force-pushed the node-join branch 2 times, most recently from f410495 to c59cb5b Compare November 5, 2018 18:05
detiber
detiber reviewed Nov 5, 2018
View reviewed changes
scripts/ci-bazel-test.sh Outdated Show resolved Hide resolved
@vincepri
Node join
1cb7e54 
Signed-off-by: Vince Prignano <[email protected]>
@detiber
Copy link
Member

detiber commented Nov 5, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 5, 2018
@k8s-ci-robot k8s-ci-robot merged commit 6e9b788 into kubernetes-sigs:master Nov 5, 2018
This was referenced Nov 9, 2018
Closed
Merged
@vincepri vincepri deleted the node-join branch July 26, 2019 17:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@randomvariable randomvariable randomvariable left review comments

@detiber detiber detiber left review comments

@chuckha chuckha chuckha left review comments

@d-nishi d-nishi Awaiting requested review from d-nishi

@ingvagabund ingvagabund Awaiting requested review from ingvagabund

Assignees

@detiber detiber

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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Functional node join
6 participants
@vincepri @k8s-ci-robot @liztio @chuckha @detiber @randomvariable