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

Merge pull request #5484 from smarterclayton/dont_warn_on_existing

Browse Source 
Don't log when auto-published services and namespace exist already
This commit is contained in:
Jeff Lowdermilk
2015-03-16 09:54:19 -07:00
parent 0c84309059 893a64f2ed
commit f3cb9949a7
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/master/publish.go
View File

@@ -21,6 +21,7 @@ import (
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
"github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver"
"github.com/golang/glog"
@@ -91,6 +92,9 @@ func (m *Master) createMasterNamespaceIfNeeded(ns string) error {
},
}
_, err := m.storage["namespaces"].(apiserver.RESTCreater).Create(ctx, namespace)
if err != nil && errors.IsAlreadyExists(err) {
err = nil
}
return err
}
@@ -118,6 +122,9 @@ func (m *Master) createMasterServiceIfNeeded(serviceName string, serviceIP net.I
},
}
_, err := m.storage["services"].(apiserver.RESTCreater).Create(ctx, svc)
if err != nil && errors.IsAlreadyExists(err) {
err = nil
}
return err
}