Generate kubeadm cloud init code #42

chuckha · 2019-07-18T20:49:28Z

Signed-off-by: Chuck Ha [email protected]

What this PR does / why we need it:
This PR generates the control-plane-init cloud init script, but it is incomplete. I just ran out of time this week and wanted to get some code out for folks to look at and think about.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Related to #18
Closes #16

Special notes for your reviewer:
Definitely not done. Please see TODOs

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

Release note:

NONE

/cc @amy @vincepri @liztio @ncdc @detiber

k8s-ci-robot · 2019-07-18T20:49:34Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chuckha

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:

~~OWNERS~~ [chuckha]

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

controllers/control_plane_init.go

controllers/kubeadmbootstrapconfig_controller.go

fabriziopandini · 2019-07-18T21:25:56Z

/cc

controllers/kubeadmbootstrapconfig_controller.go

fabriziopandini

@chuckha my two cents.
Let me know if/how I can help in this effort

controllers/control_plane_init.go

controllers/kubeadmbootstrapconfig_controller.go

controllers/control_plane_init.go

ncdc · 2019-08-01T01:33:38Z

@chuckha do you need any help with this?

fabriziopandini · 2019-08-05T12:26:11Z

@CHA if you need some help here, I'm happy to jump in

chuckha · 2019-08-05T15:25:32Z

/assign @fabriziopandini

This is ready to unblock you!

controllers/kubeadmconfig_controller.go

locker/control_plane_init_locker.go

fabriziopandini

@chuckha thanks!
I'm ok with this change as it is- TODOs for follow-up PRs:

implement "control-plane-ready: yes" or similar mechanism to orchestrate node joining orders (and possibly drop the init-lock mechanism)
define priority/how to handle overlapping values between CAPBK and CAPI
define sanity checks about machine spec and kubeadmConfig (e.g a machine that has label control plane should reject a kubeadmConfig with JoinConfiguration.ControlPlane == false)

fabriziopandini · 2019-08-05T19:32:01Z

controllers/bootstrapdata.go

+	// TODO: sub in things in the cluster configuration like the cluster name and other data we can extract from the cluster object
+	config.Spec.ClusterConfiguration.APIVersion = "v1beta1"
+	config.Spec.ClusterConfiguration.Kind = "ClusterConfiguration"
+	clusterdata, err := json.Marshal(config.Spec.ClusterConfiguration)


@chuckha
There is a potential overlap between network settings in CAPBK.v1alpha2.KubeadmConfig.ClusterConfiguration and network settings in CAPI.v1alpha2.Cluster. What is expected behavior here? (once I know the behavior, I can fix it also in a fallow PR)

Same goes e.g for the CAPBK.controlplaneEndpoint/ CAPI.APIEndpoints

yes, you're right. I'll open a ticket to address this later

This PR generates the `kubeadm init` bootstrap data It will wait unitl the infrastructure is ready before allowing anything beyond the bootstrap control plane from joining the cluster. Signed-off-by: Chuck Ha <[email protected]>

Signed-off-by: Chuck Ha <[email protected]>

fabriziopandini · 2019-08-06T08:08:28Z

Thanks! Let's get this merged and move on with the next iteration
/lgtm

detiber · 2019-08-06T08:18:13Z

controllers/kubeadmconfig_controller.go

+			return ctrl.Result{}, err
+		}
+
+		config.Status.BootstrapData = cloudInitData


I just noticed that BootstrapData is defined as []byte, does this have implications on serialization that we need to worry about?

k8s-ci-robot requested review from amy, detiber, liztio, ncdc and vincepri July 18, 2019 20:49

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jul 18, 2019

k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 18, 2019

chuckha commented Jul 18, 2019

View reviewed changes

controllers/control_plane_init.go Outdated Show resolved Hide resolved

controllers/kubeadmbootstrapconfig_controller.go Outdated Show resolved Hide resolved

k8s-ci-robot requested a review from fabriziopandini July 18, 2019 21:25

