RHOAIENG-15743: fix(odh-nbc): trim ca-bundle certData to avoid loggin…

…g scary messages
jiridanek · Nov 15, 2024 · 3cc53ab · 3cc53ab
1 parent e7980b1
commit 3cc53ab
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/components/odh-notebook-controller/controllers/notebook_controller.go b/components/odh-notebook-controller/controllers/notebook_controller.go
@@ -283,6 +283,9 @@ func (r *OpenshiftNotebookReconciler) CreateNotebookCertConfigMap(notebook *nbv1
 		for _, certFile := range configMapFileNames[configMapName] {
 
 			certData, ok := configMap.Data[certFile]
+			// RHOAIENG-15743: opendatahub-operator#1339 started adding '\n' unconditionally, which
+			// is breaking our `== ""` checks below. Trim the certData again.
+			certData = strings.TrimSpace(certData)
 			// If ca-bundle.crt is not found in the ConfigMap odh-trusted-ca-bundle
 			// no need to create the workbench-trusted-ca-bundle, as it is created
 			// by annotation inject-ca-bundle: "true"