public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-08 21:31:24 +02:00
Code Issues Projects Releases Wiki Activity

Add version label to the cluster. (#96)

Browse Source 
* Add version label to the cluster.

According to the STUPS team the daemon that exports logs to scalyr
stops the export if the version label is missing.

* Move label names to constants. 

* Run go fmt
This commit is contained in:
Oleksii Kliukin
2017-05-12 11:41:34 +02:00
committed by Murat Kabilov
parent 08c0e3b6dd
commit 47e3e29a56
4 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/util.go
+4 -4
View File
@@ -156,10 +156,10 @@ func (c *Cluster) waitPodLabelsReady() error {
LabelSelector: ls.String(),
}
masterListOption := v1.ListOptions{
LabelSelector: labels.Merge(ls, labels.Set{"spilo-role": constants.PodRoleMaster}).String(),
LabelSelector: labels.Merge(ls, labels.Set{constants.SpiloRoleLabel: constants.PodRoleMaster}).String(),
}
replicaListOption := v1.ListOptions{
LabelSelector: labels.Merge(ls, labels.Set{"spilo-role": constants.PodRoleReplica}).String(),
LabelSelector: labels.Merge(ls, labels.Set{constants.SpiloRoleLabel: constants.PodRoleReplica}).String(),
}
pods, err := c.KubeClient.Pods(namespace).List(listOptions)
if err != nil {
@@ -204,8 +204,8 @@ func (c *Cluster) waitStatefulsetPodsReady() error {
func (c *Cluster) labelsSet() labels.Set {
return labels.Set{
"application": "spilo",
"spilo-cluster": c.Metadata.Name,
constants.ApplicationNameLabel: constants.ApplicationNameLabelValue,
constants.ClusterNameLabel: c.Metadata.Name,
}
}