KO-358: Enhance AerospikeBackupService CR with all the possible deployment configuration params #328
+403
−22
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
Comment on lines
+58
to
+59
| // +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Pod Configuration" | ||
| ServicePodSpec ServicePodSpec `json:"servicePodSpec,omitempty"` |
There was a problem hiding this comment.
- Add comments for all new fields.
Suggested change
| // +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Pod Configuration" | |
| ServicePodSpec ServicePodSpec `json:"servicePodSpec,omitempty"` | |
| // +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Pod Configuration" | |
| PodSpec ServicePodSpec `json:"podSpec,omitempty"` |
| // Resources defines the requests and limits for the backup service container. | ||
| // Resources.Limits should be more than Resources.Requests. | ||
| Resources *corev1.ResourceRequirements `json:"resources,omitempty"` | ||
| ServicePodSpec ServicePodSpec `json:"servicePodSpec,omitempty"` |
There was a problem hiding this comment.
Same comment as above
Comment on lines
+42
to
+43
| //+kubebuilder:webhook:path=/mutate-asdb-aerospike-com-v1beta1-aerospikebackupservice,mutating=true,failurePolicy=fail,sideEffects=None,groups=asdb.aerospike.com,resources=aerospikebackupservices,verbs=create;update,versions=v1beta1,name=maerospikebackupservice.kb.io,admissionReviewVersions=v1 | ||
|
|
There was a problem hiding this comment.
- Run
make generate- to generate deepcopy code - Run
make manifests- to generate manifests - Add new manifests new in the helm-chart
Comment on lines
+76
to
84
| warn, err := r.validateServicePodSpec() | ||
|
|
||
| if err != nil { | ||
| return nil, err | ||
| } else if warn != nil { | ||
| return warn, nil | ||
| } | ||
|
|
||
| return nil, nil |
There was a problem hiding this comment.
Suggested change
| warn, err := r.validateServicePodSpec() | |
| if err != nil { | |
| return nil, err | |
| } else if warn != nil { | |
| return warn, nil | |
| } | |
| return nil, nil | |
| return r.validateServicePodSpec() |
Comment on lines
+101
to
109
| warn, err := r.validateServicePodSpec() | ||
|
|
||
| if err != nil { | ||
| return nil, err | ||
| } else if warn != nil { | ||
| return warn, nil | ||
| } | ||
|
|
||
| return nil, nil |
| valid = validateLabelsOrAnnotations(actual, map[string]string{"label-test-1": "test-1"}) | ||
| Expect(valid).To( | ||
| BeTrue(), "Unable to find labels", | ||
| ) |
There was a problem hiding this comment.
Add custom label and annotation update test flow as well in this test-case
Comment on lines
+316
to
+335
| nodeList, nErr := getNodeList(context.TODO(), k8sClient) | ||
| Expect(nErr).ToNot(HaveOccurred()) | ||
| Expect(len(nodeList.Items)).ToNot(BeZero()) | ||
|
|
||
| By("Validating Affinity") | ||
| nodeName := nodeList.Items[0].Name | ||
| affinity := &corev1.Affinity{} | ||
| ns := &corev1.NodeSelector{ | ||
| NodeSelectorTerms: []corev1.NodeSelectorTerm{ | ||
| { | ||
| MatchExpressions: []corev1.NodeSelectorRequirement{ | ||
| { | ||
| Key: "kubernetes.io/hostname", | ||
| Operator: corev1.NodeSelectorOpIn, | ||
| Values: []string{nodeName}, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } |
There was a problem hiding this comment.
Instead of this, it's easier to set a PreferredDuringSchedulingIgnoredDuringExecution node affinity in the CR and validate the same from the pod object affinity.
| @@ -298,3 +298,41 @@ func DeleteBackupService( | |||
|
|
|||
| return nil | |||
| } | |||
|
|
|||
| func getBackupServiceDeployment(k8sClient client.Client, | |||
| backupService *asdbv1beta1.AerospikeBackupService) (*app.Deployment, error) { | |||
There was a problem hiding this comment.
It just needs the name and namespace of backup service not the whole object
Comment on lines
+404
to
+408
| backupService, err := getBackupServiceObj(k8sClient, name, namespace) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
There was a problem hiding this comment.
This won't be required if you switch to name and namespace params in getBackupServiceDeployment
| for key, val := range expected { | ||
| if v, ok := actual[key]; ok { | ||
| if v == val { | ||
| return true |
There was a problem hiding this comment.
This won't work with multiple key: values in expected map as it is returning after the first value itself
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.