public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-17 22:35:47 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into node-affinity-test-more-time

Browse Source
This commit is contained in:
Felix Kunde
2021-01-08 15:47:32 +01:00
parent 95ce49a30d b7f4cde541
commit 3a11b974d3
10 changed files with 59 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/operator_ui/spiloutils.py
+8 -2
View File
@@ -21,7 +21,7 @@ AWS_ENDPOINT = getenv('AWS_ENDPOINT')
OPERATOR_CLUSTER_NAME_LABEL = getenv('OPERATOR_CLUSTER_NAME_LABEL', 'cluster-name')
COMMON_CLUSTER_LABEL = getenv('COMMON_CLUSTER_LABEL', '{"application":"spilo"}')
COMMON_POOLER_LABEL = getenv('COMMONG_POOLER_LABEL', '{"application":"db-connection-pooler"}')
COMMON_POOLER_LABEL = getenv('COMMON_POOLER_LABEL', '{"application":"db-connection-pooler"}')
logger.info("Common Cluster Label: {}".format(COMMON_CLUSTER_LABEL))
logger.info("Common Pooler Label: {}".format(COMMON_POOLER_LABEL))
@@ -107,6 +107,12 @@ def encode_labels(label_selector):
])
def cluster_labels(spilo_cluster):
labels = COMMON_CLUSTER_LABEL
labels[OPERATOR_CLUSTER_NAME_LABEL] = spilo_cluster
return labels
def kubernetes_url(
resource_type,
namespace='default',
@@ -151,7 +157,7 @@ def read_pods(cluster, namespace, spilo_cluster):
cluster=cluster,
resource_type='pods',
namespace=namespace,
label_selector={OPERATOR_CLUSTER_NAME_LABEL: spilo_cluster},
label_selector=cluster_labels(spilo_cluster),
)