Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CDAP-21114] Disable messaging service pod for new cdf instances with Cloud Spanner enabled #125

Closed
wants to merge 1 commit into from
Closed

[CDAP-21114] Disable messaging service pod for new cdf instances with Cloud Spanner enabled #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/v1alpha1/cdapmaster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 5 additions & 2 deletions api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38,420 changes: 18,497 additions & 19,923 deletions config/crd/bases/cdap.cdap.io_cdapmasters.yaml
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 1 addition & 25 deletions config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -34,6 +21,7 @@ rules:
- apps
resources:
- deployments
- statefulsets
verbs:
- create
- delete
Expand All @@ -50,18 +38,6 @@ rules:
- get
- patch
- update
- apiGroups:
- apps
resources:
- statefulsets
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- batch
resources:
Expand Down
18 changes: 9 additions & 9 deletions controllers/cdapmaster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
72 changes: 36 additions & 36 deletions controllers/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions controllers/version_update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 4 additions & 8 deletions ...sigs.k8s.io/controller-reconciler/pkg/genericreconciler/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 6 additions & 10 deletions vendor_old/sigs.k8s.io/controller-reconciler/pkg/status/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading