From af4e8e71ae7715e2976ae79906ef97e8a18b1b82 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Wed, 23 Mar 2022 14:55:06 +0100 Subject: [PATCH] revert unrelated changes --- docs/reference/operator_parameters.md | 6 +++--- e2e/tests/test_e2e.py | 2 +- pkg/controller/controller.go | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/reference/operator_parameters.md b/docs/reference/operator_parameters.md index 96c940949..13840231e 100644 --- a/docs/reference/operator_parameters.md +++ b/docs/reference/operator_parameters.md @@ -289,9 +289,9 @@ configuration they are grouped under the `kubernetes` key. * **ignored_annotations** Some K8s tools inject and update annotations out of the Postgres Operator - control. This can cause rolling updates on each sync cycle of clusters. - With this option you can sepecify an array of annotations keys that should - be ignored when comparing K8s resources. The default is empty. + control. This can cause rolling updates on each cluster sync cycle. With + this option you can specify an array of annotation keys that should be + ignored when comparing K8s resources on sync. The default is empty. * **watched_namespace** The operator watches for Postgres objects in the given namespace. If not diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py index 9bae875df..1edeb3bb4 100644 --- a/e2e/tests/test_e2e.py +++ b/e2e/tests/test_e2e.py @@ -204,7 +204,7 @@ class EndToEndTestCase(unittest.TestCase): } # get node and replica (expected target of new master) - master_nodes, replica_nodes = k8s.get_pg_nodes(cluster_label) + _, replica_nodes = k8s.get_pg_nodes(cluster_label) try: k8s.update_config(patch_capabilities) diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go index d62036c67..de0dec69f 100644 --- a/pkg/controller/controller.go +++ b/pkg/controller/controller.go @@ -186,7 +186,6 @@ func (c *Controller) modifyConfigFromEnvironment() { if c.config.NoTeamsAPI { c.opConfig.EnableTeamsAPI = false } - scalyrAPIKey := os.Getenv("SCALYR_API_KEY") if scalyrAPIKey != "" { c.opConfig.ScalyrAPIKey = scalyrAPIKey