fix external service type check (#1246)

This commit is contained in:
Chris O'Haver 2017-11-22 06:17:27 -05:00 committed by Miek Gieben
parent c53968e5c4
commit 614ed4c80d
3 changed files with 5 additions and 3 deletions

View file

@ -288,6 +288,7 @@ var svcIndex = map[string][]*api.Service{
Protocol: "tcp",
Port: 80,
}},
Type: api.ServiceTypeExternalName,
},
}},
}

View file

@ -418,16 +418,15 @@ func (k *Kubernetes) findServices(r recordRequest, zone string) (services []msg.
}
// External service
if svc.Spec.ExternalName != "" {
if svc.Spec.Type == api.ServiceTypeExternalName {
s := msg.Service{Key: strings.Join([]string{zonePath, Svc, svc.Namespace, svc.Name}, "/"), Host: svc.Spec.ExternalName, TTL: k.ttl}
if t, _ := s.HostType(); t == dns.TypeCNAME {
s.Key = strings.Join([]string{zonePath, Svc, svc.Namespace, svc.Name}, "/")
services = append(services, s)
err = nil
continue
}
continue
}
// ClusterIP service

View file

@ -101,6 +101,7 @@ func (APIConnServiceTest) SvcIndex(string) []*api.Service {
Protocol: "tcp",
Port: 80,
}},
Type: api.ServiceTypeExternalName,
},
},
}
@ -144,6 +145,7 @@ func (APIConnServiceTest) ServiceList() []*api.Service {
Protocol: "tcp",
Port: 80,
}},
Type: api.ServiceTypeExternalName,
},
},
}