Assign resources to the NMA sidecar container #674
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
roypaulin
reviewed
Jan 25, 2024
pkg/meta/annotations.go
Outdated
| @@ -159,6 +164,20 @@ const ( | |||
| // image is built for that (and vice-versa). This annotation allows you to | |||
| // skip that check. | |||
| SkipDeploymentCheckAnnotation = "vertica.com/skip-deployment-check" | |||
|
|
|||
| // Set of annotations that you can use to control the resources of the NMA | |||
| // sidecar. The actual annoation name is: | |||
There was a problem hiding this comment.
Suggested change
| // sidecar. The actual annoation name is: | |
| // sidecar. The actual annotation name is: |
| defVal := DefaultSidecarResource[resourceName] | ||
| quantityStr := lookupStringAnnotation(annotations, annotationName, defVal.String()) | ||
| if quantityStr == "" { | ||
| return resource.Quantity{} |
There was a problem hiding this comment.
Why and we returning defVal here? Are you treating resource-annotation not set different from resource-annotation=""?
There was a problem hiding this comment.
Yes, if someone set the annotation but leaves it blank, we aren't going to use the default. I'll add a comment.
roypaulin
reviewed
Jan 25, 2024
pkg/meta/resources.go
Outdated
| @@ -26,7 +26,7 @@ var ( | |||
| DefaultSidecarResource = map[corev1.ResourceName]resource.Quantity{ | |||
| corev1.ResourceLimitsCPU: resource.MustParse("1"), | |||
There was a problem hiding this comment.
Yes, this is 1000 millicore. I believe just specifying 1 is equivalent to 1000m.
roypaulin
reviewed
Jan 30, 2024
| if nmaMemoryLimit.IsZero() { // Zero implies it isn't set. | ||
| return allErrs | ||
| } | ||
| if vmeta.MinNMAMemoryLimit.Cmp(nmaMemoryLimit) == 1 { |
There was a problem hiding this comment.
Isn't there a min limit for cpu too?
There was a problem hiding this comment.
No. The memory is the important min to enforce because we cannot run things like catalog editor without at least 1GB of memory.
roypaulin
approved these changes
Jan 30, 2024
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.
The NMA sidecar container now has default resources assigned to it in the pod spec. Some default values have been selected: 1CPU and 250MB of memory. These are for requests only. I intentionally left off the limit because of the burstable nature of the NMA container.
The resources are only set if the subcluster has defined resources. This ensures that the container can be run in low-resource environments (for testing purposes).
New annotations have been added to facilitate resource tuning. The new annotations are as follows:
vertica.com/nma-resources-limits-memory
vertica.com/nma-resources-limits-cpu
vertica.com/nma-resources-requests-memory
vertica.com/nma-resources-requests-cpu
Lastly, an existing e2e test case was updated. The test case was moved to the e2e-leg-7, as it assumes the use of the NMA sidecar and can only run on 24.2.0.