Refactor/ordering #123
Merged
Refactor/ordering #123
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
itamar-marom
force-pushed
the
refactor/ordering
branch
from
b5c19d9 to
148e0ce
Compare
|
@cyril-corbon @AdheipSingh ping 😄 |
|
@itamar-marom ill check this week. Thanks |
|
ill take this in the next release. Will test is locally once. |
SatyaKuppam
reviewed
Feb 13, 2024
AdheipSingh
reviewed
Feb 14, 2024
Comment on lines
+16
to
+35
| func getNodeSpecsByOrder(m *v1alpha1.Druid) []*ServiceGroup { | ||
|
|
||
| scaledServiceSpecsByNodeType := map[string][]*ServiceGroup{} | ||
| for _, t := range druidServicesOrder { | ||
| scaledServiceSpecsByNodeType[t] = []*ServiceGroup{} | ||
| } | ||
|
|
||
| for key, nodeSpec := range m.Spec.Nodes { | ||
| scaledServiceSpec := scaledServiceSpecsByNodeType[nodeSpec.NodeType] | ||
| scaledServiceSpecsByNodeType[nodeSpec.NodeType] = append(scaledServiceSpec, &ServiceGroup{key: key, spec: nodeSpec}) | ||
| } | ||
|
|
||
| allScaledServiceSpecs := make([]*ServiceGroup, 0, len(m.Spec.Nodes)) | ||
|
|
||
| for _, t := range druidServicesOrder { | ||
| allScaledServiceSpecs = append(allScaledServiceSpecs, scaledServiceSpecsByNodeType[t]...) | ||
| } | ||
|
|
||
| return allScaledServiceSpecs | ||
| } |
There was a problem hiding this comment.
This is a very good refactor. We can now abstract the order in the CR but it will not be not backward compatible.
|
@itamar-marom if you can resolve this, we can merge it. |
|
I'll resolve this today/tomorrow and ping you |
itamar-marom
force-pushed
the
refactor/ordering
branch
from
ace20be to
4d6fa37
Compare
itamar-marom
force-pushed
the
refactor/ordering
branch
from
4d6fa37 to
36614f2
Compare
|
@AdheipSingh ready |
AdheipSingh
approved these changes
Feb 17, 2024
TessaIO
pushed a commit
to TessaIO/druid-operator
that referenced
this pull request
Jul 24, 2024
* (ordering): refactor code * (ordering): refactor code * (ordering): testing * chore(branch): rebase branch with master * fix(tests): validate nodes order by regex
AdheipSingh
added a commit
that referenced
this pull request
Jul 28, 2024
* Ingestion Controller (#53) * ingestion spec acc to v3 * task creation * supprt native batch * fix router url * revert license change * revert go mod change * fix main * fix: made some changes as per review comments * fix: removed unused package from ingestion reconciler * rebase 1 * add example * add review * update dockerfile --------- Co-authored-by: avtarOPS <[email protected]> * Update Docs and Tutorials (#138) * docs and tutorials * Refactor/ordering (#123) * (ordering): refactor code * (ordering): refactor code * (ordering): testing * chore(branch): rebase branch with master * fix(tests): validate nodes order by regex * Bump controller-tools version (#140) * Utilize the DruidIngestion controller in e2e tests (#146) * adds needed volumes to eks deployment spec and improves getting started documentation by noting minio dependency (#149) * Add support for annotations on Deployment/StatefulSet resources in DruidNodeSpec (#145) * Add support for annotations on Deployment/StatefulSet resources * Support setting ReplicationControllerAnnotations at the cluster-level * rename replicationControllerAnnotations to workloadAnnotations * suggestions from code review * Add support for multi tier nodes with different PVC sizes (#106) (#152) Co-authored-by: Farhad Farahi <[email protected]> * fix: put Druid crds in the appropriate folder specified by Helm (#162) Signed-off-by: ahmed.g <[email protected]> Signed-off-by: TessaIO <[email protected]> * Adds service account name to each druid node optionally (#164) * Adds service account to each druid node optionally * Use controller-gen v0.11.2 --------- Signed-off-by: ahmed.g <[email protected]> Signed-off-by: TessaIO <[email protected]> Co-authored-by: AdheipSingh <[email protected]> Co-authored-by: avtarOPS <[email protected]> Co-authored-by: Itamar Marom <[email protected]> Co-authored-by: Jesper Larsson <[email protected]> Co-authored-by: Sam Wheating <[email protected]> Co-authored-by: Evan Jones <[email protected]> Co-authored-by: Farhad Farahi <[email protected]> Co-authored-by: Farhad Farahi <[email protected]> Co-authored-by: Sadananda Aithal <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Code refactoring to the ordering logic. Added also tests.
This PR has:
Key changed/added files in this PR
controllers/druid/handler.gocontrollers/druid/ordering.gocontrollers/druid/ordering_test.go