github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 14:23:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #685 from smarterclayton/error_on_empty_service

Browse Source 
Cleanly delete service without endpoints key
This commit is contained in:
Daniel Smith 2014-07-29 09:45:31 -07:00
commit e10d85efce
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/registry/etcd_registry.go
View File

@ -274,6 +274,10 @@ func (registry *EtcdRegistry) GetService(name string) (*api.Service, error) {
return &svc, nil return &svc, nil
} }
func makeServiceEndpointsKey(name string) string {
return "/registry/services/endpoints/" + name
}
// DeleteService deletes a Service specified by its name. // DeleteService deletes a Service specified by its name.
func (registry *EtcdRegistry) DeleteService(name string) error { func (registry *EtcdRegistry) DeleteService(name string) error {
key := makeServiceKey(name) key := makeServiceKey(name)
@ -284,9 +288,12 @@ func (registry *EtcdRegistry) DeleteService(name string) error {
if err != nil { if err != nil {
return err return err
} }
key = "/registry/services/endpoints/" + name key = makeServiceEndpointsKey(name)
_, err = registry.etcdClient.Delete(key, true) _, err = registry.etcdClient.Delete(key, true)
return err if !tools.IsEtcdNotFound(err) {
return err
}
return nil
} }
// UpdateService replaces an existing Service. // UpdateService replaces an existing Service.