CLOUDP-299766: support serverless with flex (#2107)

* support serverless with flex

* test/helper/e2e switch to flex for basic deployment

* fix helm test fixtures

* remove deployment contract test as it relies on released AKO version

Author: s-urbaniak

.github/workflows/test-e2e.yml

@@ -169,7 +169,7 @@ jobs:
             "privatelink",
             "private-endpoint",
             "project-settings",
-            "serverless-pe",
+            "serverless",
             "x509auth",
             "custom-roles",
             "teams",

internal/controller/atlasdeployment/serverless_deployment_test.go

@@ -556,6 +556,95 @@ func TestHandleServerlessInstance(t *testing.T) {
 					WithMessageRegexp("unable to retrieve list of serverless private endpoints from Atlas: failed to list private endpoints"),
 			},
 		},
+		"serverless flex instance fails when private endpoints are set": {
+			atlasDeployment: &akov2.AtlasDeployment{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "instance0",
+					Namespace: "default",
+				},
+				Spec: akov2.AtlasDeploymentSpec{
+					ProjectDualReference: akov2.ProjectDualReference{
+						ProjectRef: &common.ResourceRefNamespaced{
+							Name: "my-project",
+						},
+					},
+					ServerlessSpec: &akov2.ServerlessSpec{
+						Name: "instance0",
+						ProviderSettings: &akov2.ServerlessProviderSettingsSpec{
+							ProviderName:        provider.ProviderServerless,
+							BackingProviderName: "AWS",
+							RegionName:          "us-east-1",
+						},
+						Tags: []*akov2.TagSpec{
+							{
+								Key:   "test",
+								Value: "e2e",
+							},
+						},
+						BackupOptions: akov2.ServerlessBackupOptions{
+							ServerlessContinuousBackupEnabled: false,
+						},
+						TerminationProtectionEnabled: true,
+						PrivateEndpoints: []akov2.ServerlessPrivateEndpoint{
+							{
+								Name:                    "spe1",
+								CloudProviderEndpointID: "arn-12345",
+							},
+						},
+					},
+				},
+			},
+			deploymentInAtlas: &deployment.Serverless{
+				ProjectID: "project-id",
+				State:     "IDLE",
+				ServerlessSpec: &akov2.ServerlessSpec{
+					Name: "instance0",
+					ProviderSettings: &akov2.ServerlessProviderSettingsSpec{
+						ProviderName:        provider.ProviderServerless,
+						BackingProviderName: "AWS",
+						RegionName:          "us-east-1",
+					},
+					Tags: []*akov2.TagSpec{
+						{
+							Key:   "test",
+							Value: "e2e",
+						},
+					},
+					BackupOptions: akov2.ServerlessBackupOptions{
+						ServerlessContinuousBackupEnabled: false,
+					},
+					TerminationProtectionEnabled: true,
+				},
+			},
+			deploymentService: func() deployment.AtlasDeploymentsService {
+				service := translation.NewAtlasDeploymentsServiceMock(t)
+
+				return service
+			},
+			sdkMock: func() *admin.APIClient {
+				mockError := &admin.GenericOpenAPIError{}
+				model := *admin.NewApiError()
+				model.SetErrorCode("NOT_SERVERLESS_TENANT_CLUSTER")
+				mockError.SetModel(model)
+
+				speClient := mockadmin.NewServerlessPrivateEndpointsApi(t)
+				speClient.EXPECT().ListServerlessPrivateEndpoints(context.Background(), "project-id", "instance0").
+					Return(admin.ListServerlessPrivateEndpointsApiRequest{ApiService: speClient})
+				speClient.EXPECT().ListServerlessPrivateEndpointsExecute(mock.AnythingOfType("admin.ListServerlessPrivateEndpointsApiRequest")).
+					Return(nil, &http.Response{}, mockError)
+
+				return &admin.APIClient{ServerlessPrivateEndpointsApi: speClient}
+			},
+			expectedResult: ctrl.Result{RequeueAfter: workflow.DefaultRetry},
+			expectedConditions: []api.Condition{
+				api.FalseCondition(api.ServerlessPrivateEndpointReadyType).
+					WithReason(string(workflow.ServerlessPrivateEndpointFailed)).
+					WithMessageRegexp("serverless private endpoints are not supported: "),
+				api.FalseCondition(api.DeploymentReadyType).
+					WithReason(string(workflow.ServerlessPrivateEndpointFailed)).
+					WithMessageRegexp("serverless private endpoints are not supported: "),
+			},
+		},
 		"serverless instance is updating when private endpoints are in progress": {
 			atlasDeployment: &akov2.AtlasDeployment{
 				ObjectMeta: metav1.ObjectMeta{

internal/controller/atlasdeployment/serverless_private_endpoint.go

@@ -62,6 +62,14 @@ func syncServerlessPrivateEndpoints(service *workflow.Context, projectID string,
 	service.Log.Debugf("Syncing serverless private endpoints for deployment %s", deployment.Name)
 
 	atlasPrivateEndpoints, err := listServerlessPrivateEndpoints(service, projectID, deployment.Name)
+	// This is a shimmed flex cluster, if there are private serverless endpoints configured, we have to return an error.
+	if admin.IsErrorCode(err, "NOT_SERVERLESS_TENANT_CLUSTER") {
+		if len(deployment.PrivateEndpoints) > 0 {
+			return false, fmt.Errorf("serverless private endpoints are not supported: %w", err)
+		}
+		return true, nil
+	}
+
 	if err != nil {
 		return false, fmt.Errorf("unable to retrieve list of serverless private endpoints from Atlas: %w", err)
 	}