Move etcd config for apiserver into code, set cloud provider for Digital Ocean to external

pkg/model/components/apiserver.go

@@ -100,12 +100,26 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error {
 	}
 	c.Image = image
 
+	switch kops.CloudProviderID(clusterSpec.CloudProvider) {
+	case kops.CloudProviderAWS:
+		c.CloudProvider = "aws"
+	case kops.CloudProviderGCE:
+		c.CloudProvider = "gce"
+	case kops.CloudProviderDO:
+		c.CloudProvider = "external"
+	case kops.CloudProviderVSphere:
+		c.CloudProvider = "vsphere"
+	default:
+		return fmt.Errorf("unknown cloud provider %q", clusterSpec.CloudProvider)
+	}
+
 	c.LogLevel = 2
-	c.CloudProvider = clusterSpec.CloudProvider
 	c.SecurePort = 443
 	c.Address = "127.0.0.1"
 	c.AllowPrivileged = fi.Bool(true)
 	c.ServiceClusterIPRange = clusterSpec.ServiceClusterIPRange
+	c.EtcdServers = []string{"http://127.0.0.1:4001"}
+	c.EtcdServersOverrides = []string{"/events#http://127.0.0.1:4002"}
 
 	if b.IsKubernetesGTE("1.3") && b.IsKubernetesLT("1.4") {
 		c.AdmissionControl = []string{

upup/models/config/components/kube-apiserver/kube-apiserver.options

@@ -1,5 +0,0 @@
-KubeAPIServer:
-  EtcdServers:
-  - http://127.0.0.1:4001
-  EtcdServersOverrides:
-  - /events#http://127.0.0.1:4002