Skip OAuth proxy validation when it's disabled

astefanutti · openshift-merge-bot[bot] · commit ffc555aa5161 · 2024-04-19T09:19:52.000Z
diff --git a/pkg/controllers/raycluster_webhook.go b/pkg/controllers/raycluster_webhook.go
@@ -104,9 +104,12 @@ func (w *rayClusterWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj r
 	}
 
 	allErrors = append(allErrors, validateIngress(rayCluster)...)
-	allErrors = append(allErrors, validateOAuthProxyContainer(rayCluster)...)
-	allErrors = append(allErrors, validateOAuthProxyVolume(rayCluster)...)
-	allErrors = append(allErrors, validateHeadGroupServiceAccountName(rayCluster)...)
+
+	if ptr.Deref(w.Config.RayDashboardOAuthEnabled, true) {
+		allErrors = append(allErrors, validateOAuthProxyContainer(rayCluster)...)
+		allErrors = append(allErrors, validateOAuthProxyVolume(rayCluster)...)
+		allErrors = append(allErrors, validateHeadGroupServiceAccountName(rayCluster)...)
+	}
 
 	return warnings, allErrors.ToAggregate()
 }

Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,12 @@ func (w *rayClusterWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj r`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`allErrors = append(allErrors, validateIngress(rayCluster)...)`
`107`		`- allErrors = append(allErrors, validateOAuthProxyContainer(rayCluster)...)`
`108`		`- allErrors = append(allErrors, validateOAuthProxyVolume(rayCluster)...)`
`109`		`- allErrors = append(allErrors, validateHeadGroupServiceAccountName(rayCluster)...)`
	`107`	`+`
	`108`	`+ if ptr.Deref(w.Config.RayDashboardOAuthEnabled, true) {`
	`109`	`+ allErrors = append(allErrors, validateOAuthProxyContainer(rayCluster)...)`
	`110`	`+ allErrors = append(allErrors, validateOAuthProxyVolume(rayCluster)...)`
	`111`	`+ allErrors = append(allErrors, validateHeadGroupServiceAccountName(rayCluster)...)`
	`112`	`+ }`
`110`	`113`
`111`	`114`	`return warnings, allErrors.ToAggregate()`
`112`	`115`	`}`