KO-358: Enhance AerospikeBackupService CR with all the possible deployment configuration params #328
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
jwalantmodi05
requested review from
sud82,
tanmayja and
abhishekdwivedi3060
as code owners
abhishekdwivedi3060
requested changes
Dec 19, 2024
abhishekdwivedi3060
requested changes
Jan 2, 2025
Comment on lines
+27
to
+46
| - admissionReviewVersions: | ||
| - v1 | ||
| clientConfig: | ||
| service: | ||
| name: webhook-service | ||
| namespace: system | ||
| path: /mutate-asdb-aerospike-com-v1beta1-aerospikebackupservice | ||
| failurePolicy: Fail | ||
| name: maerospikebackupservice.kb.io | ||
| rules: | ||
| - apiGroups: | ||
| - asdb.aerospike.com | ||
| apiVersions: | ||
| - v1beta1 | ||
| operations: | ||
| - CREATE | ||
| - UPDATE | ||
| resources: | ||
| - aerospikebackupservices | ||
| sideEffects: None |
There was a problem hiding this comment.
Add this in helm-chart as well
| } | ||
|
|
||
| func validateObjectMeta(objectMeta *AerospikeObjectMeta) error { |
There was a problem hiding this comment.
Suggested change
| func validateObjectMeta(objectMeta *AerospikeObjectMeta) error { | |
| func validatePodObjectMeta(objectMeta *AerospikeObjectMeta) error { |
| } | ||
| func (r *AerospikeBackupService) validateResourcesField() (admission.Warnings, error) { |
There was a problem hiding this comment.
Add a new line
| if r.Spec.Resources != nil && r.Spec.PodSpec.ServiceContainerSpec.Resources != nil { | ||
| if !reflect.DeepEqual(r.Spec.Resources, r.Spec.PodSpec.ServiceContainerSpec.Resources) { | ||
| return nil, fmt.Errorf("resources mismatch, different resources requirements found in " + | ||
| "spec.resources and spec.podSpec.serviceContainer.resources") | ||
| } else { |
There was a problem hiding this comment.
No need of else statement if you are returning from if.
You can simply have warn section below if statement
| actual := deploy.Spec.Template.ObjectMeta.Annotations | ||
| valid := validateLabelsOrAnnotations(actual, annotations) | ||
| Expect(valid).To( | ||
| BeTrue(), "Unable to find annotations", |
There was a problem hiding this comment.
Suggested change
| BeTrue(), "Unable to find annotations", | |
| BeTrue(), "Annotations mismatch", |
You can also add expected vs found in the error msg if possible
| actual = deploy.Spec.Template.ObjectMeta.Labels | ||
| valid = validateLabelsOrAnnotations(actual, labels) | ||
| Expect(valid).To( | ||
| BeTrue(), "Unable to find labels", |
| @@ -281,62 +281,88 @@ var _ = Describe( | |||
|
|
|||
| }) | |||
|
|
|||
| It("Should validate annotations and labels addition", func() { | |||
| It("Should add custom annotations and labels in the backup service deployement pods", func() { | |||
There was a problem hiding this comment.
Suggested change
| It("Should add custom annotations and labels in the backup service deployement pods", func() { | |
| It("Should add/update custom annotations and labels in the backup service deployement pods", func() { |
Comment on lines
+295
to
+310
| deploy, dErr := getBackupServiceDeployment(k8sClient, name, namespace) | ||
| Expect(dErr).ToNot(HaveOccurred()) | ||
|
|
||
| By("Validating Annotations") | ||
| actual := deploy.Spec.Template.ObjectMeta.Annotations | ||
| valid := validateLabelsOrAnnotations(actual, annotations) | ||
| Expect(valid).To( | ||
| BeTrue(), "Unable to find annotations", | ||
| ) | ||
|
|
||
| By("Validating Labels") | ||
| actual = deploy.Spec.Template.ObjectMeta.Labels | ||
| valid = validateLabelsOrAnnotations(actual, labels) | ||
| Expect(valid).To( | ||
| BeTrue(), "Unable to find labels", | ||
| ) |
There was a problem hiding this comment.
See if you can move this in a func (eg. validatePodObjectMeta) for reusing in both create and update flow
Comment on lines
383
to
385
| requestMem := resource.MustParse("1Gi") | ||
| requestCPU := resource.MustParse("200m") | ||
| limitMem := resource.MustParse("2Gi") |
There was a problem hiding this comment.
Reduce the memory request and cpu.
It might cause issue while running tests on local dev clusters
There was a problem hiding this comment.
Okay, I will reduce it.
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.