github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages 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
commit f3cb9949a7
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/master/master.go
View File

@ -221,12 +221,12 @@ func setDefaults(c *Config) {
continue continue
} }
if ip.IsLoopback() { if ip.IsLoopback() {
glog.Infof("'%v' (%v) is a loopback address, ignoring.", ip, addrs[i]) glog.V(5).Infof("'%v' (%v) is a loopback address, ignoring.", ip, addrs[i])
continue continue
} }
found = true found = true
c.PublicAddress = ip c.PublicAddress = ip
glog.Infof("Will report %v as public IP address.", ip) glog.V(2).Infof("Will report %v as public IP address.", ip)
break break
} }
if !found { if !found {
@ -279,7 +279,7 @@ func New(c *Config) *Master {
if err != nil { if err != nil {
glog.Fatalf("Failed to generate service read-write IP for master service: %v", err) glog.Fatalf("Failed to generate service read-write IP for master service: %v", err)
} }
glog.Infof("Setting master service IPs based on PortalNet subnet to %q (read-only) and %q (read-write).", serviceReadOnlyIP, serviceReadWriteIP) glog.V(4).Infof("Setting master service IPs based on PortalNet subnet to %q (read-only) and %q (read-write).", serviceReadOnlyIP, serviceReadWriteIP)
m := &Master{ m := &Master{
client: c.Client, client: c.Client,

7
pkg/master/publish.go
View File

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