public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-09 23:06:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into client-go-3

Browse Source
This commit is contained in:
Murat Kabilov
2017-05-22 14:18:11 +02:00
parent 614c270c55 afce38f6f0
commit 22b18227c7
16 changed files with 206 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/controller.go
+3 -3
View File
@@ -75,12 +75,12 @@ func (c *Controller) Run(stopCh <-chan struct{}, wg *sync.WaitGroup) {
func (c *Controller) initController() {
if err := c.createTPR(); err != nil {
c.logger.Fatalf("Can't register ThirdPartyResource: %s", err)
c.logger.Fatalf("could not register ThirdPartyResource: %v", err)
}
c.TeamsAPIClient.RefreshTokenAction = c.getOAuthToken
if infraRoles, err := c.getInfrastructureRoles(); err != nil {
c.logger.Warningf("Can't get infrastructure roles: %s", err)
c.logger.Warningf("could not get infrastructure roles: %v", err)
} else {
c.InfrastructureRoles = infraRoles
}
@@ -125,7 +125,7 @@ func (c *Controller) initController() {
c.clusterEventQueues[i] = cache.NewFIFO(func(obj interface{}) (string, error) {
e, ok := obj.(spec.ClusterEvent)
if !ok {
return "", fmt.Errorf("Can't cast to ClusterEvent")
return "", fmt.Errorf("could not cast to ClusterEvent")
}
return fmt.Sprintf("%s-%s", e.EventType, e.UID), nil
pkg/controller/exec.go
+5 -5
View File
@@ -19,11 +19,11 @@ func (c *Controller) ExecCommand(podName spec.NamespacedName, command []string)
)
pod, err := c.KubeClient.Pods(podName.Namespace).Get(podName.Name, meta_v1.GetOptions{})
if err != nil {
return "", fmt.Errorf("Can't get Pod info: %s", err)
return "", fmt.Errorf("could not get pod info: %v", err)
}
if len(pod.Spec.Containers) != 1 {
return "", fmt.Errorf("Can't determine which container to use")
return "", fmt.Errorf("could not determine which container to use")
}
req := c.RestClient.Post().
@@ -40,7 +40,7 @@ func (c *Controller) ExecCommand(podName spec.NamespacedName, command []string)
exec, err := remotecommand.NewExecutor(c.RestConfig, "POST", req.URL())
if err != nil {
return "", fmt.Errorf("Failed to init executor: %s", err)
return "", fmt.Errorf("failed to init executor: %v", err)
}
err = exec.Stream(remotecommand.StreamOptions{
@@ -50,11 +50,11 @@ func (c *Controller) ExecCommand(podName spec.NamespacedName, command []string)
})
if err != nil {
return "", fmt.Errorf("Can't execute: %s", err)
return "", fmt.Errorf("could not execute: %v", err)
}
if execErr.Len() > 0 {
return "", fmt.Errorf("Stderr: %s", execErr.String())
return "", fmt.Errorf("stderr: %v", execErr.String())
}
return execOut.String(), nil
pkg/controller/pod.go
+2 -2
View File
@@ -73,7 +73,7 @@ func (c *Controller) podDelete(obj interface{}) {
}
func (c *Controller) podEventsDispatcher(stopCh <-chan struct{}) {
c.logger.Infof("Watching all Pod events")
c.logger.Infof("Watching all pod events")
for {
select {
case event := <-c.podCh:
@@ -82,7 +82,7 @@ func (c *Controller) podEventsDispatcher(stopCh <-chan struct{}) {
c.clustersMu.RUnlock()
if ok {
c.logger.Debugf("Sending %s event of Pod '%s' to the '%s' cluster channel", event.EventType, event.PodName, event.ClusterName)
c.logger.Debugf("Sending %s event of pod '%s' to the '%s' cluster channel", event.EventType, event.PodName, event.ClusterName)
go subscriber.ReceivePodEvent(event)
}
case <-stopCh:
pkg/controller/postgresql.go
+13 -13
View File
@@ -30,19 +30,19 @@ func (c *Controller) clusterListFunc(options meta_v1.ListOptions) (runtime.Objec
object, err := req.Do().Get()
if err != nil {
return nil, fmt.Errorf("Can't get list of postgresql objects: %s", err)
return nil, fmt.Errorf("could not get list of postgresql objects: %v", err)
}
objList, err := meta.ExtractList(object)
if err != nil {
return nil, fmt.Errorf("Can't extract list of postgresql objects: %s", err)
return nil, fmt.Errorf("could not extract list of postgresql objects: %v", err)
}
var activeClustersCnt, failedClustersCnt int
for _, obj := range objList {
pg, ok := obj.(*spec.Postgresql)
if !ok {
return nil, fmt.Errorf("Can't cast object to postgresql")
return nil, fmt.Errorf("could not cast object to postgresql")
}
if pg.Error != nil {
@@ -83,7 +83,7 @@ func (c *Controller) processEvent(obj interface{}) error {
event, ok := obj.(spec.ClusterEvent)
if !ok {
return fmt.Errorf("Can't cast to ClusterEvent")
return fmt.Errorf("could not cast to ClusterEvent")
}
logger := c.logger.WithField("worker", event.WorkerID)
@@ -116,7 +116,7 @@ func (c *Controller) processEvent(obj interface{}) error {
c.clustersMu.Unlock()
if err := cl.Create(stopCh); err != nil {
logger.Errorf("Can't create cluster: %s", err)
logger.Errorf("could not create cluster: %s", err)
return nil
}
@@ -129,7 +129,7 @@ func (c *Controller) processEvent(obj interface{}) error {
return nil
}
if err := cl.Update(event.NewSpec); err != nil {
logger.Errorf("Can't update cluster: %s", err)
logger.Errorf("could not update cluster: %s", err)
return nil
}
logger.Infof("Cluster '%s' has been updated", clusterName)
@@ -141,7 +141,7 @@ func (c *Controller) processEvent(obj interface{}) error {
}
if err := cl.Delete(); err != nil {
logger.Errorf("Can't delete cluster '%s': %s", clusterName, err)
logger.Errorf("could not delete cluster '%s': %s", clusterName, err)
return nil
}
close(c.stopChs[clusterName])
@@ -167,7 +167,7 @@ func (c *Controller) processEvent(obj interface{}) error {
}
if err := cl.Sync(stopCh); err != nil {
logger.Errorf("Can't sync cluster '%s': %s", clusterName, err)
logger.Errorf("could not sync cluster '%s': %s", clusterName, err)
return nil
}
@@ -206,7 +206,7 @@ func (c *Controller) queueClusterEvent(old, new *spec.Postgresql, eventType spec
}
if clusterError != nil && eventType != spec.EventDelete {
c.logger.Debugf("Skipping %s event for invalid cluster %s (reason: %s)", eventType, clusterName, clusterError)
c.logger.Debugf("Skipping %s event for invalid cluster %s (reason: %v)", eventType, clusterName, clusterError)
return
}
@@ -227,7 +227,7 @@ func (c *Controller) queueClusterEvent(old, new *spec.Postgresql, eventType spec
func (c *Controller) postgresqlAdd(obj interface{}) {
pg, ok := obj.(*spec.Postgresql)
if !ok {
c.logger.Errorf("Can't cast to postgresql spec")
c.logger.Errorf("could not cast to postgresql spec")
return
}
@@ -238,11 +238,11 @@ func (c *Controller) postgresqlAdd(obj interface{}) {
func (c *Controller) postgresqlUpdate(prev, cur interface{}) {
pgOld, ok := prev.(*spec.Postgresql)
if !ok {
c.logger.Errorf("Can't cast to postgresql spec")
c.logger.Errorf("could not cast to postgresql spec")
}
pgNew, ok := cur.(*spec.Postgresql)
if !ok {
c.logger.Errorf("Can't cast to postgresql spec")
c.logger.Errorf("could not cast to postgresql spec")
}
if pgOld.Metadata.ResourceVersion == pgNew.Metadata.ResourceVersion {
return
@@ -257,7 +257,7 @@ func (c *Controller) postgresqlUpdate(prev, cur interface{}) {
func (c *Controller) postgresqlDelete(obj interface{}) {
pg, ok := obj.(*spec.Postgresql)
if !ok {
c.logger.Errorf("Can't cast to postgresql spec")
c.logger.Errorf("could not cast to postgresql spec")
return
}
pkg/controller/util.go
+3 -3
View File
@@ -38,12 +38,12 @@ func (c *Controller) getOAuthToken() (string, error) {
if err != nil {
c.logger.Debugf("Oauth token secret name: %s", c.opConfig.OAuthTokenSecretName)
return "", fmt.Errorf("Can't get credentials Secret: %s", err)
return "", fmt.Errorf("could not get credentials secret: %v", err)
}
data := credentialsSecret.Data
if string(data["read-only-token-type"]) != "Bearer" {
return "", fmt.Errorf("Wrong token type: %s", data["read-only-token-type"])
return "", fmt.Errorf("wrong token type: %v", data["read-only-token-type"])
}
return string(data["read-only-token-secret"]), nil
@@ -94,7 +94,7 @@ func (c *Controller) getInfrastructureRoles() (result map[string]spec.PgUser, er
Get(c.opConfig.InfrastructureRolesSecretName.Name, meta_v1.GetOptions{})
if err != nil {
c.logger.Debugf("Infrastructure roles secret name: %s", c.opConfig.InfrastructureRolesSecretName)
return nil, fmt.Errorf("Can't get infrastructure roles Secret: %s", err)
return nil, fmt.Errorf("could not get infrastructure roles secret: %v", err)
}
data := infraRolesSecret.Data