CLOUDP-351614

Author: nammn

controllers/om/deployment.go

@@ -317,6 +317,10 @@ func (d Deployment) AddMonitoring(log *zap.SugaredLogger, tls bool, caFilePath s
 			}
 
 			monitoringVersion["additionalParams"] = additionalParams
+		} else {
+			// Clear TLS params when TLS is disabled to prevent monitoring from
+			// trying to use certificate files that no longer exist
+			delete(monitoringVersion, "additionalParams")
 		}
 
 	}

controllers/om/deployment_test.go

@@ -520,16 +520,21 @@ func TestAddMonitoringTls(t *testing.T) {
 		"sslTrustedServerCertificates": util.CAFilePathInContainer,
 	}
 
-	expectedMonitoringVersions := []interface{}{
+	expectedMonitoringVersionsWithTls := []interface{}{
 		map[string]interface{}{"hostname": "my-rs-0.some.host", "name": MonitoringAgentDefaultVersion, "additionalParams": expectedAdditionalParams},
 		map[string]interface{}{"hostname": "my-rs-1.some.host", "name": MonitoringAgentDefaultVersion, "additionalParams": expectedAdditionalParams},
 		map[string]interface{}{"hostname": "my-rs-2.some.host", "name": MonitoringAgentDefaultVersion, "additionalParams": expectedAdditionalParams},
 	}
-	assert.Equal(t, expectedMonitoringVersions, d.getMonitoringVersions())
+	assert.Equal(t, expectedMonitoringVersionsWithTls, d.getMonitoringVersions())
 
-	// adding again - nothing changes
+	// disabling TLS should clear additionalParams (CLOUDP-351614)
 	d.AddMonitoring(zap.S(), false, util.CAFilePathInContainer)
-	assert.Equal(t, expectedMonitoringVersions, d.getMonitoringVersions())
+	expectedMonitoringVersionsWithoutTls := []interface{}{
+		map[string]interface{}{"hostname": "my-rs-0.some.host", "name": MonitoringAgentDefaultVersion},
+		map[string]interface{}{"hostname": "my-rs-1.some.host", "name": MonitoringAgentDefaultVersion},
+		map[string]interface{}{"hostname": "my-rs-2.some.host", "name": MonitoringAgentDefaultVersion},
+	}
+	assert.Equal(t, expectedMonitoringVersionsWithoutTls, d.getMonitoringVersions())
 }
 
 func TestAddBackup(t *testing.T) {

controllers/operator/appdbreplicaset_controller.go

@@ -1430,9 +1430,14 @@ func addMonitoring(ac *automationconfig.AutomationConfig, log *zap.SugaredLogger
 	monitoringVersions := ac.MonitoringVersions
 	for _, p := range ac.Processes {
 		found := false
-		for _, m := range monitoringVersions {
+		for i, m := range monitoringVersions {
 			if m.Hostname == p.HostName {
 				found = true
+				if !tls {
+					// Clear TLS params when TLS is disabled to prevent monitoring from
+					// trying to use certificate files that no longer exist
+					monitoringVersions[i].AdditionalParams = nil
+				}
 				break
 			}
 		}