Split Appfabric into stateless service and stateful processor

api/v1alpha1/cdapmaster_types.go

@@ -65,6 +65,8 @@ type CDAPMasterSpec struct {
 	LogLevels map[string]string `json:"logLevels,omitempty"`
 	// AppFabric is specification for the CDAP app-fabric service.
 	AppFabric AppFabricSpec `json:"appFabric,omitempty"`
+	// AppFabricProcessor is specification for the CDAP app-fabric processor service.
+	AppFabricProcessor AppFabricProcessorSpec `json:"appFabricProcessor,omitempty"`
 	// Logs is specification for the CDAP logging service.
 	Logs LogsSpec `json:"logs,omitempty"`
 	// Messaging is specification for the CDAP messaging service.
@@ -218,6 +220,11 @@ type CDAPScalableStatefulServiceSpec struct {
 
 // AppFabricSpec defines the specification for the AppFabric service.
 type AppFabricSpec struct {
+	CDAPScalableServiceSpec `json:",inline"`
+}
+
+// AppFabricProcessorSpec defines the specification for the AppFabric Processor service.
+type AppFabricProcessorSpec struct {
 	CDAPStatefulServiceSpec `json:",inline"`
 }
 

controllers/constants.go

@@ -9,6 +9,9 @@ const (
 	// serviceAppFabric defines the service type for app-fabric
 	serviceAppFabric ServiceName = "AppFabric"
 
+	// serviceAppFabricProcessor defines the service type for app-fabric processor
+	serviceAppFabricProcessor ServiceName = "AppFabricProcessor"
+
 	// serviceLogs defines the service type for log processing and serving service
 	serviceLogs ServiceName = "Logs"
 

controllers/deployment.go

@@ -45,17 +45,18 @@ func (d *DeploymentPlan) Init() {
 	// Default: each service runs in its own Pod
 	d.planMap[0] = ServiceGroups{
 		stateful: map[ServiceGroupName]ServiceGroup{
-			"logs":           {serviceLogs},
-			"messaging":      {serviceMessaging},
-			"metrics":        {serviceMetrics},
-			"preview":        {servicePreview},
-			"appfabric":      {serviceAppFabric},
-			"runtime":        {serviceRuntime},
-			"supportbundle":  {serviceSupportBundle},
-			"tetheringagent": {serviceTetheringAgent},
-			"artifactcache":  {serviceArtifactCache},
+			"appfabricprocessor": {serviceAppFabricProcessor},
+			"logs":               {serviceLogs},
+			"messaging":          {serviceMessaging},
+			"metrics":            {serviceMetrics},
+			"preview":            {servicePreview},
+			"runtime":            {serviceRuntime},
+			"supportbundle":      {serviceSupportBundle},
+			"tetheringagent":     {serviceTetheringAgent},
+			"artifactcache":      {serviceArtifactCache},
 		},
 		deployment: map[ServiceGroupName]ServiceGroup{
+			"appfabric":      {serviceAppFabric},
 			"authentication": {serviceAuthentication},
 			"metadata":       {serviceMetadata},
 			"router":         {serviceRouter},

controllers/testdata/appfabric.json

@@ -1,6 +1,6 @@
 {
   "apiVersion": "apps/v1",
-  "kind": "StatefulSet",
+  "kind": "Deployment",
   "metadata": {
     "annotations": {
       "deployment.kubernetes.io/revision": "8"

controllers/utils_test.go

@@ -29,7 +29,7 @@ var _ = Describe("Controller Suite", func() {
 			}
 			serviceToScalableSpec = map[string]*v1alpha1.CDAPScalableServiceSpec{
 				serviceLogs:          nil,
-				serviceAppFabric:     nil,
+				serviceAppFabric:     &master.Spec.AppFabric.CDAPScalableServiceSpec,
 				serviceMetrics:       nil,
 				serviceRouter:        &master.Spec.Router.CDAPScalableServiceSpec,
 				serviceMessaging:     nil,
@@ -39,7 +39,7 @@ var _ = Describe("Controller Suite", func() {
 			}
 			serviceToStatefulSpec = map[string]*v1alpha1.CDAPStatefulServiceSpec{
 				serviceLogs:          &master.Spec.Logs.CDAPStatefulServiceSpec,
-				serviceAppFabric:     &master.Spec.AppFabric.CDAPStatefulServiceSpec,
+				serviceAppFabric:     nil,
 				serviceMetrics:       &master.Spec.Metrics.CDAPStatefulServiceSpec,
 				serviceRouter:        nil,
 				serviceMessaging:     &master.Spec.Messaging.CDAPStatefulServiceSpec,