Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Bring back AdditionalUserDataFiles #89

Conversation

ncdc
Copy link
Contributor

@ncdc ncdc commented Aug 6, 2019

Signed-off-by: Andy Goldstein [email protected]

What this PR does / why we need it:
Bring back what was accidentally removed in #42.

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 #

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:

NONE

@ncdc ncdc added this to the v0.1 milestone Aug 6, 2019
@ncdc ncdc requested a review from chuckha August 6, 2019 15:50
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 6, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ncdc

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 6, 2019
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 6, 2019
@ncdc
Copy link
Contributor Author

ncdc commented Aug 6, 2019

@amy this will fix the manifest verification failure in your PR

@@ -33,6 +33,9 @@ type KubeadmConfigSpec struct {
// JoinConfiguration is the kubeadm configuration for the join command
// +optional
JoinConfiguration *kubeadmv1beta1.JoinConfiguration `json:"joinConfiguration,omitempty"`
// AdditionalUserDataFiles specifies extra files to be passed to user_data upon creation.
// +optional
AdditionalUserDataFiles []Files `json:"additionalUserDataFiles,omitempty"`
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this need to be wired up anywhere in the cloudinit code?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes but I'm going to file another issue for that.

@detiber
Copy link
Contributor

detiber commented Aug 6, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 6, 2019
@k8s-ci-robot k8s-ci-robot merged commit 4693461 into kubernetes-retired:master Aug 6, 2019
@ncdc ncdc mentioned this pull request Aug 6, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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 Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants