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

make postgresql roles public

Browse Source
This commit is contained in:
Murat Kabilov
2017-09-11 17:44:32 +02:00
parent 8b85935a7a
commit 90b49a24ba
6 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/resources.go
+11 -11
View File
@@ -19,16 +19,16 @@ func (c *Cluster) loadResources() error {
var err error
ns := c.Namespace
masterService, err := c.KubeClient.Services(ns).Get(c.serviceName(master), metav1.GetOptions{})
masterService, err := c.KubeClient.Services(ns).Get(c.serviceName(Master), metav1.GetOptions{})
if err == nil {
c.Services[master] = masterService
c.Services[Master] = masterService
} else if !k8sutil.ResourceNotFound(err) {
c.logger.Errorf("could not get master service: %v", err)
}
replicaService, err := c.KubeClient.Services(ns).Get(c.serviceName(replica), metav1.GetOptions{})
replicaService, err := c.KubeClient.Services(ns).Get(c.serviceName(Replica), metav1.GetOptions{})
if err == nil {
c.Services[replica] = replicaService
c.Services[Replica] = replicaService
} else if !k8sutil.ResourceNotFound(err) {
c.logger.Errorf("could not get replica service: %v", err)
}
@@ -214,7 +214,7 @@ func (c *Cluster) deleteStatefulSet() error {
return nil
}
func (c *Cluster) createService(role postgresRole) (*v1.Service, error) {
func (c *Cluster) createService(role PostgresRole) (*v1.Service, error) {
if c.Services[role] != nil {
return nil, fmt.Errorf("service already exists in the cluster")
}
@@ -229,7 +229,7 @@ func (c *Cluster) createService(role postgresRole) (*v1.Service, error) {
return service, nil
}
func (c *Cluster) updateService(role postgresRole, newService *v1.Service) error {
func (c *Cluster) updateService(role PostgresRole, newService *v1.Service) error {
if c.Services[role] == nil {
return fmt.Errorf("there is no service in the cluster")
}
@@ -244,7 +244,7 @@ func (c *Cluster) updateService(role postgresRole, newService *v1.Service) error
err error
)
if role == master {
if role == Master {
// for the master service we need to re-create the endpoint as well. Get the up-to-date version of
// the addresses stored in it before the service is deleted (deletion of the service removes the endpooint)
currentEndpoint, err = c.KubeClient.Endpoints(c.Services[role].Namespace).Get(c.Services[role].Name, metav1.GetOptions{})
@@ -262,7 +262,7 @@ func (c *Cluster) updateService(role postgresRole, newService *v1.Service) error
return fmt.Errorf("could not create service %q: %v", serviceName, err)
}
c.Services[role] = svc
if role == master {
if role == Master {
// create the new endpoint using the addresses obtained from the previous one
endpointSpec := c.generateMasterEndpoints(currentEndpoint.Subsets)
ep, err := c.KubeClient.Endpoints(c.Services[role].Namespace).Create(endpointSpec)
@@ -304,7 +304,7 @@ func (c *Cluster) updateService(role postgresRole, newService *v1.Service) error
return nil
}
func (c *Cluster) deleteService(role postgresRole) error {
func (c *Cluster) deleteService(role PostgresRole) error {
c.logger.Debugf("deleting service %s", role)
if c.Services[role] == nil {
return fmt.Errorf("there is no %s service in the cluster", role)
@@ -406,12 +406,12 @@ func (c *Cluster) createRoles() (err error) {
// GetServiceMaster returns cluster's kubernetes master Service
func (c *Cluster) GetServiceMaster() *v1.Service {
return c.Services[master]
return c.Services[Master]
}
// GetServiceReplica returns cluster's kubernetes replica Service
func (c *Cluster) GetServiceReplica() *v1.Service {
return c.Services[replica]
return c.Services[Replica]
}
// GetEndpoint returns cluster's kubernetes Endpoint