Merge pull request #662 from ada333/Issue-632

openshift-merge-bot[bot] · web-flow · commit d6055d94c94e · 2025-07-22T09:23:42.000Z
Add logging for INJECT_CLUSTER_PROXY_ENV parse errors
diff --git a/components/odh-notebook-controller/controllers/notebook_webhook.go b/components/odh-notebook-controller/controllers/notebook_webhook.go
@@ -392,9 +392,11 @@ func (w *NotebookWebhook) Handle(ctx context.Context, req admission.Request) adm
 	if raw, ok := os.LookupEnv("INJECT_CLUSTER_PROXY_ENV"); ok {
 		if val, err := strconv.ParseBool(strings.TrimSpace(raw)); err == nil {
 			injectClusterProxy = val
+		} else {
+			log.Info("Failed to parse INJECT_CLUSTER_PROXY_ENV as boolean, defaulting to false", "value", raw, "error", err)
 		}
 	}
-	if w.ClusterWideProxyIsEnabled() && injectClusterProxy {
+	if injectClusterProxy && w.ClusterWideProxyIsEnabled() {
 		err = InjectProxyConfigEnvVars(notebook)
 		if err != nil {
 			return admission.Errored(http.StatusInternalServerError, err)

Original file line number	Diff line number	Diff line change
`@@ -392,9 +392,11 @@ func (w *NotebookWebhook) Handle(ctx context.Context, req admission.Request) adm`
`392`	`392`	`if raw, ok := os.LookupEnv("INJECT_CLUSTER_PROXY_ENV"); ok {`
`393`	`393`	`if val, err := strconv.ParseBool(strings.TrimSpace(raw)); err == nil {`
`394`	`394`	`injectClusterProxy = val`
	`395`	`+ } else {`
	`396`	`+ log.Info("Failed to parse INJECT_CLUSTER_PROXY_ENV as boolean, defaulting to false", "value", raw, "error", err)`
`395`	`397`	`}`
`396`	`398`	`}`
`397`		`- if w.ClusterWideProxyIsEnabled() && injectClusterProxy {`
	`399`	`+ if injectClusterProxy && w.ClusterWideProxyIsEnabled() {`
`398`	`400`	`err = InjectProxyConfigEnvVars(notebook)`
`399`	`401`	`if err != nil {`
`400`	`402`	`return admission.Errored(http.StatusInternalServerError, err)`