mirror of https://github.com/kubernetes/kops.git
remove _master_dns tag; we rely on DNS
This commit is contained in:
parent
304c966df7
commit
7c37b096e3
|
|
@ -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 }}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 }}
|
||||
|
|
@ -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{}{}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue