Commit 614ed4c8 authored by Chris O'Haver's avatar Chris O'Haver Committed by Miek Gieben

fix external service type check (#1246)

parent c53968e5
......@@ -288,6 +288,7 @@ var svcIndex = map[string][]*api.Service{
Protocol: "tcp",
Port: 80,
}},
Type: api.ServiceTypeExternalName,
},
}},
}
......
......@@ -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
......
......@@ -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,
},
},
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment