revert unrelated changes
This commit is contained in:
		
							parent
							
								
									8c950cfcbf
								
							
						
					
					
						commit
						af4e8e71ae
					
				|  | @ -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 | ||||
|  |  | |||
|  | @ -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) | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue