Fixing naming convention and adding running API machinery.

cmd/kops/integration_test.go

@@ -79,9 +79,9 @@ func TestMinimalCloudformation(t *testing.T) {
 	runTestCloudformation(t, "minimal.example.com", "minimal-cloudformation", "v1alpha2", false)
 }
 
-// TestMiniExtraUserData runs the test on passing additional user-data to an instance at bootstrap.
-func TestExtraUserData(t *testing.T) {
-	runTestCloudformation(t, "extrauserdata.example.com", "extra_user-data", "v1alpha2", false)
+// TestAdditionalUserData runs the test on passing additional user-data to an instance at bootstrap.
+func TestAdditionalUserData(t *testing.T) {
+	runTestCloudformation(t, "additionaluserdata.example.com", "additional_user-data", "v1alpha2", false)
 }
 
 // TestMinimal_141 runs the test on a configuration from 1.4.1 release

pkg/apis/kops/instancegroup.go

@@ -109,12 +109,12 @@ type InstanceGroupSpec struct {
 	Kubelet *KubeletConfigSpec `json:"kubelet,omitempty"`
 	// Taints indicates the kubernetes taints for nodes in this group
 	Taints []string `json:"taints,omitempty"`
-	// ExtraUserData is any extra user-data to be passed to the host
-	ExtraUserData []ExtraUserDataSpec `json:"extraUserData,omitempty"`
+	// AdditionalUserData is any aditional user-data to be passed to the host
+	AdditionalUserData []UserData `json:"additionalUserData,omitempty"`
 }
 
-// ExtraUserDataSpec defines a user-data section
-type ExtraUserDataSpec struct {
+// UserData defines a user-data section
+type UserData struct {
 	// Name is the name of the user-data
 	Name string `json:"name,omitempty"`
 	// Type is the type of user-data

pkg/apis/kops/v1alpha1/instancegroup.go

@@ -89,15 +89,15 @@ type InstanceGroupSpec struct {
 	Kubelet *KubeletConfigSpec `json:"kubelet,omitempty"`
 	// Taints indicates the kubernetes taints for nodes in this group
 	Taints []string `json:"taints,omitempty"`
-	// ExtraUserData is any extra user-data to be passed to the host
-	ExtraUserData []ExtraUserDataSpec `json:"extraUserData,omitempty"`
+	// AdditionalUserData is any aditional user-data to be passed to the host
+	AdditionalUserData []UserData `json:"additionalUserData,omitempty"`
 	// Zones is the names of the Zones where machines in this instance group should be placed
 	// This is needed for regional subnets (e.g. GCE), to restrict placement to particular zones
 	Zones []string `json:"zones,omitempty"`
 }
 
-// ExtraUserDataSpec defines a user-data section
-type ExtraUserDataSpec struct {
+// UserData defines a user-data section
+type UserData struct {
 	// Name is the name of the user-data
 	Name string `json:"name,omitempty"`
 	// Type is the type of user-data

pkg/apis/kops/v1alpha1/zz_generated.conversion.go

@@ -81,8 +81,6 @@ func RegisterConversions(scheme *runtime.Scheme) error {
 		Convert_kops_ExternalDNSConfig_To_v1alpha1_ExternalDNSConfig,
 		Convert_v1alpha1_ExternalNetworkingSpec_To_kops_ExternalNetworkingSpec,
 		Convert_kops_ExternalNetworkingSpec_To_v1alpha1_ExternalNetworkingSpec,
-		Convert_v1alpha1_ExtraUserDataSpec_To_kops_ExtraUserDataSpec,
-		Convert_kops_ExtraUserDataSpec_To_v1alpha1_ExtraUserDataSpec,
 		Convert_v1alpha1_Federation_To_kops_Federation,
 		Convert_kops_Federation_To_v1alpha1_Federation,
 		Convert_v1alpha1_FederationList_To_kops_FederationList,
@@ -141,6 +139,8 @@ func RegisterConversions(scheme *runtime.Scheme) error {
 		Convert_kops_SSHCredentialList_To_v1alpha1_SSHCredentialList,
 		Convert_v1alpha1_SSHCredentialSpec_To_kops_SSHCredentialSpec,
 		Convert_kops_SSHCredentialSpec_To_v1alpha1_SSHCredentialSpec,
+		Convert_v1alpha1_UserData_To_kops_UserData,
+		Convert_kops_UserData_To_v1alpha1_UserData,
 		Convert_v1alpha1_WeaveNetworkingSpec_To_kops_WeaveNetworkingSpec,
 		Convert_kops_WeaveNetworkingSpec_To_v1alpha1_WeaveNetworkingSpec,
 	)
@@ -589,7 +589,6 @@ func autoConvert_v1alpha1_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out *
 	out.Project = in.Project
 	out.MasterPublicName = in.MasterPublicName
 	out.MasterInternalName = in.MasterInternalName
-	out.AdditionalSANs = in.AdditionalSANs
 	out.NetworkCIDR = in.NetworkCIDR
 	out.NetworkID = in.NetworkID
 	if in.Topology != nil {
@@ -605,6 +604,7 @@ func autoConvert_v1alpha1_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out *
 	out.KeyStore = in.KeyStore
 	out.ConfigStore = in.ConfigStore
 	out.DNSZone = in.DNSZone
+	out.AdditionalSANs = in.AdditionalSANs
 	out.ClusterDNSDomain = in.ClusterDNSDomain
 	// WARNING: in.Multizone requires manual conversion: does not exist in peer-type
 	out.ServiceClusterIPRange = in.ServiceClusterIPRange
@@ -824,7 +824,6 @@ func autoConvert_kops_ClusterSpec_To_v1alpha1_ClusterSpec(in *kops.ClusterSpec,
 	out.Project = in.Project
 	out.MasterPublicName = in.MasterPublicName
 	out.MasterInternalName = in.MasterInternalName
-	out.AdditionalSANs = in.AdditionalSANs
 	out.NetworkCIDR = in.NetworkCIDR
 	out.NetworkID = in.NetworkID
 	if in.Topology != nil {
@@ -840,6 +839,7 @@ func autoConvert_kops_ClusterSpec_To_v1alpha1_ClusterSpec(in *kops.ClusterSpec,
 	out.KeyStore = in.KeyStore
 	out.ConfigStore = in.ConfigStore
 	out.DNSZone = in.DNSZone
+	out.AdditionalSANs = in.AdditionalSANs
 	out.ClusterDNSDomain = in.ClusterDNSDomain
 	out.ServiceClusterIPRange = in.ServiceClusterIPRange
 	out.NonMasqueradeCIDR = in.NonMasqueradeCIDR
@@ -1303,30 +1303,6 @@ func Convert_kops_ExternalNetworkingSpec_To_v1alpha1_ExternalNetworkingSpec(in *
 	return autoConvert_kops_ExternalNetworkingSpec_To_v1alpha1_ExternalNetworkingSpec(in, out, s)
 }
 
-func autoConvert_v1alpha1_ExtraUserDataSpec_To_kops_ExtraUserDataSpec(in *ExtraUserDataSpec, out *kops.ExtraUserDataSpec, s conversion.Scope) error {
-	out.Name = in.Name
-	out.Type = in.Type
-	out.Content = in.Content
-	return nil
-}
-
-// Convert_v1alpha1_ExtraUserDataSpec_To_kops_ExtraUserDataSpec is an autogenerated conversion function.
-func Convert_v1alpha1_ExtraUserDataSpec_To_kops_ExtraUserDataSpec(in *ExtraUserDataSpec, out *kops.ExtraUserDataSpec, s conversion.Scope) error {
-	return autoConvert_v1alpha1_ExtraUserDataSpec_To_kops_ExtraUserDataSpec(in, out, s)
-}
-
-func autoConvert_kops_ExtraUserDataSpec_To_v1alpha1_ExtraUserDataSpec(in *kops.ExtraUserDataSpec, out *ExtraUserDataSpec, s conversion.Scope) error {
-	out.Name = in.Name
-	out.Type = in.Type
-	out.Content = in.Content
-	return nil
-}
-
-// Convert_kops_ExtraUserDataSpec_To_v1alpha1_ExtraUserDataSpec is an autogenerated conversion function.
-func Convert_kops_ExtraUserDataSpec_To_v1alpha1_ExtraUserDataSpec(in *kops.ExtraUserDataSpec, out *ExtraUserDataSpec, s conversion.Scope) error {
-	return autoConvert_kops_ExtraUserDataSpec_To_v1alpha1_ExtraUserDataSpec(in, out, s)
-}
-
 func autoConvert_v1alpha1_Federation_To_kops_Federation(in *Federation, out *kops.Federation, s conversion.Scope) error {
 	out.ObjectMeta = in.ObjectMeta
 	if err := Convert_v1alpha1_FederationSpec_To_kops_FederationSpec(&in.Spec, &out.Spec, s); err != nil {
@@ -1707,16 +1683,16 @@ func autoConvert_v1alpha1_InstanceGroupSpec_To_kops_InstanceGroupSpec(in *Instan
 		out.Kubelet = nil
 	}
 	out.Taints = in.Taints
-	if in.ExtraUserData != nil {
-		in, out := &in.ExtraUserData, &out.ExtraUserData
-		*out = make([]kops.ExtraUserDataSpec, len(*in))
+	if in.AdditionalUserData != nil {
+		in, out := &in.AdditionalUserData, &out.AdditionalUserData
+		*out = make([]kops.UserData, len(*in))
 		for i := range *in {
-			if err := Convert_v1alpha1_ExtraUserDataSpec_To_kops_ExtraUserDataSpec(&(*in)[i], &(*out)[i], s); err != nil {
+			if err := Convert_v1alpha1_UserData_To_kops_UserData(&(*in)[i], &(*out)[i], s); err != nil {
 				return err
 			}
 		}
 	} else {
-		out.ExtraUserData = nil
+		out.AdditionalUserData = nil
 	}
 	out.Zones = in.Zones
 	return nil
@@ -1772,16 +1748,16 @@ func autoConvert_kops_InstanceGroupSpec_To_v1alpha1_InstanceGroupSpec(in *kops.I
 		out.Kubelet = nil
 	}
 	out.Taints = in.Taints
-	if in.ExtraUserData != nil {
-		in, out := &in.ExtraUserData, &out.ExtraUserData
-		*out = make([]ExtraUserDataSpec, len(*in))
+	if in.AdditionalUserData != nil {
+		in, out := &in.AdditionalUserData, &out.AdditionalUserData
+		*out = make([]UserData, len(*in))
 		for i := range *in {
-			if err := Convert_kops_ExtraUserDataSpec_To_v1alpha1_ExtraUserDataSpec(&(*in)[i], &(*out)[i], s); err != nil {
+			if err := Convert_kops_UserData_To_v1alpha1_UserData(&(*in)[i], &(*out)[i], s); err != nil {
 				return err
 			}
 		}
 	} else {
-		out.ExtraUserData = nil
+		out.AdditionalUserData = nil
 	}
 	return nil
 }
@@ -2654,6 +2630,30 @@ func Convert_kops_SSHCredentialSpec_To_v1alpha1_SSHCredentialSpec(in *kops.SSHCr
 	return autoConvert_kops_SSHCredentialSpec_To_v1alpha1_SSHCredentialSpec(in, out, s)
 }
 
+func autoConvert_v1alpha1_UserData_To_kops_UserData(in *UserData, out *kops.UserData, s conversion.Scope) error {
+	out.Name = in.Name
+	out.Type = in.Type
+	out.Content = in.Content
+	return nil
+}
+
+// Convert_v1alpha1_UserData_To_kops_UserData is an autogenerated conversion function.
+func Convert_v1alpha1_UserData_To_kops_UserData(in *UserData, out *kops.UserData, s conversion.Scope) error {
+	return autoConvert_v1alpha1_UserData_To_kops_UserData(in, out, s)
+}
+
+func autoConvert_kops_UserData_To_v1alpha1_UserData(in *kops.UserData, out *UserData, s conversion.Scope) error {
+	out.Name = in.Name
+	out.Type = in.Type
+	out.Content = in.Content
+	return nil
+}
+
+// Convert_kops_UserData_To_v1alpha1_UserData is an autogenerated conversion function.
+func Convert_kops_UserData_To_v1alpha1_UserData(in *kops.UserData, out *UserData, s conversion.Scope) error {
+	return autoConvert_kops_UserData_To_v1alpha1_UserData(in, out, s)
+}
+
 func autoConvert_v1alpha1_WeaveNetworkingSpec_To_kops_WeaveNetworkingSpec(in *WeaveNetworkingSpec, out *kops.WeaveNetworkingSpec, s conversion.Scope) error {
 	out.MTU = in.MTU
 	return nil

pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go

@@ -21,10 +21,11 @@ limitations under the License.
 package v1alpha1
 
 import (
+	reflect "reflect"
+
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
-	reflect "reflect"
 )
 
 func init() {
@@ -137,10 +138,6 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
 			in.(*ExternalNetworkingSpec).DeepCopyInto(out.(*ExternalNetworkingSpec))
 			return nil
 		}, InType: reflect.TypeOf(&ExternalNetworkingSpec{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*ExtraUserDataSpec).DeepCopyInto(out.(*ExtraUserDataSpec))
-			return nil
-		}, InType: reflect.TypeOf(&ExtraUserDataSpec{})},
 		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
 			in.(*Federation).DeepCopyInto(out.(*Federation))
 			return nil
@@ -261,6 +258,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
 			in.(*TopologySpec).DeepCopyInto(out.(*TopologySpec))
 			return nil
 		}, InType: reflect.TypeOf(&TopologySpec{})},
+		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
+			in.(*UserData).DeepCopyInto(out.(*UserData))
+			return nil
+		}, InType: reflect.TypeOf(&UserData{})},
 		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
 			in.(*WeaveNetworkingSpec).DeepCopyInto(out.(*WeaveNetworkingSpec))
 			return nil
@@ -762,6 +763,11 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
 			(*in).DeepCopyInto(*out)
 		}
 	}
+	if in.AdditionalSANs != nil {
+		in, out := &in.AdditionalSANs, &out.AdditionalSANs
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
 	if in.Multizone != nil {
 		in, out := &in.Multizone, &out.Multizone
 		if *in == nil {
@@ -1398,22 +1404,6 @@ func (in *ExternalNetworkingSpec) DeepCopy() *ExternalNetworkingSpec {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ExtraUserDataSpec) DeepCopyInto(out *ExtraUserDataSpec) {
-	*out = *in
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExtraUserDataSpec.
-func (in *ExtraUserDataSpec) DeepCopy() *ExtraUserDataSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(ExtraUserDataSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Federation) DeepCopyInto(out *Federation) {
 	*out = *in
@@ -1795,9 +1785,9 @@ func (in *InstanceGroupSpec) DeepCopyInto(out *InstanceGroupSpec) {
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
-	if in.ExtraUserData != nil {
-		in, out := &in.ExtraUserData, &out.ExtraUserData
-		*out = make([]ExtraUserDataSpec, len(*in))
+	if in.AdditionalUserData != nil {
+		in, out := &in.AdditionalUserData, &out.AdditionalUserData
+		*out = make([]UserData, len(*in))
 		copy(*out, *in)
 	}
 	if in.Zones != nil {
@@ -2851,6 +2841,22 @@ func (in *TopologySpec) DeepCopy() *TopologySpec {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *UserData) DeepCopyInto(out *UserData) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserData.
+func (in *UserData) DeepCopy() *UserData {
+	if in == nil {
+		return nil
+	}
+	out := new(UserData)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *WeaveNetworkingSpec) DeepCopyInto(out *WeaveNetworkingSpec) {
 	*out = *in

pkg/apis/kops/v1alpha2/instancegroup.go

@@ -101,12 +101,12 @@ type InstanceGroupSpec struct {
 	Kubelet *KubeletConfigSpec `json:"kubelet,omitempty"`
 	// Taints indicates the kubernetes taints for nodes in this group
 	Taints []string `json:"taints,omitempty"`
-	// ExtraUserData is any extra user-data to be passed to the host
-	ExtraUserData []ExtraUserDataSpec `json:"extraUserData,omitempty"`
+	// AdditionalUserData is any aditional user-data to be passed to the host
+	AdditionalUserData []UserData `json:"additionalUserData,omitempty"`
 }
 
-// ExtraUserDataSpec defines a user-data section
-type ExtraUserDataSpec struct {
+// UserData defines a user-data section
+type UserData struct {
 	// Name is the name of the user-data
 	Name string `json:"name,omitempty"`
 	// Type is the type of user-data