[CDAP-21114] Disable messaging service pod for new cdf instances with…

… Cloud Spanner enabled

api/v1alpha1/cdapmaster_types.go

@@ -70,7 +70,9 @@ type CDAPMasterSpec struct {
 	// Logs is specification for the CDAP logging service.
 	Logs LogsSpec `json:"logs,omitempty"`
 	// Messaging is specification for the CDAP messaging service.
-	Messaging MessagingSpec `json:"messaging,omitempty"`
+	// To disable this service: either omit or set the field to nil
+	// To enable this service: set it to a pointer to a MessagingSpec struct (can be an empty struct)
+	Messaging *MessagingSpec `json:"messaging,omitempty"`
 	// Metadata is specification for the CDAP metadata service.
 	Metadata MetadataSpec `json:"metadata,omitempty"`
 	// Metrics is specification for the CDAP metrics service.

controllers/deployment_test.go

@@ -99,7 +99,8 @@ var _ = Describe("Controller Suite", func() {
 		})
 		It("k8s objs for just essential services", func() {
 			master.Spec.Runtime = nil
-			numOptionalServices := 1
+			master.Spec.Messaging = nil
+			numOptionalServices := 2
 
 			emptyLabels := make(map[string]string)
 			spec, err := buildDeploymentPlanSpec(master, emptyLabels)

controllers/utils_test.go

@@ -18,48 +18,44 @@ var _ = Describe("Controller Suite", func() {
 		BeforeEach(func() {
 			master = &v1alpha1.CDAPMaster{}
 			serviceToSpec = map[string]*v1alpha1.CDAPServiceSpec{
-				serviceLogs:                &master.Spec.Logs.CDAPServiceSpec,
-				serviceAppFabric:           &master.Spec.AppFabric.CDAPServiceSpec,
-				serviceAppFabricProcessor:  &master.Spec.AppFabricProcessor.CDAPServiceSpec,
-				serviceMetrics:             &master.Spec.Metrics.CDAPServiceSpec,
-				serviceRouter:              &master.Spec.Router.CDAPServiceSpec,
-				serviceMessaging:           &master.Spec.Messaging.CDAPServiceSpec,
-				serviceMetadata:            &master.Spec.Metadata.CDAPServiceSpec,
-				servicePreview:             &master.Spec.Preview.CDAPServiceSpec,
-				serviceUserInterface:       &master.Spec.UserInterface.CDAPServiceSpec,
+				serviceLogs:               &master.Spec.Logs.CDAPServiceSpec,
+				serviceAppFabric:          &master.Spec.AppFabric.CDAPServiceSpec,
+				serviceAppFabricProcessor: &master.Spec.AppFabricProcessor.CDAPServiceSpec,
+				serviceMetrics:            &master.Spec.Metrics.CDAPServiceSpec,
+				serviceRouter:             &master.Spec.Router.CDAPServiceSpec,
+				serviceMetadata:           &master.Spec.Metadata.CDAPServiceSpec,
+				servicePreview:            &master.Spec.Preview.CDAPServiceSpec,
+				serviceUserInterface:      &master.Spec.UserInterface.CDAPServiceSpec,
 			}
 			serviceToScalableSpec = map[string]*v1alpha1.CDAPScalableServiceSpec{
-				serviceLogs:                nil,
-				serviceAppFabric:           &master.Spec.AppFabric.CDAPScalableServiceSpec,
-				serviceAppFabricProcessor:  nil,
-				serviceMetrics:             nil,
-				serviceRouter:              &master.Spec.Router.CDAPScalableServiceSpec,
-				serviceMessaging:           nil,
-				serviceMetadata:            &master.Spec.Metadata.CDAPScalableServiceSpec,
-				servicePreview:             nil,
-				serviceUserInterface:       &master.Spec.UserInterface.CDAPScalableServiceSpec,
+				serviceLogs:               nil,
+				serviceAppFabric:          &master.Spec.AppFabric.CDAPScalableServiceSpec,
+				serviceAppFabricProcessor: nil,
+				serviceMetrics:            nil,
+				serviceRouter:             &master.Spec.Router.CDAPScalableServiceSpec,
+				serviceMetadata:           &master.Spec.Metadata.CDAPScalableServiceSpec,
+				servicePreview:            nil,
+				serviceUserInterface:      &master.Spec.UserInterface.CDAPScalableServiceSpec,
 			}
 			serviceToStatefulSpec = map[string]*v1alpha1.CDAPStatefulServiceSpec{
-				serviceLogs:                &master.Spec.Logs.CDAPStatefulServiceSpec,
-				serviceAppFabric:           nil,
-				serviceAppFabricProcessor:  &master.Spec.AppFabricProcessor.CDAPStatefulServiceSpec,
-				serviceMetrics:             &master.Spec.Metrics.CDAPStatefulServiceSpec,
-				serviceRouter:              nil,
-				serviceMessaging:           &master.Spec.Messaging.CDAPStatefulServiceSpec,
-				serviceMetadata:            nil,
-				servicePreview:             &master.Spec.Preview.CDAPStatefulServiceSpec,
-				serviceUserInterface:       nil,
+				serviceLogs:               &master.Spec.Logs.CDAPStatefulServiceSpec,
+				serviceAppFabric:          nil,
+				serviceAppFabricProcessor: &master.Spec.AppFabricProcessor.CDAPStatefulServiceSpec,
+				serviceMetrics:            &master.Spec.Metrics.CDAPStatefulServiceSpec,
+				serviceRouter:             nil,
+				serviceMetadata:           nil,
+				servicePreview:            &master.Spec.Preview.CDAPStatefulServiceSpec,
+				serviceUserInterface:      nil,
 			}
 			serviceToExternalSpec = map[string]*v1alpha1.CDAPExternalServiceSpec{
-				serviceLogs:                nil,
-				serviceAppFabric:           nil,
-				serviceAppFabricProcessor:  nil,
-				serviceMetrics:             nil,
-				serviceRouter:              &master.Spec.Router.CDAPExternalServiceSpec,
-				serviceMessaging:           nil,
-				serviceMetadata:            nil,
-				servicePreview:             nil,
-				serviceUserInterface:       &master.Spec.UserInterface.CDAPExternalServiceSpec,
+				serviceLogs:               nil,
+				serviceAppFabric:          nil,
+				serviceAppFabricProcessor: nil,
+				serviceMetrics:            nil,
+				serviceRouter:             &master.Spec.Router.CDAPExternalServiceSpec,
+				serviceMetadata:           nil,
+				servicePreview:            nil,
+				serviceUserInterface:      &master.Spec.UserInterface.CDAPExternalServiceSpec,
 			}
 		})
 		It("Successfully get pointer to CDAPServiceSpec", func() {