Merge pull request #1530 from blublinsky/MCP-AdditionalToolsets

Fix IntrospectionEnabled Default, removed read only flag

Author: openshift-merge-bot[bot]

api/v1alpha1/olsconfig_types.go

@@ -206,10 +206,12 @@ type OLSSpec struct {
 	// +kubebuilder:validation:Optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="TLS Security Profile",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:advanced"}
 	TLSSecurityProfile *configv1.TLSSecurityProfile `json:"tlsSecurityProfile,omitempty"`
-	// Enable introspection features
+	// Enable introspection features (e.g. built-in OpenShift MCP server). Omitted means use the
+	// CRD default (true); explicit false disables introspection.
 	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=true
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Introspection Enabled",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"}
-	IntrospectionEnabled bool `json:"introspectionEnabled,omitempty"`
+	IntrospectionEnabled *bool `json:"introspectionEnabled,omitempty"`
 	// MCP Kubernetes server configuration
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="MCP Kube Server Configuration",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:advanced"}
 	// +kubebuilder:validation:Optional

api/v1alpha1/zz_generated.deepcopy.go

@@ -114,24 +114,6 @@ spec:
           - description: Fake Provider MCP Tool Call
             displayName: Fake Provider MCP Tool Call
             path: llm.providers[0].fakeProviderMCPToolCall
-          - description: Google Vertex Anthropic Config
-            displayName: Google Vertex Anthropic Config
-            path: llm.providers[0].googleVertexAnthropicConfig
-          - description: Server region location
-            displayName: Server Region Location
-            path: llm.providers[0].googleVertexAnthropicConfig.location
-          - description: Google Cloud project ID
-            displayName: Google Cloud Project ID
-            path: llm.providers[0].googleVertexAnthropicConfig.projectID
-          - description: Google Vertex Config
-            displayName: Google Vertex Config
-            path: llm.providers[0].googleVertexConfig
-          - description: Server region location
-            displayName: Server Region Location
-            path: llm.providers[0].googleVertexConfig.location
-          - description: Google Cloud project ID
-            displayName: Google Cloud Project ID
-            path: llm.providers[0].googleVertexConfig.projectID
           - description: List of models from the provider
             displayName: Models
             path: llm.providers[0].models

bundle/manifests/lightspeed-operator.clusterserviceversion.yaml

@@ -140,10 +140,10 @@ spec:
                                       is 2048 tokens.
                                     type: integer
                                   toolBudgetRatio:
-                                    default: 0.25
+                                    default: 0.5
                                     description: Ratio of context window size allocated
                                       for tool token budget. Must be between 0.1 and
-                                      0.5. The default is 0.25.
+                                      0.5. The default is 0.5.
                                     maximum: 0.5
                                     minimum: 0.1
                                     type: number
@@ -4412,7 +4412,10 @@ spec:
                       x-kubernetes-map-type: atomic
                     type: array
                   introspectionEnabled:
-                    description: Enable introspection features
+                    default: true
+                    description: |-
+                      Enable introspection features (e.g. built-in OpenShift MCP server). Omitted means use the
+                      CRD default (true); explicit false disables introspection.
                     type: boolean
                   logLevel:
                     default: INFO

config/crd/bases/ols.openshift.io_olsconfigs.yaml

@@ -97,7 +97,7 @@ spec:
         displayName: Max Tokens For Response
         path: llm.providers[0].models[0].parameters.maxTokensForResponse
       - description: Ratio of context window size allocated for tool token budget.
-          Must be between 0.1 and 0.5. The default is 0.25.
+          Must be between 0.1 and 0.5. The default is 0.5.
         displayName: Tool Budget Ratio
         path: llm.providers[0].models[0].parameters.toolBudgetRatio
       - description: Model API URL
@@ -233,7 +233,9 @@ spec:
           authentication
         displayName: Image Pull Secrets
         path: ols.imagePullSecrets
-      - description: Enable introspection features
+      - description: |-
+          Enable introspection features (e.g. built-in OpenShift MCP server). Omitted means use the
+          CRD default (true); explicit false disables introspection.
         displayName: Introspection Enabled
         path: ols.introspectionEnabled
         x-descriptors:

config/manifests/bases/lightspeed-operator.clusterserviceversion.yaml

@@ -220,7 +220,7 @@ func buildToolFilteringConfig(cr *olsv1alpha1.OLSConfig, mcpServers []utils.MCPS
 	if len(mcpServers) == 0 {
 		r.GetLogger().Info(
 			"ToolFilteringConfig specified but no MCP servers configured. Tool filtering will be disabled.",
-			"IntrospectionEnabled", cr.Spec.OLSConfig.IntrospectionEnabled,
+			"IntrospectionEnabled", utils.BoolDeref(cr.Spec.OLSConfig.IntrospectionEnabled, true),
 			"MCPServersCount", len(cr.Spec.MCPServers),
 		)
 		return nil
@@ -349,7 +349,7 @@ func generateMCPServerConfigs(r reconciler.Reconciler, cr *olsv1alpha1.OLSConfig
 	servers := []utils.MCPServerConfig{}
 
 	// Add OpenShift MCP server if introspection is enabled
-	if cr.Spec.OLSConfig.IntrospectionEnabled {
+	if utils.BoolDeref(cr.Spec.OLSConfig.IntrospectionEnabled, true) {
 		// Get timeout from MCPKubeServerConfig if specified, otherwise use default
 		timeout := utils.OpenShiftMCPServerTimeout
 		if cr.Spec.OLSConfig.MCPKubeServerConfig != nil && cr.Spec.OLSConfig.MCPKubeServerConfig.Timeout != 0 {