-
Notifications
You must be signed in to change notification settings - Fork 40
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #369 from jakobmoellerdev/OCPBUGS-15576
OCPBUGS-15576: fix: ensure panic safety in PVC controller for non set storageClassName
- Loading branch information
Showing
5 changed files
with
169 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| package persistent_volume_claim_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "reflect" | ||
| "strings" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/openshift/lvm-operator/controllers" | ||
| persistentvolumeclaim "github.com/openshift/lvm-operator/controllers/persistent-volume-claim" | ||
|
|
||
| v1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| "k8s.io/client-go/tools/record" | ||
| "k8s.io/utils/pointer" | ||
| controllerruntime "sigs.k8s.io/controller-runtime" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/client/fake" | ||
| ) | ||
|
|
||
| func TestPersistentVolumeClaimReconciler_Reconcile(t *testing.T) { | ||
| defaultNamespace := "openshift-storage" | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| req controllerruntime.Request | ||
| objs []client.Object | ||
| wantErr bool | ||
| expectNoStorageAvailable bool | ||
| }{ | ||
| { | ||
| name: "testing set deletionTimestamp", | ||
| req: controllerruntime.Request{NamespacedName: types.NamespacedName{ | ||
| Namespace: defaultNamespace, | ||
| Name: "test-deletionTimestamp", | ||
| }}, | ||
| objs: []client.Object{ | ||
| &v1.PersistentVolumeClaim{ | ||
| ObjectMeta: metav1.ObjectMeta{Namespace: defaultNamespace, Name: "test-deletionTimestamp", | ||
| DeletionTimestamp: &metav1.Time{Time: time.Now()}}, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "testing empty storageClassName", | ||
| req: controllerruntime.Request{NamespacedName: types.NamespacedName{ | ||
| Namespace: defaultNamespace, | ||
| Name: "test-emptyStorageClassName", | ||
| }}, | ||
| objs: []client.Object{ | ||
| &v1.PersistentVolumeClaim{ | ||
| ObjectMeta: metav1.ObjectMeta{Namespace: defaultNamespace, Name: "test-emptyStorageClassName"}, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "testing non-applicable storageClassName", | ||
| req: controllerruntime.Request{NamespacedName: types.NamespacedName{ | ||
| Namespace: defaultNamespace, | ||
| Name: "test-nonApplicableStorageClassName", | ||
| }}, | ||
| objs: []client.Object{ | ||
| &v1.PersistentVolumeClaim{ | ||
| ObjectMeta: metav1.ObjectMeta{Namespace: defaultNamespace, Name: "test-nonApplicableStorageClassName"}, | ||
| Spec: v1.PersistentVolumeClaimSpec{ | ||
| StorageClassName: pointer.String("blabla"), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "testing non-pending PVC is skipped", | ||
| req: controllerruntime.Request{NamespacedName: types.NamespacedName{ | ||
| Namespace: defaultNamespace, | ||
| Name: "test-non-pending-PVC", | ||
| }}, | ||
| objs: []client.Object{ | ||
| &v1.PersistentVolumeClaim{ | ||
| ObjectMeta: metav1.ObjectMeta{Namespace: defaultNamespace, Name: "test-non-pending-PVC"}, | ||
| Spec: v1.PersistentVolumeClaimSpec{ | ||
| StorageClassName: pointer.String(controllers.StorageClassPrefix + "bla"), | ||
| }, | ||
| Status: v1.PersistentVolumeClaimStatus{ | ||
| Phase: v1.ClaimBound, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "testing pending PVC is proccessed", | ||
| req: controllerruntime.Request{NamespacedName: types.NamespacedName{ | ||
| Namespace: defaultNamespace, | ||
| Name: "test-pending-PVC", | ||
| }}, | ||
| objs: []client.Object{ | ||
| &v1.PersistentVolumeClaim{ | ||
| ObjectMeta: metav1.ObjectMeta{Namespace: defaultNamespace, Name: "test-pending-PVC"}, | ||
| Spec: v1.PersistentVolumeClaimSpec{ | ||
| StorageClassName: pointer.String(controllers.StorageClassPrefix + "bla"), | ||
| }, | ||
| Status: v1.PersistentVolumeClaimStatus{ | ||
| Phase: v1.ClaimPending, | ||
| }, | ||
| }, | ||
| }, | ||
| expectNoStorageAvailable: true, | ||
| }, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| recorder := record.NewFakeRecorder(1) | ||
| r := &persistentvolumeclaim.PersistentVolumeClaimReconciler{ | ||
| Client: fake.NewClientBuilder().WithObjects(tt.objs...).Build(), | ||
| Recorder: recorder, | ||
| } | ||
| got, err := r.Reconcile(context.Background(), tt.req) | ||
| if (err != nil) != tt.wantErr { | ||
| t.Errorf("Reconcile() error = %v, wantErr %v", err, tt.wantErr) | ||
| return | ||
| } | ||
| if !reflect.DeepEqual(got, controllerruntime.Result{}) { | ||
| t.Errorf("Reconcile() got non default Result") | ||
| return | ||
| } | ||
|
|
||
| if tt.expectNoStorageAvailable { | ||
| select { | ||
| case event := <-recorder.Events: | ||
| if !strings.Contains(event, "NotEnoughCapacity") { | ||
| t.Errorf("event was captured but it did not contain the reason NotEnoughCapacity") | ||
| return | ||
| } | ||
| case <-time.After(100 * time.Millisecond): | ||
| t.Errorf("wanted event that no storage is available but none was sent") | ||
| return | ||
| } | ||
|
|
||
| } | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters