issue-590, ingestNodes for OpenSearch in API v2 #610
Merged
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
OleksiienkoMykyta
requested review from
testisnullus,
ribaraka,
worryg0d and
tengu-alt
OleksiienkoMykyta
force-pushed
the
issue-590-ingestNodes-for-OpenSearch-in-API-v2
branch
2 times, most recently
from
5f4281f to
1f52059
Compare
testisnullus
requested changes
Nov 6, 2023
| @@ -55,7 +55,8 @@ type OpenSearchSpec struct { | |||
| BundledUseOnly bool `json:"bundledUseOnly,omitempty"` | |||
| UserRefs []*UserReference `json:"userRefs,omitempty"` | |||
| //+kubuilder:validation:MaxItems:=1 | |||
| ResizeSettings []*ResizeSettings `json:"resizeSettings,omitempty"` | |||
| ResizeSettings []*ResizeSettings `json:"resizeSettings,omitempty"` | |||
| OpenSearchIngestNode []*OpenSearchIngestNode `json:"ingestNodes,omitempty"` | |||
There was a problem hiding this comment.
OpenSearchIngestNode -> OpenSearchIngestNodes
OleksiienkoMykyta
force-pushed
the
issue-590-ingestNodes-for-OpenSearch-in-API-v2
branch
from
1f52059 to
c41c745
Compare
tengu-alt
approved these changes
Nov 7, 2023
OleksiienkoMykyta
force-pushed
the
issue-590-ingestNodes-for-OpenSearch-in-API-v2
branch
from
c41c745 to
29ccb49
Compare
testisnullus
previously requested changes
Nov 7, 2023
| @@ -56,6 +56,8 @@ type OpenSearchSpec struct { | |||
| UserRefs []*UserReference `json:"userRefs,omitempty"` | |||
| //+kubuilder:validation:MaxItems:=1 | |||
| ResizeSettings []*ResizeSettings `json:"resizeSettings,omitempty"` | |||
| //+kubuilder:validation:MaxItems:=1 | |||
| OpenSearchIngestNodes []*OpenSearchIngestNodes `json:"ingestNodes,omitempty"` | |||
There was a problem hiding this comment.
[]*OpenSearchIngestNodes -> []*OpenSearchIngestNode
There was a problem hiding this comment.
It has multiple nodes, so I use plural form
Comment on lines
187
to
191
| l.Info("The node has been successfully reloaded", | ||
| "Node ID", nrs.Status.NodeInProgress.ID, | ||
| "Node ID", nodeReloadStatus.NodeID, | ||
| ) | ||
| r.EventRecorder.Eventf(nrs, models.Normal, models.UpdatedEvent, | ||
| "Node %s has been successfully reloaded", nrs.Status.NodeInProgress.ID, | ||
| "Node %s has been successfully reloaded", nodeReloadStatus.NodeID, |
There was a problem hiding this comment.
Revert these changes please
There was a problem hiding this comment.
replaced with "nrs.Status"
| @@ -211,6 +219,17 @@ func (oss *OpenSearchSpec) dataNodesToInstAPI() (iDataNodes []*models.OpenSearch | |||
| return | |||
| } | |||
|
|
|||
| func (oss *OpenSearchSpec) ingestNodesToInstAPI() (iIngestNodes []*models.OpenSearchIngestNodes) { | |||
| for _, ingestNodes := range oss.OpenSearchIngestNodes { | |||
There was a problem hiding this comment.
ingestNodes -> ingestNode
ribaraka
approved these changes
Nov 7, 2023
| @@ -56,6 +56,8 @@ type OpenSearchSpec struct { | |||
| UserRefs []*UserReference `json:"userRefs,omitempty"` | |||
| //+kubuilder:validation:MaxItems:=1 | |||
| ResizeSettings []*ResizeSettings `json:"resizeSettings,omitempty"` | |||
| //+kubuilder:validation:MaxItems:=1 | |||
| OpenSearchIngestNodes []*OpenSearchIngestNodes `json:"ingestNodes,omitempty"` | |||
There was a problem hiding this comment.
OpenSearch- prefix in field name is unnecessary.
worryg0d
reviewed
Nov 8, 2023
pkg/models/opensearch_apiv2.go
Outdated
| AlertingPlugin bool `json:"alertingPlugin"` | ||
| ResizeSettings []*ResizeSettings `json:"resizeSettings,omitempty"` | ||
| Description string `json:"description,omitempty"` | ||
| OpenSearchIngestNodes []*OpenSearchIngestNodes `json:"ingestNodes,omitempty"` |
There was a problem hiding this comment.
OpenSearch prefix is not necessary because it's obvious that they are nodes of OpenSearch cluster
OleksiienkoMykyta
force-pushed
the
issue-590-ingestNodes-for-OpenSearch-in-API-v2
branch
from
29ccb49 to
3bcec33
Compare
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.
No description provided.