Make messaging spec a pointer reference

cdapio · Jan 15, 2025 · aa3be13 · aa3be13
1 parent 5ed7d5c
commit aa3be13
Show file tree

Hide file tree

Showing 11 changed files with 18,568 additions and 20,025 deletions.
diff --git a/api/v1alpha1/cdapmaster_types.go b/api/v1alpha1/cdapmaster_types.go
@@ -70,7 +70,7 @@ 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"`
+	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.

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/cdap.cdap.io_cdapmasters.yaml b/config/crd/bases/cdap.cdap.io_cdapmasters.yaml
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -1,26 +1,13 @@
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: manager-role
 rules:
 - apiGroups:
   - ""
   resources:
   - configmaps
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
   - services
   verbs:
   - create
@@ -34,6 +21,7 @@ rules:
   - apps
   resources:
   - deployments
+  - statefulsets
   verbs:
   - create
   - delete
@@ -50,18 +38,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - apps
-  resources:
-  - statefulsets
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
 - apiGroups:
   - batch
   resources:

diff --git a/controllers/cdapmaster_controller.go b/controllers/cdapmaster_controller.go
@@ -166,9 +166,9 @@ func ApplyDefaults(resource interface{}) {
 	finalizer.EnsureStandard(r)
 }
 
-/////////////////////////////////////////////////////////
-///// Handling reconciling ConfigMapHandler objects /////
-/////////////////////////////////////////////////////////
+// ///////////////////////////////////////////////////////
+// /// Handling reconciling ConfigMapHandler objects /////
+// ///////////////////////////////////////////////////////
 type ConfigMapHandler struct{}
 
 func (h *ConfigMapHandler) Observables(rsrc interface{}, labels map[string]string, dependent []reconciler.Object) []reconciler.Observable {
@@ -257,9 +257,9 @@ func buildConfigMapObject(spec *ConfigMapSpec) reconciler.Object {
 	return obj
 }
 
-///////////////////////////////////////////////////////////
-///// Handling reconciling deployment of all services /////
-///////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////
+// /// Handling reconciling deployment of all services /////
+// /////////////////////////////////////////////////////////
 type ServiceHandler struct{}
 
 func (h *ServiceHandler) Observables(rsrc interface{}, labels map[string]string, dependent []reconciler.Object) []reconciler.Observable {
@@ -337,9 +337,9 @@ func CopyNodePortIfAny(expected, observed []reconciler.Object) {
 	}
 }
 
-///////////////////////////////////////////////////////
-///// Handler for image version upgrade/downgrade /////
-///////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////
+// /// Handler for image version upgrade/downgrade /////
+// /////////////////////////////////////////////////////
 type VersionUpdateHandler struct{}
 
 func (h *VersionUpdateHandler) Observables(rsrc interface{}, labels map[string]string, dependent []reconciler.Object) []reconciler.Observable {

diff --git a/controllers/utils_test.go b/controllers/utils_test.go
@@ -18,48 +18,48 @@ 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,
+				serviceMessaging:          &master.Spec.Messaging.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,
+				serviceMessaging:          nil,
+				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,
+				serviceMessaging:          &master.Spec.Messaging.CDAPStatefulServiceSpec,
+				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,
+				serviceMessaging:          nil,
+				serviceMetadata:           nil,
+				servicePreview:            nil,
+				serviceUserInterface:      &master.Spec.UserInterface.CDAPExternalServiceSpec,
 			}
 		})
 		It("Successfully get pointer to CDAPServiceSpec", func() {

diff --git a/controllers/version_update.go b/controllers/version_update.go
@@ -504,12 +504,12 @@ func getCurrentTimeMs() int64 {
 
 // The returned name is just the suffix of actual k8s object name, as we prepend it with const string + CR name
 func getPreUpgradeJobName(startTimeMs int64) string {
-	return fmt.Sprintf("pre-upgrade-job-%d", startTimeMs / 1000)
+	return fmt.Sprintf("pre-upgrade-job-%d", startTimeMs/1000)
 }
 
 // The returned name is just the suffix of actual k8s object name, as we prepend it with const string + CR name
 func getPostUpgradeJobName(startTimeMs int64) string {
-	return fmt.Sprintf("post-upgrade-job-%d", startTimeMs / 1000)
+	return fmt.Sprintf("post-upgrade-job-%d", startTimeMs/1000)
 }
 
 // Return pre-upgrade job spec

diff --git a/...sigs.k8s.io/controller-reconciler/pkg/genericreconciler/v1alpha1/zz_generated.deepcopy.go b/...sigs.k8s.io/controller-reconciler/pkg/genericreconciler/v1alpha1/zz_generated.deepcopy.go
diff --git a/vendor_old/sigs.k8s.io/controller-reconciler/pkg/status/zz_generated.deepcopy.go b/vendor_old/sigs.k8s.io/controller-reconciler/pkg/status/zz_generated.deepcopy.go