diff --git a/pkg/controller/volume/persistentvolume/framework_test.go b/pkg/controller/volume/persistentvolume/framework_test.go index e5a3130084a67..4bc00283c772b 100644 --- a/pkg/controller/volume/persistentvolume/framework_test.go +++ b/pkg/controller/volume/persistentvolume/framework_test.go @@ -475,7 +475,7 @@ func newClaim(name, claimUID, capacity, boundToVolume string, phase v1.Persisten claim.Annotations = make(map[string]string) for _, a := range annotations { switch a { - case storagehelpers.AnnBetaStorageProvisioner, storagehelpers.AnnStorageProvisioner: + case storagehelpers.AnnStorageProvisioner: claim.Annotations[a] = mockPluginName default: claim.Annotations[a] = "yes" diff --git a/pkg/controller/volume/persistentvolume/provision_test.go b/pkg/controller/volume/persistentvolume/provision_test.go index a3a0b357877e9..bda135c786bd0 100644 --- a/pkg/controller/volume/persistentvolume/provision_test.go +++ b/pkg/controller/volume/persistentvolume/provision_test.go @@ -181,7 +181,7 @@ func TestProvisionSync(t *testing.T) { expectedVolumes: volumesWithFinalizers(newVolumeArray("pvc-uid11-1", "1Gi", "uid11-1", "claim11-1", v1.VolumeBound, v1.PersistentVolumeReclaimDelete, classGold, volume.AnnBoundByController, volume.AnnDynamicallyProvisioned), []string{volume.PVDeletionInTreeProtectionFinalizer}), // Binding will be completed in the next syncClaim initialClaims: newClaimArray("claim11-1", "uid11-1", "1Gi", "", v1.ClaimPending, &classGold), - expectedClaims: newClaimArray("claim11-1", "uid11-1", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner, volume.AnnBetaStorageProvisioner), + expectedClaims: newClaimArray("claim11-1", "uid11-1", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner), expectedEvents: []string{"Normal ProvisioningSucceeded"}, errors: noerrors, test: wrapTestWithProvisionCalls([]provisionCall{provision1Success}, testSyncClaim), @@ -203,7 +203,7 @@ func TestProvisionSync(t *testing.T) { initialVolumes: novolumes, expectedVolumes: novolumes, initialClaims: newClaimArray("claim11-3", "uid11-3", "1Gi", "", v1.ClaimPending, &classGold), - expectedClaims: newClaimArray("claim11-3", "uid11-3", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner, volume.AnnBetaStorageProvisioner), + expectedClaims: newClaimArray("claim11-3", "uid11-3", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner), expectedEvents: []string{"Warning ProvisioningFailed"}, errors: noerrors, test: wrapTestWithProvisionCalls([]provisionCall{}, testSyncClaim), @@ -214,7 +214,7 @@ func TestProvisionSync(t *testing.T) { initialVolumes: novolumes, expectedVolumes: novolumes, initialClaims: newClaimArray("claim11-4", "uid11-4", "1Gi", "", v1.ClaimPending, &classGold), - expectedClaims: newClaimArray("claim11-4", "uid11-4", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner, volume.AnnBetaStorageProvisioner), + expectedClaims: newClaimArray("claim11-4", "uid11-4", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner), expectedEvents: []string{"Warning ProvisioningFailed"}, errors: noerrors, test: wrapTestWithProvisionCalls([]provisionCall{provision1Error}, testSyncClaim), @@ -240,7 +240,7 @@ func TestProvisionSync(t *testing.T) { expectedVolumes: newVolumeArray("pvc-uid11-7", "1Gi", "uid11-7", "claim11-7", v1.VolumeBound, v1.PersistentVolumeReclaimDelete, classGold, volume.AnnBoundByController, volume.AnnDynamicallyProvisioned), initialClaims: newClaimArray("claim11-7", "uid11-7", "1Gi", "", v1.ClaimPending, &classGold), // The claim would be bound in next syncClaim - expectedClaims: newClaimArray("claim11-7", "uid11-7", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner, volume.AnnBetaStorageProvisioner), + expectedClaims: newClaimArray("claim11-7", "uid11-7", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner), expectedEvents: noevents, errors: noerrors, test: wrapTestWithInjectedOperation(wrapTestWithProvisionCalls([]provisionCall{}, testSyncClaim), func(ctrl *PersistentVolumeController, reactor *pvtesting.VolumeReactor) { @@ -258,7 +258,7 @@ func TestProvisionSync(t *testing.T) { expectedVolumes: volumesWithFinalizers(newVolumeArray("pvc-uid11-8", "1Gi", "uid11-8", "claim11-8", v1.VolumeBound, v1.PersistentVolumeReclaimDelete, classGold, volume.AnnBoundByController, volume.AnnDynamicallyProvisioned), []string{volume.PVDeletionInTreeProtectionFinalizer}), initialClaims: newClaimArray("claim11-8", "uid11-8", "1Gi", "", v1.ClaimPending, &classGold), // Binding will be completed in the next syncClaim - expectedClaims: newClaimArray("claim11-8", "uid11-8", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner, volume.AnnBetaStorageProvisioner), + expectedClaims: newClaimArray("claim11-8", "uid11-8", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner), expectedEvents: []string{"Normal ProvisioningSucceeded"}, errors: []pvtesting.ReactorError{ // Inject error to the first @@ -275,7 +275,7 @@ func TestProvisionSync(t *testing.T) { initialVolumes: novolumes, expectedVolumes: novolumes, initialClaims: newClaimArray("claim11-9", "uid11-9", "1Gi", "", v1.ClaimPending, &classGold), - expectedClaims: newClaimArray("claim11-9", "uid11-9", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner, volume.AnnBetaStorageProvisioner), + expectedClaims: newClaimArray("claim11-9", "uid11-9", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner), expectedEvents: []string{"Warning ProvisioningFailed"}, errors: []pvtesting.ReactorError{ // Inject error to five kubeclient.PersistentVolumes.Create() @@ -300,7 +300,7 @@ func TestProvisionSync(t *testing.T) { initialVolumes: novolumes, expectedVolumes: novolumes, initialClaims: newClaimArray("claim11-10", "uid11-10", "1Gi", "", v1.ClaimPending, &classGold), - expectedClaims: newClaimArray("claim11-10", "uid11-10", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner, volume.AnnBetaStorageProvisioner), + expectedClaims: newClaimArray("claim11-10", "uid11-10", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner), expectedEvents: []string{"Warning ProvisioningFailed", "Warning ProvisioningCleanupFailed"}, errors: []pvtesting.ReactorError{ // Inject error to five kubeclient.PersistentVolumes.Create() @@ -321,7 +321,7 @@ func TestProvisionSync(t *testing.T) { initialVolumes: novolumes, expectedVolumes: novolumes, initialClaims: newClaimArray("claim11-11", "uid11-11", "1Gi", "", v1.ClaimPending, &classGold), - expectedClaims: newClaimArray("claim11-11", "uid11-11", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner, volume.AnnBetaStorageProvisioner), + expectedClaims: newClaimArray("claim11-11", "uid11-11", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner), expectedEvents: []string{"Warning ProvisioningFailed", "Warning ProvisioningCleanupFailed"}, errors: []pvtesting.ReactorError{ // Inject error to five kubeclient.PersistentVolumes.Create() @@ -351,7 +351,7 @@ func TestProvisionSync(t *testing.T) { initialVolumes: novolumes, expectedVolumes: novolumes, initialClaims: newClaimArray("claim11-12", "uid11-12", "1Gi", "", v1.ClaimPending, &classGold), - expectedClaims: newClaimArray("claim11-12", "uid11-12", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner, volume.AnnBetaStorageProvisioner), + expectedClaims: newClaimArray("claim11-12", "uid11-12", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner), expectedEvents: []string{"Warning ProvisioningFailed"}, errors: []pvtesting.ReactorError{ // Inject error to five kubeclient.PersistentVolumes.Create() @@ -379,7 +379,7 @@ func TestProvisionSync(t *testing.T) { expectedVolumes: volumesWithFinalizers(newVolumeArray("pvc-uid11-13", "1Gi", "uid11-13", "claim11-13", v1.VolumeBound, v1.PersistentVolumeReclaimDelete, classSilver, volume.AnnBoundByController, volume.AnnDynamicallyProvisioned), []string{volume.PVDeletionInTreeProtectionFinalizer}), initialClaims: newClaimArray("claim11-13", "uid11-13", "1Gi", "", v1.ClaimPending, &classSilver), // Binding will be completed in the next syncClaim - expectedClaims: newClaimArray("claim11-13", "uid11-13", "1Gi", "", v1.ClaimPending, &classSilver, volume.AnnStorageProvisioner, volume.AnnBetaStorageProvisioner), + expectedClaims: newClaimArray("claim11-13", "uid11-13", "1Gi", "", v1.ClaimPending, &classSilver, volume.AnnStorageProvisioner), expectedEvents: []string{"Normal ProvisioningSucceeded"}, errors: noerrors, test: wrapTestWithProvisionCalls([]provisionCall{provision2Success}, testSyncClaim), @@ -423,9 +423,8 @@ func TestProvisionSync(t *testing.T) { initialVolumes: novolumes, expectedVolumes: novolumes, initialClaims: newClaimArray("claim11-17", "uid11-17", "1Gi", "", v1.ClaimPending, &classExternal), - expectedClaims: claimWithAnnotation(volume.AnnBetaStorageProvisioner, "vendor.com/my-volume", - claimWithAnnotation(volume.AnnStorageProvisioner, "vendor.com/my-volume", - newClaimArray("claim11-17", "uid11-17", "1Gi", "", v1.ClaimPending, &classExternal))), + expectedClaims: claimWithAnnotation(volume.AnnStorageProvisioner, "vendor.com/my-volume", + newClaimArray("claim11-17", "uid11-17", "1Gi", "", v1.ClaimPending, &classExternal)), expectedEvents: []string{"Normal ExternalProvisioning"}, errors: noerrors, test: wrapTestWithProvisionCalls([]provisionCall{}, testSyncClaim), @@ -456,7 +455,7 @@ func TestProvisionSync(t *testing.T) { // end of the test is empty. novolumes, newClaimArray("claim11-19", "uid11-19", "1Gi", "", v1.ClaimPending, &classGold), - newClaimArray("claim11-19", "uid11-19", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner, volume.AnnBetaStorageProvisioner), + newClaimArray("claim11-19", "uid11-19", "1Gi", "", v1.ClaimPending, &classGold, volume.AnnStorageProvisioner), noevents, []pvtesting.ReactorError{ // Inject errors to simulate crashed API server during @@ -477,7 +476,7 @@ func TestProvisionSync(t *testing.T) { initialVolumes: novolumes, expectedVolumes: novolumes, initialClaims: newClaimArray("claim11-20", "uid11-20", "1Gi", "", v1.ClaimPending, &classUnsupportedMountOptions), - expectedClaims: newClaimArray("claim11-20", "uid11-20", "1Gi", "", v1.ClaimPending, &classUnsupportedMountOptions, volume.AnnStorageProvisioner, volume.AnnBetaStorageProvisioner), + expectedClaims: newClaimArray("claim11-20", "uid11-20", "1Gi", "", v1.ClaimPending, &classUnsupportedMountOptions, volume.AnnStorageProvisioner), // Expect event to be prefixed with "Mount options" because saving PV will fail anyway expectedEvents: []string{"Warning ProvisioningFailed Mount options"}, errors: noerrors, @@ -493,9 +492,8 @@ func TestProvisionSync(t *testing.T) { annotateClaim( newClaim("claim11-21", "uid11-21", "1Gi", "", v1.ClaimPending, &classGold), map[string]string{ - volume.AnnStorageProvisioner: "vendor.com/MockCSIDriver", - volume.AnnBetaStorageProvisioner: "vendor.com/MockCSIDriver", - volume.AnnMigratedTo: "vendor.com/MockCSIDriver", + volume.AnnStorageProvisioner: "vendor.com/MockCSIDriver", + volume.AnnMigratedTo: "vendor.com/MockCSIDriver", }), }, expectedEvents: []string{"Normal ExternalProvisioning"}, @@ -525,7 +523,7 @@ func TestProvisionSync(t *testing.T) { claimWithAnnotation(volume.AnnSelectedNode, "node1", newClaimArray("claim11-23", "uid11-23", "1Gi", "", v1.ClaimPending, &classCopper)), claimWithAnnotation(volume.AnnSelectedNode, "node1", - newClaimArray("claim11-23", "uid11-23", "1Gi", "", v1.ClaimPending, &classCopper, volume.AnnStorageProvisioner, volume.AnnBetaStorageProvisioner)), + newClaimArray("claim11-23", "uid11-23", "1Gi", "", v1.ClaimPending, &classCopper, volume.AnnStorageProvisioner)), []string{"Normal ProvisioningSucceeded"}, noerrors, wrapTestWithInjectedOperation(wrapTestWithProvisionCalls([]provisionCall{provision1Success}, testSyncClaim), @@ -543,10 +541,9 @@ func TestProvisionSync(t *testing.T) { expectedVolumes: newVolumeArray("volume11-24", "1Gi", "", "", v1.VolumeAvailable, v1.PersistentVolumeReclaimDelete, classExternalWait), initialClaims: claimWithAnnotation(volume.AnnSelectedNode, "node1", newClaimArray("claim11-24", "uid11-24", "1Gi", "", v1.ClaimPending, &classExternalWait)), - expectedClaims: claimWithAnnotation(volume.AnnBetaStorageProvisioner, "vendor.com/my-volume-wait", - claimWithAnnotation(volume.AnnStorageProvisioner, "vendor.com/my-volume-wait", - claimWithAnnotation(volume.AnnSelectedNode, "node1", - newClaimArray("claim11-24", "uid11-24", "1Gi", "", v1.ClaimPending, &classExternalWait)))), + expectedClaims: claimWithAnnotation(volume.AnnStorageProvisioner, "vendor.com/my-volume-wait", + claimWithAnnotation(volume.AnnSelectedNode, "node1", + newClaimArray("claim11-24", "uid11-24", "1Gi", "", v1.ClaimPending, &classExternalWait))), expectedEvents: []string{"Normal ExternalProvisioning"}, errors: noerrors, test: testSyncClaim, @@ -604,7 +601,7 @@ func TestProvisionMultiSync(t *testing.T) { initialVolumes: novolumes, expectedVolumes: newVolumeArray("pvc-uid12-1", "1Gi", "uid12-1", "claim12-1", v1.VolumeBound, v1.PersistentVolumeReclaimDelete, classGold, volume.AnnBoundByController, volume.AnnDynamicallyProvisioned), initialClaims: newClaimArray("claim12-1", "uid12-1", "1Gi", "", v1.ClaimPending, &classGold), - expectedClaims: newClaimArray("claim12-1", "uid12-1", "1Gi", "pvc-uid12-1", v1.ClaimBound, &classGold, volume.AnnBoundByController, volume.AnnBindCompleted, volume.AnnStorageProvisioner, volume.AnnBetaStorageProvisioner), + expectedClaims: newClaimArray("claim12-1", "uid12-1", "1Gi", "pvc-uid12-1", v1.ClaimBound, &classGold, volume.AnnBoundByController, volume.AnnBindCompleted, volume.AnnStorageProvisioner), expectedEvents: noevents, errors: noerrors, test: wrapTestWithProvisionCalls([]provisionCall{provision1Success}, testSyncClaim), @@ -615,9 +612,8 @@ func TestProvisionMultiSync(t *testing.T) { initialVolumes: novolumes, expectedVolumes: newVolumeArray("pvc-uid12-2", "1Gi", "uid12-2", "claim12-2", v1.VolumeBound, v1.PersistentVolumeReclaimRetain, classExternal, volume.AnnBoundByController), initialClaims: newClaimArray("claim12-2", "uid12-2", "1Gi", "", v1.ClaimPending, &classExternal), - expectedClaims: claimWithAnnotation(volume.AnnBetaStorageProvisioner, "vendor.com/my-volume", - claimWithAnnotation(volume.AnnStorageProvisioner, "vendor.com/my-volume", - newClaimArray("claim12-2", "uid12-2", "1Gi", "pvc-uid12-2", v1.ClaimBound, &classExternal, volume.AnnBoundByController, volume.AnnBindCompleted))), + expectedClaims: claimWithAnnotation(volume.AnnStorageProvisioner, "vendor.com/my-volume", + newClaimArray("claim12-2", "uid12-2", "1Gi", "pvc-uid12-2", v1.ClaimBound, &classExternal, volume.AnnBoundByController, volume.AnnBindCompleted)), expectedEvents: []string{"Normal ExternalProvisioning"}, errors: noerrors, test: wrapTestWithInjectedOperation(wrapTestWithProvisionCalls([]provisionCall{}, testSyncClaim), func(ctrl *PersistentVolumeController, reactor *pvtesting.VolumeReactor) { @@ -641,9 +637,8 @@ func TestProvisionMultiSync(t *testing.T) { initialVolumes: novolumes, expectedVolumes: novolumes, initialClaims: newClaimArray("claim12-3", "uid12-3", "1Gi", "", v1.ClaimPending, &classExternal), - expectedClaims: claimWithAnnotation(volume.AnnBetaStorageProvisioner, "vendor.com/my-volume", - claimWithAnnotation(volume.AnnStorageProvisioner, "vendor.com/my-volume", - newClaimArray("claim12-3", "uid12-3", "1Gi", "", v1.ClaimPending, &classExternal))), + expectedClaims: claimWithAnnotation(volume.AnnStorageProvisioner, "vendor.com/my-volume", + newClaimArray("claim12-3", "uid12-3", "1Gi", "", v1.ClaimPending, &classExternal)), expectedEvents: []string{"Normal ExternalProvisioning"}, errors: noerrors, test: wrapTestWithProvisionCalls([]provisionCall{provision1Success}, testSyncClaim), @@ -654,9 +649,8 @@ func TestProvisionMultiSync(t *testing.T) { initialVolumes: novolumes, expectedVolumes: newVolumeArray("pvc-uid12-4", "1Gi", "uid12-4", "claim12-4", v1.VolumeBound, v1.PersistentVolumeReclaimRetain, classExternal, volume.AnnBoundByController), initialClaims: newClaimArray("claim12-4", "uid12-4", "1Gi", "", v1.ClaimPending, &classExternal), - expectedClaims: claimWithAnnotation(volume.AnnBetaStorageProvisioner, "vendor.com/my-volume", - claimWithAnnotation(volume.AnnStorageProvisioner, "vendor.com/my-volume", - newClaimArray("claim12-4", "uid12-4", "1Gi", "pvc-uid12-4", v1.ClaimBound, &classExternal, volume.AnnBoundByController, volume.AnnBindCompleted))), + expectedClaims: claimWithAnnotation(volume.AnnStorageProvisioner, "vendor.com/my-volume", + newClaimArray("claim12-4", "uid12-4", "1Gi", "pvc-uid12-4", v1.ClaimBound, &classExternal, volume.AnnBoundByController, volume.AnnBindCompleted)), expectedEvents: []string{"Normal ExternalProvisioning"}, errors: noerrors, test: wrapTestWithInjectedOperation(wrapTestWithProvisionCalls([]provisionCall{}, testSyncClaim), func(ctrl *PersistentVolumeController, reactor *pvtesting.VolumeReactor) { diff --git a/pkg/controller/volume/persistentvolume/pv_controller_base.go b/pkg/controller/volume/persistentvolume/pv_controller_base.go index 336203fd00453..ebadd25551a48 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller_base.go +++ b/pkg/controller/volume/persistentvolume/pv_controller_base.go @@ -457,16 +457,8 @@ func updateMigrationAnnotations(cmpm CSIMigratedPluginManager, translator CSINam } provisioner, ok := ann[provisionerKey] if !ok { - if claim { - // Also check beta AnnStorageProvisioner annontation to make sure - provisioner, ok = ann[storagehelpers.AnnBetaStorageProvisioner] - if !ok { - return false - } - } else { - // Volume Statically provisioned. - return false - } + // Volume Statically provisioned. + return false } migratedToDriver := ann[storagehelpers.AnnMigratedTo] @@ -641,8 +633,6 @@ func (ctrl *PersistentVolumeController) setClaimProvisioner(ctx context.Context, // The volume from method args can be pointing to watcher cache. We must not // modify these, therefore create a copy. claimClone := claim.DeepCopy() - // TODO: remove the beta storage provisioner anno after the deprecation period - metav1.SetMetaDataAnnotation(&claimClone.ObjectMeta, storagehelpers.AnnBetaStorageProvisioner, provisionerName) metav1.SetMetaDataAnnotation(&claimClone.ObjectMeta, storagehelpers.AnnStorageProvisioner, provisionerName) updateMigrationAnnotations(ctrl.csiMigratedPluginManager, ctrl.translator, claimClone.Annotations, true) newClaim, err := ctrl.kubeClient.CoreV1().PersistentVolumeClaims(claim.Namespace).Update(context.TODO(), claimClone, metav1.UpdateOptions{}) diff --git a/pkg/controller/volume/persistentvolume/pv_controller_test.go b/pkg/controller/volume/persistentvolume/pv_controller_test.go index a40921a51bafa..433ada1570b72 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller_test.go +++ b/pkg/controller/volume/persistentvolume/pv_controller_test.go @@ -517,13 +517,6 @@ func TestAnnealMigrationAnnotations(t *testing.T) { claimAnnotations: map[string]string{volume.AnnStorageProvisioner: migratedPlugin}, expClaimAnnotations: map[string]string{volume.AnnStorageProvisioner: migratedPlugin, volume.AnnMigratedTo: migratedDriver}, }, - { - name: "migration on with Beta storage provisioner annontation", - volumeAnnotations: map[string]string{volume.AnnDynamicallyProvisioned: migratedPlugin}, - expVolumeAnnotations: map[string]string{volume.AnnDynamicallyProvisioned: migratedPlugin, volume.AnnMigratedTo: migratedDriver}, - claimAnnotations: map[string]string{volume.AnnBetaStorageProvisioner: migratedPlugin}, - expClaimAnnotations: map[string]string{volume.AnnBetaStorageProvisioner: migratedPlugin, volume.AnnMigratedTo: migratedDriver}, - }, { name: "migration off", volumeAnnotations: map[string]string{volume.AnnDynamicallyProvisioned: nonmigratedPlugin}, @@ -538,13 +531,6 @@ func TestAnnealMigrationAnnotations(t *testing.T) { claimAnnotations: map[string]string{volume.AnnStorageProvisioner: nonmigratedPlugin, volume.AnnMigratedTo: nonmigratedDriver}, expClaimAnnotations: map[string]string{volume.AnnStorageProvisioner: nonmigratedPlugin}, }, - { - name: "migration off removes migrated to (rollback) with Beta storage provisioner annontation", - volumeAnnotations: map[string]string{volume.AnnDynamicallyProvisioned: nonmigratedPlugin, volume.AnnMigratedTo: nonmigratedDriver}, - expVolumeAnnotations: map[string]string{volume.AnnDynamicallyProvisioned: nonmigratedPlugin}, - claimAnnotations: map[string]string{volume.AnnBetaStorageProvisioner: nonmigratedPlugin, volume.AnnMigratedTo: nonmigratedDriver}, - expClaimAnnotations: map[string]string{volume.AnnBetaStorageProvisioner: nonmigratedPlugin}, - }, { name: "migration on, other plugin not affected", volumeAnnotations: map[string]string{volume.AnnDynamicallyProvisioned: testPlugin}, diff --git a/staging/src/k8s.io/component-helpers/storage/volume/pv_helpers.go b/staging/src/k8s.io/component-helpers/storage/volume/pv_helpers.go index f927b72314a66..b11fb2bc46bdd 100644 --- a/staging/src/k8s.io/component-helpers/storage/volume/pv_helpers.go +++ b/staging/src/k8s.io/component-helpers/storage/volume/pv_helpers.go @@ -70,9 +70,7 @@ const ( // AnnStorageProvisioner annotation is added to a PVC that is supposed to be dynamically // provisioned. Its value is name of volume plugin that is supposed to provision // a volume for this PVC. - // TODO: remove beta anno once deprecation period ends - AnnStorageProvisioner = "volume.kubernetes.io/storage-provisioner" - AnnBetaStorageProvisioner = "volume.beta.kubernetes.io/storage-provisioner" + AnnStorageProvisioner = "volume.kubernetes.io/storage-provisioner" //PVDeletionProtectionFinalizer is the finalizer added by the external-provisioner on the PV PVDeletionProtectionFinalizer = "external-provisioner.volume.kubernetes.io/finalizer"