rename sa config

Signed-off-by: Jet Chiang <pokyuen.jetchiang-ext@solo.io>

Author: supreme-gg-gg

api/v1alpha1/mcpserver_types.go

@@ -211,7 +211,7 @@ type MCPServerStatus struct {
 }
 
 // MCPServerDeployment
-// +kubebuilder:validation:XValidation:rule="!(has(self.serviceAccountConfig) && has(self.serviceAccountName))",message="serviceAccountConfig and serviceAccountName are mutually exclusive"
+// +kubebuilder:validation:XValidation:rule="!(has(self.serviceAccount) && has(self.serviceAccountName))",message="serviceAccount and serviceAccountName are mutually exclusive"
 type MCPServerDeployment struct {
 	// Image defines the container image to to deploy the MCP server.
 	// +optional
@@ -264,9 +264,9 @@ type MCPServerDeployment struct {
 	// +optional
 	InitContainer *InitContainerConfig `json:"initContainer,omitempty"`
 
-	// ServiceAccountConfig defines the configuration for the ServiceAccount to be created.
+	// ServiceAccount defines the configuration for the ServiceAccount to be created.
 	// +optional
-	ServiceAccountConfig *ServiceAccountConfig `json:"serviceAccountConfig,omitempty"`
+	ServiceAccount *ServiceAccountConfig `json:"serviceAccount,omitempty"`
 
 	// ServiceAccountName is the name of an existing ServiceAccount to use.
 	// +optional

api/v1alpha1/zz_generated.deepcopy.go

@@ -1885,9 +1885,9 @@ spec:
                             type: string
                         type: object
                     type: object
-                  serviceAccountConfig:
-                    description: ServiceAccountConfig defines the configuration for
-                      the ServiceAccount to be created.
+                  serviceAccount:
+                    description: ServiceAccount defines the configuration for the
+                      ServiceAccount to be created.
                     properties:
                       annotations:
                         additionalProperties:
@@ -5244,9 +5244,8 @@ spec:
                     type: array
                 type: object
                 x-kubernetes-validations:
-                - message: serviceAccountConfig and serviceAccountName are mutually
-                    exclusive
-                  rule: '!(has(self.serviceAccountConfig) && has(self.serviceAccountName))'
+                - message: serviceAccount and serviceAccountName are mutually exclusive
+                  rule: '!(has(self.serviceAccount) && has(self.serviceAccountName))'
               httpTransport:
                 description: HTTPTransport defines the configuration for a Streamable
                   HTTP transport.

config/crd/bases/kagent.dev_mcpservers.yaml

@@ -746,7 +746,7 @@ var _ = ginkgo.Describe("MCPServer Controller", func() {
 					Deployment: kagentdevv1alpha1.MCPServerDeployment{
 						Image: "test-image:latest",
 						Port:  3000,
-						ServiceAccountConfig: &kagentdevv1alpha1.ServiceAccountConfig{
+						ServiceAccount: &kagentdevv1alpha1.ServiceAccountConfig{
 							Annotations: map[string]string{"foo": "bar"},
 						},
 					},

pkg/controller/mcpserver_controller_test.go

@@ -374,12 +374,12 @@ func (t *transportAdapterTranslator) translateTransportAdapterServiceAccount(
 	}
 
 	// Apply custom annotations and labels if provided
-	if server.Spec.Deployment.ServiceAccountConfig != nil {
-		if server.Spec.Deployment.ServiceAccountConfig.Annotations != nil {
-			objectMeta.Annotations = server.Spec.Deployment.ServiceAccountConfig.Annotations
+	if server.Spec.Deployment.ServiceAccount != nil {
+		if server.Spec.Deployment.ServiceAccount.Annotations != nil {
+			objectMeta.Annotations = server.Spec.Deployment.ServiceAccount.Annotations
 		}
-		if server.Spec.Deployment.ServiceAccountConfig.Labels != nil {
-			objectMeta.Labels = server.Spec.Deployment.ServiceAccountConfig.Labels
+		if server.Spec.Deployment.ServiceAccount.Labels != nil {
+			objectMeta.Labels = server.Spec.Deployment.ServiceAccount.Labels
 		}
 	}