Merge pull request opendatahub-io#328 from openshift-cherrypick-robot…

…/cherry-pick-327-to-stable [stable] fix: add GIT_SSL_CAINFO env variable in odh-notebook-controller
red-hat-data-services · May 16, 2024 · c1da987 · c1da987
2 parents a5c807f + 68b0a3e
commit c1da987
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/components/odh-notebook-controller/controllers/notebook_controller.go b/components/odh-notebook-controller/controllers/notebook_controller.go
@@ -362,7 +362,7 @@ func (r *OpenshiftNotebookReconciler) UnsetNotebookCertConfig(notebook *nbv1.Not
 	log := r.Log.WithValues("notebook", notebook.Name, "namespace", notebook.Namespace)
 
 	// Get the notebook object
-	envVars := []string{"PIP_CERT", "REQUESTS_CA_BUNDLE", "SSL_CERT_FILE", "PIPELINES_SSL_SA_CERTS"}
+	envVars := []string{"PIP_CERT", "REQUESTS_CA_BUNDLE", "SSL_CERT_FILE", "PIPELINES_SSL_SA_CERTS", "GIT_SSL_CAINFO"}
 	notebookSpecChanged := false
 	patch := client.MergeFrom(notebook.DeepCopy())
 	copyNotebook := notebook.DeepCopy()

diff --git a/components/odh-notebook-controller/controllers/notebook_webhook.go b/components/odh-notebook-controller/controllers/notebook_webhook.go
@@ -332,6 +332,7 @@ func InjectCertConfig(notebook *nbv1.Notebook, configMapName string) error {
 		"REQUESTS_CA_BUNDLE":     configMapMountPath,
 		"SSL_CERT_FILE":          configMapMountPath,
 		"PIPELINES_SSL_SA_CERTS": configMapMountPath,
+		"GIT_SSL_CAINFO":         configMapMountPath,
 	}
 
 	notebookContainers := &notebook.Spec.Template.Spec.Containers