reclaimspace: add support for namespace annotation#350
Merged
Conversation
24489fc to
c3308b7
Compare
Rakshith-R
requested changes
May 16, 2023
6eb9da3 to
b79bbd7
Compare
Rakshith-R
previously approved these changes
May 16, 2023
Rakshith-R
left a comment
Member
There was a problem hiding this comment.
This looks good to me, Thanks!
nixpanic
reviewed
May 16, 2023
|
|
||
| annotations := pvc.GetAnnotations() | ||
| schedule, scheduleFound := getScheduleFromAnnotation(&logger, annotations) | ||
| if !scheduleFound { |
Member
There was a problem hiding this comment.
This is quite a large if-block, with lots of (good!) notes. Did you consider making it a helper function?
Member
Author
There was a problem hiding this comment.
Reduced the code length in the block now, it should be good
nixpanic
reviewed
May 16, 2023
| } | ||
| schedule, scheduleFound = getScheduleFromAnnotation(&logger, ns.Annotations) | ||
| // if the schedule is found check driver supports the space reclamation. | ||
| if scheduleFound { |
Member
There was a problem hiding this comment.
I prefer a
if !scheduleFound {
break
}check so that the remaining of this large if-statement does not need extra indenting.
Member
Author
There was a problem hiding this comment.
the break is only for for,switch statements right not for if in golang 🤔 this should be simple now as I moved the whole check to a new helper function
b79bbd7 to
779f0f7
Compare
Rakshith-R
requested changes
May 22, 2023
Rakshith-R
left a comment
Member
There was a problem hiding this comment.
changes look good to me,
some tiny changes to better explain the flow.
| return ctrl.Result{}, err | ||
| } | ||
| schedule, scheduleFound = getScheduleFromAnnotation(&logger, ns.Annotations) | ||
| // If the schedule is found check driver supports the space reclamation. |
Member
There was a problem hiding this comment.
Suggested change
| // If the schedule is found check driver supports the space reclamation. | |
| // If the schedule is not found, check whether driver supports the space reclamation using | |
| // annotation on ns and registered driver capability for decision on re queue. |
|
|
||
| ok := r.supportsReclaimSpace(driver) | ||
| if reclaimSpaceSupportedByDriver && !ok { | ||
| logger.Info("Driver does not support spacereclamation, Reqeueing request", "DriverName", driver) |
Member
There was a problem hiding this comment.
Suggested change
| logger.Info("Driver does not support spacereclamation, Reqeueing request", "DriverName", driver) | |
| logger.Info("Driver supports spacereclamation but driver is not registered in the connection pool, Reqeueing request", "DriverName", driver) |
779f0f7 to
4a573bf
Compare
nixpanic
approved these changes
May 24, 2023
remoce CreateFunc predicate to accomudate reading annotations from the namespaces. Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
Currently, we only support the reclaimspace feature on the PVC annotation. However, this adds support for namespace annotations as well. If the required PVC annotation is missing, our controller will check if the necessary annotation is present on the namespace. If it is, the scheduling details will be retrieved from the namespace annotation and used to create the ReclaimspaceCronJob. It's important to note that the PVC annotation will take precedence over namespace annotations. Please be aware that we can only create a reclaimspaceCronJob if the annotation exists on the namespace. If an admin wants to update or remove the annotation on the namespace, the same action must be taken on all the PVCs within that namespace. Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
Updated the documentation for the namespace annotation for the ReclaimSpace operation. Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
4a573bf to
14fa4e5
Compare
Nikhil-Ladha
pushed a commit
to Nikhil-Ladha/kubernetes-csi-addons
that referenced
this pull request
Dec 8, 2025
Syncing latest changes from upstream main for kubernetes-csi-addons
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Currently, we only support the reclaimspace feature on the PVC annotation. However, this adds support for namespace annotations as well. If the required PVC annotation is missing, our controller will check if the necessary annotation is present on the namespace. If it is, the scheduling details will be retrieved from the namespace annotation and used to create the ReclaimspaceCronJob.
It's important to note that the PVC annotation will take precedence over namespace annotations.
Please be aware that we can only create a reclaimspaceCronJob if the annotation exists on the namespace. If an admin wants to update or remove the annotation on the namespace, the same action must be taken on all the PVCs within that namespace.
Signed-off-by: Madhu Rajanna madhupr007@gmail.com