Rename DNSDomain -> ClusterDNSDomain for clarity

upup/models/cloudup/pki/master

@@ -5,7 +5,7 @@ keypair/master:
     - kubernetes
     - kubernetes.default
     - kubernetes.default.svc
-    - kubernetes.default.svc.{{ .DNSDomain }}
+    - kubernetes.default.svc.{{ .ClusterDNSDomain }}
     - "{{ .MasterPublicName }}"
     - "{{ .MasterInternalName }}"
     - "{{ WellKnownServiceIP 1 }}"

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

@@ -1,4 +1,4 @@
 KubeDNS:
   Replicas: 1
   ServerIP: {{ WellKnownServiceIP 10 }}
-  Domain: cluster.local
+  Domain: {{ .ClusterDNSDomain }}

upup/models/config/components/kubelet/kubelet.options

@@ -4,7 +4,7 @@ Kubelet:
   AllowPrivileged: true
   LogLevel: 2
   ClusterDNS: {{ WellKnownServiceIP 10 }}
-  ClusterDomain: cluster.local
+  ClusterDomain: {{ .ClusterDNSDomain }}
   ConfigureCBR0: true
   BabysitDaemons: true
   APIServers: https://{{ .MasterInternalName }}

upup/models/config/defaults.options

@@ -1,26 +1,8 @@
-#InstancePrefix: kubernetes
 Multizone: true
 
-NetworkProvider: none
-
 AdmissionControl: NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota,PersistentVolumeLabel
 
-#EnableClusterMonitoring: none
-#EnableL7LoadBalancing: none
-#EnableClusterUI: true
-
-#EnableClusterDNS: true
-#DNSReplicas: 1
-#DNSServerIP: 100.64.0.10
-DNSDomain: cluster.local
-
-#EnableClusterLogging: true
-#EnableNodeLogging: true
-#LoggingDestination: elasticsearch
-#ElasticsearchLoggingReplicas: 1
-
-#MasterVolumeSize: 20
-
+ClusterDNSDomain: cluster.local
 
 KubeUser: admin
 

upup/pkg/api/cluster.go

@@ -62,11 +62,11 @@ type ClusterSpec struct {
 	// DNSZone is the DNS zone we should use when configuring DNS
 	// This is because some clouds let us define a managed zone foo.bar, and then have
 	// kubernetes.dev.foo.bar, without needing to define dev.foo.bar as a hosted zone.
-	// DNSZone will probably be a suffix of DNSDomain
+	// DNSZone will probably be a suffix of the MasterPublicName and MasterInternalName
 	DNSZone string `json:"dnsZone,omitempty"`
 
-	// DNSDomain is the suffix we use for internal DNS names (normally cluster.local)
-	DNSDomain string `json:"dnsDomain,omitempty"`
+	// ClusterDNSDomain is the suffix we use for internal DNS names (normally cluster.local)
+	ClusterDNSDomain string `json:"clusterDNSDomain,omitempty"`
 
 	//InstancePrefix                string `json:",omitempty"`
 
@@ -75,7 +75,7 @@ type ClusterSpec struct {
 
 	//AllocateNodeCIDRs *bool `json:"allocateNodeCIDRs,omitempty"`
 
-	Multizone *bool `json:"mutlizone,omitempty"`
+	Multizone *bool `json:"multizone,omitempty"`
 
 	//ClusterIPRange                string `json:",omitempty"`
 

upup/pkg/kutil/export_cluster.go

@@ -160,7 +160,7 @@ func (x *ExportCluster) ReverseAWS() error {
 	//	return fmt.Errorf("cannot parse DNS_REPLICAS=%q: %v", conf.Settings["DNS_REPLICAS"], err)
 	//}
 	//clusterConfig.DNSServerIP = conf.Settings["DNS_SERVER_IP"]
-	cluster.Spec.DNSDomain = conf.Settings["DNS_DOMAIN"]
+	cluster.Spec.ClusterDNSDomain = conf.Settings["DNS_DOMAIN"]
 	//clusterConfig.AdmissionControl = conf.Settings["ADMISSION_CONTROL"]
 	//clusterConfig.MasterIPRange = conf.Settings["MASTER_IP_RANGE"]
 	//clusterConfig.DNSServerIP = conf.Settings["DNS_SERVER_IP"]