From 2e61800011aff35ac091becfb9dbd2d1d9971e99 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 12 Oct 2023 09:29:08 +0200 Subject: [PATCH 1/3] cleanup: update OWNERS_ALIASES Signed-off-by: Niels de Vos --- OWNERS_ALIASES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 8697326bc..a985fea53 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -1,8 +1,8 @@ aliases: ceph-csi-team: - agarwal-mudit - - humblec - madhu-1 - nixpanic - rakshith-r + - riya-singhal31 - yati1998 From c154f464d005bc641b79d2d5fabd4e13bb7236ce Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 12 Oct 2023 09:42:10 +0200 Subject: [PATCH 2/3] redhat: point to the right upstream project in the README Reported-in: #85 Signed-off-by: Niels de Vos --- redhat/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/redhat/README.md b/redhat/README.md index 73888839e..952a3bcca 100644 --- a/redhat/README.md +++ b/redhat/README.md @@ -12,10 +12,10 @@ This GitHub repository contains branches for different product versions. ## Backports All changes in this repository are *backports* from the [upstream -project][https://github.com/ceph/ceph-csi]. There should be no functional -changes (only process/CI/building/..) in this repository compared to the -upstream project. Fixes for any of the release branches should first land in -the devel branch before they may be backported to the release branch. A +project][https://github.com/csi-addons/kubernetes-csi-addons]. There should be +no functional changes (only process/CI/building/..) in this repository compared +to the upstream project. Fixes for any of the release branches should first land +in the `main` branch before they may be backported to the release branch. A backport for the oldest release should also be backported to all the newer releases in order to prevent re-introducing a bug when a user updates. From 0126d83a8476cb16d5afa4db351d87b0f5973183 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 12 Oct 2023 09:51:30 +0200 Subject: [PATCH 3/3] cleanup: fix spelling mistakes Signed-off-by: Niels de Vos --- controllers/csiaddons/persistentvolumeclaim_controller.go | 2 +- controllers/csiaddons/reclaimspacecronjob_controller.go | 2 +- internal/proto/reclaimspace.proto | 2 +- internal/proto/replication.proto | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/controllers/csiaddons/persistentvolumeclaim_controller.go b/controllers/csiaddons/persistentvolumeclaim_controller.go index 85fe1d77c..8901a03a6 100644 --- a/controllers/csiaddons/persistentvolumeclaim_controller.go +++ b/controllers/csiaddons/persistentvolumeclaim_controller.go @@ -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. diff --git a/controllers/csiaddons/reclaimspacecronjob_controller.go b/controllers/csiaddons/reclaimspacecronjob_controller.go index 424632314..80250a0af 100644 --- a/controllers/csiaddons/reclaimspacecronjob_controller.go +++ b/controllers/csiaddons/reclaimspacecronjob_controller.go @@ -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. diff --git a/internal/proto/reclaimspace.proto b/internal/proto/reclaimspace.proto index 30b0d8d3f..bb6d09c3c 100644 --- a/internal/proto/reclaimspace.proto +++ b/internal/proto/reclaimspace.proto @@ -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 diff --git a/internal/proto/replication.proto b/internal/proto/replication.proto index 7b32ea375..a186b1705 100644 --- a/internal/proto/replication.proto +++ b/internal/proto/replication.proto @@ -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.