public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert ClusterStatus -> Status rename

This commit is contained in:
Sergey Dudoladov 2019-01-03 11:55:55 +01:00
parent 7b4128d4bc
commit 7dbb654612
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apiserver/apiserver.go
View File

@ -31,7 +31,7 @@ type controllerInformer interface {
GetOperatorConfig() *config.Config GetOperatorConfig() *config.Config
GetStatus() *spec.ControllerStatus GetStatus() *spec.ControllerStatus
TeamClusterList() map[string][]spec.NamespacedName TeamClusterList() map[string][]spec.NamespacedName
ClusterStatus(team, namespace, cluster string) (*cluster.Status, error) ClusterStatus(team, namespace, cluster string) (*cluster.ClusterStatus, error)
ClusterLogs(team, namespace, cluster string) ([]*spec.LogEntry, error) ClusterLogs(team, namespace, cluster string) ([]*spec.LogEntry, error)
ClusterHistory(team, namespace, cluster string) ([]*spec.Diff, error) ClusterHistory(team, namespace, cluster string) ([]*spec.Diff, error)
ClusterDatabasesMap() map[string][]string ClusterDatabasesMap() map[string][]string

4
pkg/cluster/cluster.go
View File

@ -849,8 +849,8 @@ func (c *Cluster) GetCurrentProcess() Process {
} }
// GetStatus provides status of the cluster // GetStatus provides status of the cluster
func (c *Cluster) GetStatus() *Status { func (c *Cluster) GetStatus() *ClusterStatus {
return &Status{ return &ClusterStatus{
Cluster: c.Spec.ClusterName, Cluster: c.Spec.ClusterName,
Team: c.Spec.TeamID, Team: c.Spec.TeamID,
Status: c.Status, Status: c.Status,

4
pkg/cluster/types.go
View File

@ -52,8 +52,8 @@ type WorkerStatus struct {
CurrentProcess Process CurrentProcess Process
} }
// Status describes status of the cluster // ClusterStatus describes status of the cluster
type Status struct { type ClusterStatus struct {
Team string Team string
Cluster string Cluster string
MasterService *v1.Service MasterService *v1.Service

2
pkg/controller/logs_and_api.go
View File

@ -15,7 +15,7 @@ import (
) )
// ClusterStatus provides status of the cluster // ClusterStatus provides status of the cluster
func (c *Controller) ClusterStatus(team, namespace, cluster string) (*cluster.Status, error) { func (c *Controller) ClusterStatus(team, namespace, cluster string) (*cluster.ClusterStatus, error) {
clusterName := spec.NamespacedName{ clusterName := spec.NamespacedName{
Namespace: namespace, Namespace: namespace,