Merge pull request #89 from ncdc/additional-user-data-files-redux

k8s-ci-robot · web-flow · commit 4693461fb16c · 2019-08-06T08:53:55.000-07:00
Bring back AdditionalUserDataFiles
diff --git a/api/v1alpha2/kubeadmbootstrapconfig_types.go b/api/v1alpha2/kubeadmbootstrapconfig_types.go
@@ -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"`
 }
 
 // KubeadmConfigStatus defines the observed state of KubeadmConfig
diff --git a/api/v1alpha2/zz_generated.deepcopy.go b/api/v1alpha2/zz_generated.deepcopy.go
@@ -117,6 +117,11 @@ func (in *KubeadmConfigSpec) DeepCopyInto(out *KubeadmConfigSpec) {
 		*out = new(v1beta1.JoinConfiguration)
 		(*in).DeepCopyInto(*out)
 	}
+	if in.AdditionalUserDataFiles != nil {
+		in, out := &in.AdditionalUserDataFiles, &out.AdditionalUserDataFiles
+		*out = make([]Files, len(*in))
+		copy(*out, *in)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubeadmConfigSpec.

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,9 @@ type KubeadmConfigSpec struct {`
`33`	`33`	`// JoinConfiguration is the kubeadm configuration for the join command`
`34`	`34`	`// +optional`
`35`	`35`	JoinConfiguration *kubeadmv1beta1.JoinConfiguration `json:"joinConfiguration,omitempty"`
	`36`	`+ // AdditionalUserDataFiles specifies extra files to be passed to user_data upon creation.`
	`37`	`+ // +optional`
	`38`	+ AdditionalUserDataFiles []Files `json:"additionalUserDataFiles,omitempty"`
`36`	`39`	`}`
`37`	`40`
`38`	`41`	`// KubeadmConfigStatus defines the observed state of KubeadmConfig`
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,11 @@ func (in KubeadmConfigSpec) DeepCopyInto(out KubeadmConfigSpec) {`
`117`	`117`	`*out = new(v1beta1.JoinConfiguration)`
`118`	`118`	`(in).DeepCopyInto(out)`
`119`	`119`	`}`
	`120`	`+ if in.AdditionalUserDataFiles != nil {`
	`121`	`+ in, out := &in.AdditionalUserDataFiles, &out.AdditionalUserDataFiles`
	`122`	`+ out = make([]Files, len(in))`
	`123`	`+ copy(out, in)`
	`124`	`+ }`
`120`	`125`	`}`
`121`	`126`
`122`	`127`	`// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubeadmConfigSpec.`