Merge pull request kubernetes#3385 from mdavidsen/feature/kops-add-master-public-name

Add --master-public-name argument to kops create_cluster

Author: justinsb

cmd/kops/create_cluster.go

@@ -113,6 +113,9 @@ type CreateClusterOptions struct {
 	// Specify API loadbalancer as public or internal
 	APILoadBalancerType string
 
+	// Allow custom public master name
+	MasterPublicName string
+
 	// vSphere options
 	VSphereServer        string
 	VSphereDatacenter    string
@@ -308,6 +311,9 @@ func NewCmdCreateCluster(f *util.Factory, out io.Writer) *cobra.Command {
 
 	cmd.Flags().StringVar(&options.APILoadBalancerType, "api-loadbalancer-type", options.APILoadBalancerType, "Sets the API loadbalancer type to either 'public' or 'internal'")
 
+	// Allow custom public master name
+	cmd.Flags().StringVar(&options.MasterPublicName, "master-public-name", options.MasterPublicName, "Sets the public master public name")
+
 	// DryRun mode that will print YAML or JSON
 	cmd.Flags().BoolVar(&options.DryRun, "dry-run", options.DryRun, "If true, only print the object that would be sent, without sending it. This flag can be used to create a cluster YAML or JSON manifest.")
 	cmd.Flags().StringVarP(&options.Output, "output", "o", options.Output, "Ouput format. One of json|yaml. Used with the --dry-run flag.")
@@ -902,6 +908,10 @@ func RunCreateCluster(f *util.Factory, out io.Writer, c *CreateClusterOptions) e
 		return fmt.Errorf("unknown DNSType: %q", c.DNSType)
 	}
 
+	if c.MasterPublicName != "" {
+		cluster.Spec.MasterPublicName = c.MasterPublicName
+	}
+
 	// Populate the API access, so that it can be discoverable
 	// TODO: This is the same code as in defaults - try to dedup?
 	if cluster.Spec.API == nil {

docs/cli/kops_create_cluster.md

@@ -80,6 +80,7 @@ kops create cluster
       --image string                         Image to use for all instances.
       --kubernetes-version string            Version of kubernetes to run (defaults to version in channel)
       --master-count int32                   Set the number of masters.  Defaults to one master per master-zone
+      --master-public-name string            Sets the public master public name
       --master-security-groups stringSlice   Add precreated additional security groups to masters.
       --master-size string                   Set instance size for masters
       --master-tenancy string                The tenancy of the master group on AWS. Can either be default or dedicated.