Skip to content
This repository was archived by the owner on Oct 22, 2024. It is now read-only.

Commit 60e252f

Browse files
authored
Merge pull request #1053 from intel/reschedule-delete
avoid Delete call in controller
2 parents f6ee960 + e99a942 commit 60e252f

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

docs/DEVELOPMENT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ $ make operator-generate-bundle VERSION=<X.Y.Z> REPLACES=<X.Y.Z> # semantic vers
142142
```
143143
Running the above command generates the OLM package bundle files under `deploy/olm-bundle/<X.Y.Z>`
144144

145-
* Clone `operator-framework/community-operators` repository
145+
* Clone `k8s-operatorhub/community-operators` repository
146146
``` console
147147
$ git clone https://github.com/k8s-operatorhub/community-operators.git
148148
```

pkg/pmem-csi-driver/rescheduler.go

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ package pmemcsidriver
88

99
import (
1010
"context"
11-
"errors"
1211
"fmt"
1312

1413
pmemlog "github.com/intel/pmem-csi/pkg/logger"
@@ -74,6 +73,10 @@ type pmemCSIProvisioner struct {
7473
provisionController *controller.ProvisionController
7574
}
7675

76+
var _ controller.Qualifier = &pmemCSIProvisioner{}
77+
var _ controller.DeletionGuard = &pmemCSIProvisioner{}
78+
var _ controller.BlockProvisioner = &pmemCSIProvisioner{}
79+
7780
// startRescheduler logs errors and cancels the context when it runs
7881
// into a problem, either during the startup phase (blocking) or later
7982
// at runtime (in a go routine).
@@ -131,8 +134,18 @@ func (pcp *pmemCSIProvisioner) Provision(ctx context.Context, opts controller.Pr
131134
return nil, controller.ProvisioningNoChange, err
132135
}
133136

137+
func (pcp *pmemCSIProvisioner) ShouldDelete(context.Context, *v1.PersistentVolume) bool {
138+
return false
139+
}
140+
134141
func (pcp *pmemCSIProvisioner) Delete(context.Context, *v1.PersistentVolume) error {
135-
return errors.New("not implemented")
142+
return &controller.IgnoredError{
143+
Reason: "deletion must be done on the node",
144+
}
145+
}
146+
147+
func (pcp *pmemCSIProvisioner) SupportsBlock(context.Context) bool {
148+
return true
136149
}
137150

138151
func (pcp *pmemCSIProvisioner) shouldReschedule(ctx context.Context, pvc *v1.PersistentVolumeClaim, node *v1.Node) (bool, error) {

0 commit comments

Comments
 (0)