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

revert unrelated changes

This commit is contained in:
Felix Kunde 2022-03-23 14:55:06 +01:00
parent 8c950cfcbf
commit af4e8e71ae
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/reference/operator_parameters.md
View File

@ -289,9 +289,9 @@ configuration they are grouped under the `kubernetes` key.
* **ignored_annotations** * **ignored_annotations**
Some K8s tools inject and update annotations out of the Postgres Operator Some K8s tools inject and update annotations out of the Postgres Operator
control. This can cause rolling updates on each sync cycle of clusters. control. This can cause rolling updates on each cluster sync cycle. With
With this option you can sepecify an array of annotations keys that should this option you can specify an array of annotation keys that should be
be ignored when comparing K8s resources. The default is empty. ignored when comparing K8s resources on sync. The default is empty.
* **watched_namespace** * **watched_namespace**
The operator watches for Postgres objects in the given namespace. If not The operator watches for Postgres objects in the given namespace. If not

2
e2e/tests/test_e2e.py
View File

@ -204,7 +204,7 @@ class EndToEndTestCase(unittest.TestCase):
} }
# get node and replica (expected target of new master) # 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: try:
k8s.update_config(patch_capabilities) k8s.update_config(patch_capabilities)

1
pkg/controller/controller.go
View File

@ -186,7 +186,6 @@ func (c *Controller) modifyConfigFromEnvironment() {
if c.config.NoTeamsAPI { if c.config.NoTeamsAPI {
c.opConfig.EnableTeamsAPI = false c.opConfig.EnableTeamsAPI = false
} }
scalyrAPIKey := os.Getenv("SCALYR_API_KEY") scalyrAPIKey := os.Getenv("SCALYR_API_KEY")
if scalyrAPIKey != "" { if scalyrAPIKey != "" {
c.opConfig.ScalyrAPIKey = scalyrAPIKey c.opConfig.ScalyrAPIKey = scalyrAPIKey