Skip to content

Commit

Permalink
controllers: remove storageclaim from manager and move functionality
Browse files Browse the repository at this point in the history
first cut of removal of storageclaim controller and moving the work
over to the storageclient controller. Existing resources that are owned
by storageclaims will become unmanaged but protected against deletion
due to finalizer for which current expectation is to be removed manually

no provider changes done atm and the expectation is, provider would
send info that it used to send for storageclaim now to storageclient and
any opportunity to change the message struct will be made and
corresondingly a new PR will be raised.

Signed-off-by: Leela Venkaiah G <[email protected]>
  • Loading branch information
leelavg committed Dec 3, 2024
1 parent c99a838 commit a26ae73
Show file tree
Hide file tree
Showing 3 changed files with 256 additions and 151 deletions.
9 changes: 0 additions & 9 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,15 +181,6 @@ func main() {
os.Exit(1)
}

if err = (&controller.StorageClaimReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
OperatorNamespace: utils.GetOperatorNamespace(),
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "StorageClaim")
os.Exit(1)
}

if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
setupLog.Error(err, "unable to set up health check")
os.Exit(1)
Expand Down
3 changes: 0 additions & 3 deletions internal/controller/storageclaim_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ const (
storageClaimFinalizer = "storageclaim.ocs.openshift.io"
storageClaimAnnotation = "ocs.openshift.io/storageclaim"
keyRotationAnnotation = "keyrotation.csiaddons.openshift.io/schedule"

pvClusterIDIndexName = "index:persistentVolumeClusterID"
vscClusterIDIndexName = "index:volumeSnapshotContentCSIDriver"
)

// StorageClaimReconciler reconciles a StorageClaim object
Expand Down
Loading

0 comments on commit a26ae73

Please sign in to comment.