make postgresql role private

pkg/cluster/cluster.go

@@ -41,7 +41,7 @@ type Config struct {
 }
 
 type kubeResources struct {
-	Service     map[PostgresRole]*v1.Service
+	Service     map[postgresRole]*v1.Service
 	Endpoint    *v1.Endpoints
 	Secrets     map[types.UID]*v1.Secret
 	Statefulset *v1beta1.StatefulSet
@@ -79,7 +79,7 @@ type compareStatefulsetResult struct {
 // New creates a new cluster. This function should be called from a controller.
 func New(cfg Config, kubeClient k8sutil.KubernetesClient, pgSpec spec.Postgresql, logger *logrus.Entry) *Cluster {
 	lg := logger.WithField("pkg", "cluster").WithField("cluster-name", pgSpec.Name)
-	k8sResources := kubeResources{Secrets: make(map[types.UID]*v1.Secret), Service: make(map[PostgresRole]*v1.Service)}
+	k8sResources := kubeResources{Secrets: make(map[types.UID]*v1.Secret), Service: make(map[postgresRole]*v1.Service)}
 	orphanDependents := true
 
 	podEventsQueue := cache.NewFIFO(func(obj interface{}) (string, error) {
@@ -183,7 +183,7 @@ func (c *Cluster) Create() error {
 	}
 	c.logger.Infof("endpoint %q has been successfully created", util.NameFromMeta(ep.ObjectMeta))
 
-	for _, role := range []PostgresRole{Master, Replica} {
+	for _, role := range []postgresRole{Master, Replica} {
 		if role == Replica && !c.Spec.ReplicaLoadBalancer {
 			continue
 		}
@@ -240,7 +240,7 @@ func (c *Cluster) Create() error {
 	return nil
 }
 
-func (c *Cluster) sameServiceWith(role PostgresRole, service *v1.Service) (match bool, reason string) {
+func (c *Cluster) sameServiceWith(role postgresRole, service *v1.Service) (match bool, reason string) {
 	//TODO: improve comparison
 	if c.Service[role].Spec.Type != service.Spec.Type {
 		return false, fmt.Sprintf("new %s service's type %q doesn't match the current one %q",
@@ -413,7 +413,7 @@ func (c *Cluster) Update(newSpec *spec.Postgresql) error {
 		c.Postgresql = *newSpec
 	}()
 
-	for _, role := range []PostgresRole{Master, Replica} {
+	for _, role := range []postgresRole{Master, Replica} {
 		if role == Replica {
 			if !newSpec.Spec.ReplicaLoadBalancer {
 				// old spec had a load balancer, but the new one doesn't
@@ -512,7 +512,7 @@ func (c *Cluster) Delete() error {
 		return fmt.Errorf("could not delete endpoint: %v", err)
 	}
 
-	for _, role := range []PostgresRole{Master, Replica} {
+	for _, role := range []postgresRole{Master, Replica} {
 		if role == Replica && !c.Spec.ReplicaLoadBalancer {
 			continue
 		}

pkg/cluster/k8sres.go

@@ -427,7 +427,7 @@ func (c *Cluster) generateSingleUserSecret(namespace string, pgUser spec.PgUser)
 	return &secret
 }
 
-func (c *Cluster) generateService(role PostgresRole, newSpec *spec.PostgresSpec) *v1.Service {
+func (c *Cluster) generateService(role postgresRole, newSpec *spec.PostgresSpec) *v1.Service {
 
 	dnsNameFunction := c.masterDNSName
 	name := c.Name

pkg/cluster/resources.go

@@ -29,7 +29,7 @@ func (c *Cluster) loadResources() error {
 		return fmt.Errorf("too many(%d) services for a cluster", len(services.Items))
 	}
 	for i, svc := range services.Items {
-		switch PostgresRole(svc.Labels[c.OpConfig.PodRoleLabel]) {
+		switch postgresRole(svc.Labels[c.OpConfig.PodRoleLabel]) {
 		case Replica:
 			c.Service[Replica] = &services.Items[i]
 		default:
@@ -230,7 +230,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.Service[role] != nil {
 		return nil, fmt.Errorf("service already exists in the cluster")
 	}
@@ -245,7 +245,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.Service[role] == nil {
 		return fmt.Errorf("there is no service in the cluster")
 	}
@@ -320,7 +320,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.Service[role] == nil {
 		return fmt.Errorf("There is no %s service in the cluster", role)

pkg/cluster/sync.go

@@ -34,7 +34,7 @@ func (c *Cluster) Sync() error {
 	}
 
 	c.logger.Debugf("Syncing services")
-	for _, role := range []PostgresRole{Master, Replica} {
+	for _, role := range []postgresRole{Master, Replica} {
 		if role == Replica && !c.Spec.ReplicaLoadBalancer {
 			if c.Service[role] != nil {
 				// delete the left over replica service
@@ -87,7 +87,7 @@ func (c *Cluster) syncSecrets() error {
 	return err
 }
 
-func (c *Cluster) syncService(role PostgresRole) error {
+func (c *Cluster) syncService(role postgresRole) error {
 	cSpec := c.Spec
 	if c.Service[role] == nil {
 		c.logger.Infof("could not find the cluster's %s service", role)

pkg/cluster/types.go

@@ -1,8 +1,8 @@
 package cluster
 
-type PostgresRole string
+type postgresRole string
 
 const (
-	Master  PostgresRole = "master"
-	Replica PostgresRole = "replica"
+	Master  postgresRole = "master"
+	Replica postgresRole = "replica"
 )

pkg/cluster/util.go

@@ -94,7 +94,7 @@ func (c *Cluster) logStatefulSetChanges(old, new *v1beta1.StatefulSet, isUpdate
 	}
 }
 
-func (c *Cluster) logServiceChanges(role PostgresRole, old, new *v1.Service, isUpdate bool, reason string) {
+func (c *Cluster) logServiceChanges(role postgresRole, old, new *v1.Service, isUpdate bool, reason string) {
 	if isUpdate {
 		c.logger.Infof("%s service %q has been changed",
 			role, util.NameFromMeta(old.ObjectMeta),
@@ -283,7 +283,7 @@ func (c *Cluster) labelsSet() labels.Set {
 	return labels.Set(lbls)
 }
 
-func (c *Cluster) roleLabelsSet(role PostgresRole) labels.Set {
+func (c *Cluster) roleLabelsSet(role postgresRole) labels.Set {
 	lbls := c.labelsSet()
 	lbls[c.OpConfig.PodRoleLabel] = string(role)
 	return lbls