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

minor changes

This commit is contained in:
Felix Kunde 2020-12-04 16:09:52 +01:00
parent 79f00ea8f3
commit 94eaef478d
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/postgres-operator/values-crd.yaml
View File

@ -90,7 +90,7 @@ configKubernetes:
# infrastructure_roles_secret_name: postgresql-infrastructure-roles # infrastructure_roles_secret_name: postgresql-infrastructure-roles
# list of annotation keys that can be inherited from the cluster manifest # list of annotation keys that can be inherited from the cluster manifest
# inherited_labels: # inherited_annotations:
# - owned-by # - owned-by
# list of label keys that can be inherited from the cluster manifest # list of label keys that can be inherited from the cluster manifest

10
pkg/cluster/util.go
View File

@ -271,13 +271,9 @@ func (c *Cluster) getTeamMembers(teamID string) ([]string, error) {
return members, nil return members, nil
} }
// Returns annotations used to create or list k8s objects such as pods // Returns annotations to be passed to child objects
// For backward compatibility, shouldAddExtraLabels must be false
// when listing k8s objects. See operator PR #252
func (c *Cluster) annotationsSet(annotations map[string]string) map[string]string { func (c *Cluster) annotationsSet(annotations map[string]string) map[string]string {
var result map[string]string
// allow to inherit certain labels from the 'postgres' object // allow to inherit certain labels from the 'postgres' object
if spec, err := c.GetSpec(); err == nil { if spec, err := c.GetSpec(); err == nil {
for k, v := range spec.ObjectMeta.Annotations { for k, v := range spec.ObjectMeta.Annotations {
@ -292,10 +288,10 @@ func (c *Cluster) annotationsSet(annotations map[string]string) map[string]strin
} }
if len(annotations) > 0 { if len(annotations) > 0 {
result = annotations return annotations
} }
return result return nil
} }
func (c *Cluster) waitForPodLabel(podEvents chan PodEvent, stopChan chan struct{}, role *PostgresRole) (*v1.Pod, error) { func (c *Cluster) waitForPodLabel(podEvents chan PodEvent, stopChan chan struct{}, role *PostgresRole) (*v1.Pod, error) {