ncdc reviewed Jul 19, 2019

View reviewed changes

controllers/kubeadmbootstrapconfig_controller.go Outdated Show resolved Hide resolved

fabriziopandini reviewed Jul 22, 2019

View reviewed changes

controllers/control_plane_init.go Outdated Show resolved Hide resolved

chuckha force-pushed the control-plane-init branch from c8aa601 to 24e888f Compare July 22, 2019 18:25

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 22, 2019

chuckha force-pushed the control-plane-init branch from 1f5af57 to 970b205 Compare July 23, 2019 14:34

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

chuckha force-pushed the control-plane-init branch from 970b205 to e2ce620 Compare August 5, 2019 14:32

chuckha changed the title ~~[WIP] Some general thoughts~~ Some general thoughts Aug 5, 2019

k8s-ci-robot removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Aug 5, 2019

chuckha force-pushed the control-plane-init branch from e2ce620 to 20c32ba Compare August 5, 2019 14:42

chuckha changed the title ~~Some general thoughts~~ Generate Control plane init code Aug 5, 2019

k8s-ci-robot assigned fabriziopandini Aug 5, 2019

ncdc reviewed Aug 5, 2019

View reviewed changes

controllers/kubeadmconfig_controller.go Show resolved Hide resolved

controllers/kubeadmconfig_controller.go Outdated Show resolved Hide resolved

locker/control_plane_init_locker.go Outdated Show resolved Hide resolved

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

fabriziopandini reviewed Aug 5, 2019

View reviewed changes

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 5, 2019

chuckha force-pushed the control-plane-init branch from 516dbee to eb761b6 Compare August 5, 2019 20:40

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

chuckha mentioned this pull request Aug 5, 2019

Define CA pair secret names #74

Closed

chuckha force-pushed the control-plane-init branch from eb761b6 to fb04d9c Compare August 5, 2019 21:15

chuckha added 2 commits August 5, 2019 18:05

Generate Controlplane Init Bootstrap data

ac0359e

This PR generates the `kubeadm init` bootstrap data It will wait unitl the infrastructure is ready before allowing anything beyond the bootstrap control plane from joining the cluster. Signed-off-by: Chuck Ha <[email protected]>

Ignore sed backups

fcd7edf

Signed-off-by: Chuck Ha <[email protected]>

chuckha force-pushed the control-plane-init branch from fb04d9c to fcd7edf Compare August 5, 2019 22:05

chuckha changed the title ~~Generate Control plane init code~~ Generate kubeadm cloud init code Aug 6, 2019

k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 6, 2019

k8s-ci-robot merged commit b60ec53 into kubernetes-retired:master Aug 6, 2019

detiber reviewed Aug 6, 2019

View reviewed changes

This was referenced Aug 6, 2019

Verify manifests script #77

Merged

Bring back AdditionalUserDataFiles #89

Merged

Generate kubeadm cloud init code #42

Generate kubeadm cloud init code #42

Uh oh!

Conversation

chuckha commented Jul 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k8s-ci-robot commented Jul 18, 2019

Uh oh!

Uh oh!

Uh oh!

fabriziopandini commented Jul 18, 2019

Uh oh!

Uh oh!

fabriziopandini left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ncdc commented Aug 1, 2019

Uh oh!

fabriziopandini commented Aug 5, 2019

Uh oh!

chuckha commented Aug 5, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fabriziopandini left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fabriziopandini Aug 5, 2019

Choose a reason for hiding this comment

Uh oh!

fabriziopandini Aug 5, 2019

Choose a reason for hiding this comment

Uh oh!

chuckha Aug 5, 2019

Choose a reason for hiding this comment

Uh oh!

chuckha Aug 5, 2019

Choose a reason for hiding this comment

Uh oh!

fabriziopandini commented Aug 6, 2019

Uh oh!

detiber Aug 6, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

chuckha commented Jul 18, 2019 •

edited

Loading

fabriziopandini left a comment •

edited

Loading