remove _master_dns tag; we rely on DNS

This commit is contained in:
Justin Santa Barbara 2016-10-11 00:29:18 -04:00
parent 304c966df7
commit 7c37b096e3
3 changed files with 0 additions and 16 deletions

View File

@ -49,13 +49,10 @@ securityGroupRule/https-elb-to-master:
toPort: 443
{{ if HasTag "_master_dns" }}
# Master name -> ELB
dnsName/{{ .MasterPublicName }}:
Zone: dnsZone/{{ .DNSZone }}
ResourceType: "A"
TargetLoadBalancer: loadBalancer/api.{{ ClusterName }}
{{ end }}

View File

@ -9,12 +9,3 @@ keypair/master:
- "{{ .MasterPublicName }}"
- "{{ .MasterInternalName }}"
- "{{ WellKnownServiceIP 1 }}"
{{ if not (HasTag "_master_dns") }}
{{ if eq .CloudProvider "aws" }}
alternateNameTasks:
- elasticIP/kubernetes-master-{{ ClusterName }}
{{ else if eq .CloudProvider "gce" }}
alternateNameTasks:
- ipAddress/kubernetes-master-{{ ClusterName }}
{{ end }}
{{ end }}

View File

@ -39,10 +39,6 @@ func buildCloudupTags(cluster *api.Cluster) (map[string]struct{}, error) {
tags["_not_master_lb"] = struct{}{}
}
if cluster.Spec.MasterPublicName != "" {
tags["_master_dns"] = struct{}{}
}
if fi.BoolValue(cluster.Spec.IsolateMasters) {
tags["_isolate_masters"] = struct{}{}
}