Skip to content

Commit

Permalink
Merge pull request #91 from red-hat-storage/sync_ds--main
Browse files Browse the repository at this point in the history
Syncing latest changes from main for kubernetes-csi-addons
  • Loading branch information
openshift-ci[bot] authored Oct 13, 2023
2 parents bcfd1e0 + 3e26ebd commit d1ce865
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion OWNERS_ALIASES
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
aliases:
ceph-csi-team:
- agarwal-mudit
- humblec
- madhu-1
- nixpanic
- rakshith-r
- riya-singhal31
- yati1998
2 changes: 1 addition & 1 deletion controllers/csiaddons/persistentvolumeclaim_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ func (r *PersistentVolumeClaimReconciler) checkDriverSupportReclaimsSpace(logger
}

// determineScheduleAndRequeue determines the schedule using the following steps
// - Check if the schedule is persent in the PVC annotations. If yes, use that.
// - Check if the schedule is present in the PVC annotations. If yes, use that.
// - Check if the schedule is present in the namespace annotations. If yes,
// use that.
// - If schedule is not present in namespace annotations, return ErrorScheduleNotFound.
Expand Down
2 changes: 1 addition & 1 deletion controllers/csiaddons/reclaimspacecronjob_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func (r *ReclaimSpaceCronJobReconciler) Reconcile(ctx context.Context, req ctrl.

// We'll prep our eventual request to requeue until the next job, and then figure
// out if we actually need to run.
scheduledResult := ctrl.Result{RequeueAfter: time.Until(nextRun)} // save this so we can re-use it elsewhere
scheduledResult := ctrl.Result{RequeueAfter: time.Until(nextRun)} // save this so we can reuse it elsewhere
logger = logger.WithValues("now", time.Now(), "nextRun", nextRun)

// If we've missed a run, and we're still within the deadline to start it, we'll need to run a job.
Expand Down
2 changes: 1 addition & 1 deletion internal/proto/reclaimspace.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package proto;

option go_package = "github.com/csi-addons/kubernetes-csi-addons/internal/proto";

// ReclaimSpace holds the RPC menthod for allowing the
// ReclaimSpace holds the RPC method for allowing the
// communication between the CSIAddons controller and the sidecar.
service ReclaimSpace {
// ControllerReclaimSpace is a procedure that gets called on the CSI
Expand Down
2 changes: 1 addition & 1 deletion internal/proto/replication.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "google/protobuf/timestamp.proto";

option go_package = "github.com/csi-addons/kubernetes-csi-addons/internal/proto";

// Replication holds the RPC menthod for allowing the communication between
// Replication holds the RPC method for allowing the communication between
// the CSIAddons controller and the sidecar for replication operation.
service Replication {
// EnableVolumeReplication RPC call to enable the volume replication.
Expand Down

0 comments on commit d1ce865

Please sign in to comment.