Merge pull request #155 from red-hat-storage/sync_us--main

Syncing latest changes from upstream main for kubernetes-csi-addons
red-hat-storage · Jun 20, 2024 · 2aaf4b0 · 2aaf4b0
2 parents dbffe27 + 650ffb2
commit 2aaf4b0
Show file tree

Hide file tree

Showing 63 changed files with 887 additions and 725 deletions.
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -219,6 +219,14 @@ rules:
   - volumereplications/status
   verbs:
   - update
+- apiGroups:
+  - storage.k8s.io
+  resources:
+  - storageclasses
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - storage.k8s.io
   resources:

diff --git a/controllers/csiaddons/persistentvolumeclaim_controller.go b/controllers/csiaddons/persistentvolumeclaim_controller.go
@@ -31,6 +31,7 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/robfig/cron/v3"
 	corev1 "k8s.io/api/core/v1"
+	storagev1 "k8s.io/api/storage/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -68,6 +69,7 @@ const (
 //+kubebuilder:rbac:groups=core,resources=persistentvolumeclaims/finalizers,verbs=update
 //+kubebuilder:rbac:groups=csiaddons.openshift.io,resources=reclaimspacecronjobs,verbs=get;list;watch;create;delete;update
 //+kubebuilder:rbac:groups=core,resources=namespaces,verbs=get;list;watch
+//+kubebuilder:rbac:groups=storage.k8s.io,resources=storageclasses,verbs=get;list;watch
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.  This is
@@ -260,6 +262,7 @@ func (r *PersistentVolumeClaimReconciler) determineScheduleAndRequeue(
 	if scheduleFound {
 		return schedule, nil
 	}
+
 	// check for namespace schedule annotation.
 	// We cannot have a generic solution for all CSI drivers to get the driver
 	// name from PV and check if driver supports space reclamation or not and
@@ -294,6 +297,18 @@ func (r *PersistentVolumeClaimReconciler) determineScheduleAndRequeue(
 		return "", ErrConnNotFoundRequeueNeeded
 	}
 
+	// check for storageclass schedule annotation.
+	sc := &storagev1.StorageClass{}
+	err = r.Client.Get(ctx, types.NamespacedName{Name: *pvc.Spec.StorageClassName}, sc)
+	if err != nil {
+		logger.Error(err, "Failed to get StorageClass", "StorageClass", *pvc.Spec.StorageClassName)
+		return "", err
+	}
+	schedule, scheduleFound = getScheduleFromAnnotation(logger, sc.Annotations)
+	if scheduleFound {
+		return schedule, nil
+	}
+
 	return "", ErrScheduleNotFound
 }
 

diff --git a/deploy/controller/rbac.yaml b/deploy/controller/rbac.yaml
@@ -269,6 +269,14 @@ rules:
   - volumereplications/status
   verbs:
   - update
+- apiGroups:
+  - storage.k8s.io
+  resources:
+  - storageclasses
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - storage.k8s.io
   resources:

diff --git a/docs/reclaimspace.md b/docs/reclaimspace.md
@@ -121,8 +121,31 @@ $ kubectl annotate namespace default "reclaimspace.csiaddons.openshift.io/schedu
 namespace/default annotated
 ```
 
-**Note** Please note that the PersistentVolumeClaim annotation takes priority
-over Namespace annotation. The kubernetes-csi-addons only generate a
-`ReclaimSpaceCronJob` if the annotation exists on the Namespace. If an admin
-needs to modify or delete the annotation on the Namespace, they must perform
-the same action on all the PersistentVolumeClaims within that Namespace.
+**Note** Please note that the PersistentVolumeClaim annotation takes priority over Namespace
+annotation. The kubernetes-csi-addons only generate a `ReclaimSpaceCronJob` if the annotation
+exists on the Namespace. If an admin needs to modify or delete the annotation on the Namespace,
+they must perform the same action on all the PersistentVolumeClaims within that Namespace.
+
+## Annotating StorageClass
+
+You can create `ReclaimSpaceCronJob` CR automatically by adding the
+`reclaimspace.csiaddons.openshift.io/schedule: "@midnight"` annotations to the StorageClass object.
+This will only affect new PersistentVolumeClaims created from this StorageClass for ReclaimSpace
+operations. To include existing PersistentVolumeClaims for ReclaimSpace operations, you must restart
+the controller. This will ensure that reclaimspace annotations are added to the existing
+PersistentVolumeClaims and `ReclaimSpaceCronJob` resources are created for them.
+
+```console
+$ kubectl get storageclass rbd-sc
+NAME       PROVISIONER        RECLAIMPOLICY   VOLUMEBINDINGMODE   ALLOWVOLUMEEXPANSION   AGE
+rbd-sc     rbd.csi.ceph.com   Delete          Immediate           true                   5d2h
+
+$ kubectl annotate storageclass rbd-sc "reclaimspace.csiaddons.openshift.io/schedule=@midnight"
+storageclass.storage.k8s.io/rbd-sc annotated
+```
+
+**Note** Please note that the PersistentVolumeClaim and Namespace annotation takes priority
+over StorageClass annotation. The kubernetes-csi-addons only generate a `ReclaimSpaceCronJob`
+if the annotation exists on the StorageClass. If an admin needs to modify or delete the
+annotation on the StorageClass, they must perform the same action on all the PersistentVolumeClaims
+created from this StorageClass.
diff --git a/internal/proto/networkfence.pb.go b/internal/proto/networkfence.pb.go
diff --git a/internal/proto/reclaimspace.pb.go b/internal/proto/reclaimspace.pb.go
diff --git a/internal/proto/replication.pb.go b/internal/proto/replication.pb.go
diff --git a/tools/go.mod b/tools/go.mod
@@ -5,7 +5,7 @@ go 1.22.0
 require (
 	github.com/operator-framework/operator-sdk v1.34.2
 	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.4.0
-	google.golang.org/protobuf v1.34.1
+	google.golang.org/protobuf v1.34.2
 	sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240102165319-7f316f1309b1
 	sigs.k8s.io/controller-tools v0.15.0
 	sigs.k8s.io/kustomize/kustomize/v5 v5.4.2

diff --git a/tools/go.sum b/tools/go.sum
@@ -749,8 +749,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
-google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

diff --git a/tools/vendor/google.golang.org/protobuf/cmd/protoc-gen-go/internal_gengo/reflect.go b/tools/vendor/google.golang.org/protobuf/cmd/protoc-gen-go/internal_gengo/reflect.go