Skip to content

Commit a26ae73

Browse files
committed
controllers: remove storageclaim from manager and move functionality
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]>
1 parent c99a838 commit a26ae73

File tree

3 files changed

+256
-151
lines changed

3 files changed

+256
-151
lines changed

cmd/main.go

-9
Original file line numberDiff line numberDiff line change
@@ -181,15 +181,6 @@ func main() {
181181
os.Exit(1)
182182
}
183183

184-
if err = (&controller.StorageClaimReconciler{
185-
Client: mgr.GetClient(),
186-
Scheme: mgr.GetScheme(),
187-
OperatorNamespace: utils.GetOperatorNamespace(),
188-
}).SetupWithManager(mgr); err != nil {
189-
setupLog.Error(err, "unable to create controller", "controller", "StorageClaim")
190-
os.Exit(1)
191-
}
192-
193184
if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
194185
setupLog.Error(err, "unable to set up health check")
195186
os.Exit(1)

internal/controller/storageclaim_controller.go

-3
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ const (
5151
storageClaimFinalizer = "storageclaim.ocs.openshift.io"
5252
storageClaimAnnotation = "ocs.openshift.io/storageclaim"
5353
keyRotationAnnotation = "keyrotation.csiaddons.openshift.io/schedule"
54-
55-
pvClusterIDIndexName = "index:persistentVolumeClusterID"
56-
vscClusterIDIndexName = "index:volumeSnapshotContentCSIDriver"
5754
)
5855

5956
// StorageClaimReconciler reconciles a StorageClaim object

0 commit comments

Comments
 (0)