diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
index ee393871ea9..45a5b676837 100644
--- a/api/openapi-spec/swagger.json
+++ b/api/openapi-spec/swagger.json
@@ -88492,7 +88492,7 @@
"type": "boolean"
},
"allowedTopologies": {
- "description": "Restrict the node topologies where volumes can be dynamically provisioned. Each volume plugin defines its own supported topology specifications. An empty TopologySelectorTerm list means there is no topology restriction. This field is alpha-level and is only honored by servers that enable the DynamicProvisioningScheduling feature.",
+ "description": "Restrict the node topologies where volumes can be dynamically provisioned. Each volume plugin defines its own supported topology specifications. An empty TopologySelectorTerm list means there is no topology restriction. This field is only honored by servers that enable the VolumeScheduling feature.",
"type": "array",
"items": {
"$ref": "#/definitions/io.k8s.api.core.v1.TopologySelectorTerm"
@@ -88533,7 +88533,7 @@
"type": "string"
},
"volumeBindingMode": {
- "description": "VolumeBindingMode indicates how PersistentVolumeClaims should be provisioned and bound. When unset, VolumeBindingImmediate is used. This field is alpha-level and is only honored by servers that enable the VolumeScheduling feature.",
+ "description": "VolumeBindingMode indicates how PersistentVolumeClaims should be provisioned and bound. When unset, VolumeBindingImmediate is used. This field is only honored by servers that enable the VolumeScheduling feature.",
"type": "string"
}
},
@@ -88730,7 +88730,7 @@
"type": "boolean"
},
"allowedTopologies": {
- "description": "Restrict the node topologies where volumes can be dynamically provisioned. Each volume plugin defines its own supported topology specifications. An empty TopologySelectorTerm list means there is no topology restriction. This field is alpha-level and is only honored by servers that enable the DynamicProvisioningScheduling feature.",
+ "description": "Restrict the node topologies where volumes can be dynamically provisioned. Each volume plugin defines its own supported topology specifications. An empty TopologySelectorTerm list means there is no topology restriction. This field is only honored by servers that enable the VolumeScheduling feature.",
"type": "array",
"items": {
"$ref": "#/definitions/io.k8s.api.core.v1.TopologySelectorTerm"
@@ -88771,7 +88771,7 @@
"type": "string"
},
"volumeBindingMode": {
- "description": "VolumeBindingMode indicates how PersistentVolumeClaims should be provisioned and bound. When unset, VolumeBindingImmediate is used. This field is alpha-level and is only honored by servers that enable the VolumeScheduling feature.",
+ "description": "VolumeBindingMode indicates how PersistentVolumeClaims should be provisioned and bound. When unset, VolumeBindingImmediate is used. This field is only honored by servers that enable the VolumeScheduling feature.",
"type": "string"
}
},
diff --git a/api/swagger-spec/storage.k8s.io_v1.json b/api/swagger-spec/storage.k8s.io_v1.json
index aa6c10db03a..adf7fa82f53 100644
--- a/api/swagger-spec/storage.k8s.io_v1.json
+++ b/api/swagger-spec/storage.k8s.io_v1.json
@@ -830,14 +830,14 @@
},
"volumeBindingMode": {
"$ref": "v1.VolumeBindingMode",
- "description": "VolumeBindingMode indicates how PersistentVolumeClaims should be provisioned and bound. When unset, VolumeBindingImmediate is used. This field is alpha-level and is only honored by servers that enable the VolumeScheduling feature."
+ "description": "VolumeBindingMode indicates how PersistentVolumeClaims should be provisioned and bound. When unset, VolumeBindingImmediate is used. This field is only honored by servers that enable the VolumeScheduling feature."
},
"allowedTopologies": {
"type": "array",
"items": {
"$ref": "v1.TopologySelectorTerm"
},
- "description": "Restrict the node topologies where volumes can be dynamically provisioned. Each volume plugin defines its own supported topology specifications. An empty TopologySelectorTerm list means there is no topology restriction. This field is alpha-level and is only honored by servers that enable the DynamicProvisioningScheduling feature."
+ "description": "Restrict the node topologies where volumes can be dynamically provisioned. Each volume plugin defines its own supported topology specifications. An empty TopologySelectorTerm list means there is no topology restriction. This field is only honored by servers that enable the VolumeScheduling feature."
}
}
},
diff --git a/api/swagger-spec/storage.k8s.io_v1beta1.json b/api/swagger-spec/storage.k8s.io_v1beta1.json
index 83392c2b4a9..4ec3a534e8f 100644
--- a/api/swagger-spec/storage.k8s.io_v1beta1.json
+++ b/api/swagger-spec/storage.k8s.io_v1beta1.json
@@ -1537,14 +1537,14 @@
},
"volumeBindingMode": {
"$ref": "v1beta1.VolumeBindingMode",
- "description": "VolumeBindingMode indicates how PersistentVolumeClaims should be provisioned and bound. When unset, VolumeBindingImmediate is used. This field is alpha-level and is only honored by servers that enable the VolumeScheduling feature."
+ "description": "VolumeBindingMode indicates how PersistentVolumeClaims should be provisioned and bound. When unset, VolumeBindingImmediate is used. This field is only honored by servers that enable the VolumeScheduling feature."
},
"allowedTopologies": {
"type": "array",
"items": {
"$ref": "v1.TopologySelectorTerm"
},
- "description": "Restrict the node topologies where volumes can be dynamically provisioned. Each volume plugin defines its own supported topology specifications. An empty TopologySelectorTerm list means there is no topology restriction. This field is alpha-level and is only honored by servers that enable the DynamicProvisioningScheduling feature."
+ "description": "Restrict the node topologies where volumes can be dynamically provisioned. Each volume plugin defines its own supported topology specifications. An empty TopologySelectorTerm list means there is no topology restriction. This field is only honored by servers that enable the VolumeScheduling feature."
}
}
},
diff --git a/docs/api-reference/storage.k8s.io/v1/definitions.html b/docs/api-reference/storage.k8s.io/v1/definitions.html
index 820e534cc0f..dbc7224ab7a 100755
--- a/docs/api-reference/storage.k8s.io/v1/definitions.html
+++ b/docs/api-reference/storage.k8s.io/v1/definitions.html
@@ -1046,14 +1046,14 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
volumeBindingMode |
-VolumeBindingMode indicates how PersistentVolumeClaims should be provisioned and bound. When unset, VolumeBindingImmediate is used. This field is alpha-level and is only honored by servers that enable the VolumeScheduling feature. |
+VolumeBindingMode indicates how PersistentVolumeClaims should be provisioned and bound. When unset, VolumeBindingImmediate is used. This field is only honored by servers that enable the VolumeScheduling feature. |
false |
v1.VolumeBindingMode |
|
allowedTopologies |
-Restrict the node topologies where volumes can be dynamically provisioned. Each volume plugin defines its own supported topology specifications. An empty TopologySelectorTerm list means there is no topology restriction. This field is alpha-level and is only honored by servers that enable the DynamicProvisioningScheduling feature. |
+Restrict the node topologies where volumes can be dynamically provisioned. Each volume plugin defines its own supported topology specifications. An empty TopologySelectorTerm list means there is no topology restriction. This field is only honored by servers that enable the VolumeScheduling feature. |
false |
v1.TopologySelectorTerm array |
|
diff --git a/docs/api-reference/storage.k8s.io/v1beta1/definitions.html b/docs/api-reference/storage.k8s.io/v1beta1/definitions.html
index 8e44d2f25e9..d8137702401 100755
--- a/docs/api-reference/storage.k8s.io/v1beta1/definitions.html
+++ b/docs/api-reference/storage.k8s.io/v1beta1/definitions.html
@@ -1283,14 +1283,14 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
volumeBindingMode |
-VolumeBindingMode indicates how PersistentVolumeClaims should be provisioned and bound. When unset, VolumeBindingImmediate is used. This field is alpha-level and is only honored by servers that enable the VolumeScheduling feature. |
+VolumeBindingMode indicates how PersistentVolumeClaims should be provisioned and bound. When unset, VolumeBindingImmediate is used. This field is only honored by servers that enable the VolumeScheduling feature. |
false |
v1beta1.VolumeBindingMode |
|
allowedTopologies |
-Restrict the node topologies where volumes can be dynamically provisioned. Each volume plugin defines its own supported topology specifications. An empty TopologySelectorTerm list means there is no topology restriction. This field is alpha-level and is only honored by servers that enable the DynamicProvisioningScheduling feature. |
+Restrict the node topologies where volumes can be dynamically provisioned. Each volume plugin defines its own supported topology specifications. An empty TopologySelectorTerm list means there is no topology restriction. This field is only honored by servers that enable the VolumeScheduling feature. |
false |
v1.TopologySelectorTerm array |
|
diff --git a/pkg/apis/core/validation/validation.go b/pkg/apis/core/validation/validation.go
index 4c5a7aefa06..8f2e6db5026 100644
--- a/pkg/apis/core/validation/validation.go
+++ b/pkg/apis/core/validation/validation.go
@@ -3153,7 +3153,7 @@ func ValidateTopologySelectorTerm(term core.TopologySelectorTerm, fldPath *field
exprMap := make(map[string]sets.String)
exprPath := fldPath.Child("matchLabelExpressions")
- if utilfeature.DefaultFeatureGate.Enabled(features.DynamicProvisioningScheduling) {
+ if utilfeature.DefaultFeatureGate.Enabled(features.VolumeScheduling) {
// Allow empty MatchLabelExpressions, in case this field becomes optional in the future.
for i, req := range term.MatchLabelExpressions {
@@ -3168,7 +3168,7 @@ func ValidateTopologySelectorTerm(term core.TopologySelectorTerm, fldPath *field
exprMap[req.Key] = valueSet
}
} else if len(term.MatchLabelExpressions) != 0 {
- allErrs = append(allErrs, field.Forbidden(fldPath, "field is disabled by feature-gate DynamicProvisioningScheduling"))
+ allErrs = append(allErrs, field.Forbidden(fldPath, "field is disabled by feature-gate VolumeScheduling"))
}
return exprMap, allErrs
diff --git a/pkg/apis/storage/types.go b/pkg/apis/storage/types.go
index cd86b02f281..7dedc666e18 100644
--- a/pkg/apis/storage/types.go
+++ b/pkg/apis/storage/types.go
@@ -68,16 +68,14 @@ type StorageClass struct {
// VolumeBindingMode indicates how PersistentVolumeClaims should be
// provisioned and bound. When unset, VolumeBindingImmediate is used.
- // This field is alpha-level and is only honored by servers that enable
- // the VolumeScheduling feature.
+ // This field is only honored by servers that enable the VolumeScheduling feature.
// +optional
VolumeBindingMode *VolumeBindingMode
// Restrict the node topologies where volumes can be dynamically provisioned.
// Each volume plugin defines its own supported topology specifications.
// An empty TopologySelectorTerm list means there is no topology restriction.
- // This field is alpha-level and is only honored by servers that enable
- // the DynamicProvisioningScheduling feature.
+ // This field is only honored by servers that enable the VolumeScheduling feature.
// +optional
AllowedTopologies []api.TopologySelectorTerm
}
diff --git a/pkg/apis/storage/util/util.go b/pkg/apis/storage/util/util.go
index c81a95b8165..382802d9641 100644
--- a/pkg/apis/storage/util/util.go
+++ b/pkg/apis/storage/util/util.go
@@ -26,8 +26,6 @@ import (
func DropDisabledAlphaFields(class *storage.StorageClass) {
if !utilfeature.DefaultFeatureGate.Enabled(features.VolumeScheduling) {
class.VolumeBindingMode = nil
- }
- if !utilfeature.DefaultFeatureGate.Enabled(features.DynamicProvisioningScheduling) {
class.AllowedTopologies = nil
}
}
diff --git a/pkg/apis/storage/util/util_test.go b/pkg/apis/storage/util/util_test.go
index f783c2ee422..8b62ddfab3b 100644
--- a/pkg/apis/storage/util/util_test.go
+++ b/pkg/apis/storage/util/util_test.go
@@ -39,8 +39,8 @@ func TestDropAlphaFields(t *testing.T) {
}
// Test that field gets dropped when feature gate is not set
- if err := utilfeature.DefaultFeatureGate.Set("VolumeScheduling=false,DynamicProvisioningScheduling=false"); err != nil {
- t.Fatalf("Failed to set feature gate for VolumeScheduling or DynamicProvisioningScheduling: %v", err)
+ if err := utilfeature.DefaultFeatureGate.Set("VolumeScheduling=false"); err != nil {
+ t.Fatalf("Failed to set feature gate for VolumeScheduling: %v", err)
}
class := &storage.StorageClass{
VolumeBindingMode: &bindingMode,
@@ -59,8 +59,8 @@ func TestDropAlphaFields(t *testing.T) {
VolumeBindingMode: &bindingMode,
AllowedTopologies: allowedTopologies,
}
- if err := utilfeature.DefaultFeatureGate.Set("VolumeScheduling=true,DynamicProvisioningScheduling=true"); err != nil {
- t.Fatalf("Failed to set feature gate for VolumeScheduling or DynamicProvisioningScheduling: %v", err)
+ if err := utilfeature.DefaultFeatureGate.Set("VolumeScheduling=true"); err != nil {
+ t.Fatalf("Failed to set feature gate for VolumeScheduling: %v", err)
}
DropDisabledAlphaFields(class)
if class.VolumeBindingMode != &bindingMode {
@@ -70,7 +70,7 @@ func TestDropAlphaFields(t *testing.T) {
t.Errorf("AllowedTopologies field got unexpectantly modified: %+v", class.AllowedTopologies)
}
- if err := utilfeature.DefaultFeatureGate.Set("VolumeScheduling=false,DynamicProvisioningScheduling=false"); err != nil {
- t.Fatalf("Failed to disable feature gate for VolumeScheduling or DynamicProvisioningScheduling: %v", err)
+ if err := utilfeature.DefaultFeatureGate.Set("VolumeScheduling=false"); err != nil {
+ t.Fatalf("Failed to disable feature gate for VolumeScheduling: %v", err)
}
}
diff --git a/pkg/apis/storage/validation/validation.go b/pkg/apis/storage/validation/validation.go
index 411cba3058d..c6e50ed2f5b 100644
--- a/pkg/apis/storage/validation/validation.go
+++ b/pkg/apis/storage/validation/validation.go
@@ -250,8 +250,8 @@ func validateAllowedTopologies(topologies []api.TopologySelectorTerm, fldPath *f
return allErrs
}
- if !utilfeature.DefaultFeatureGate.Enabled(features.DynamicProvisioningScheduling) {
- allErrs = append(allErrs, field.Forbidden(fldPath, "field is disabled by feature-gate DynamicProvisioningScheduling"))
+ if !utilfeature.DefaultFeatureGate.Enabled(features.VolumeScheduling) {
+ allErrs = append(allErrs, field.Forbidden(fldPath, "field is disabled by feature-gate VolumeScheduling"))
}
rawTopologies := make([]map[string]sets.String, len(topologies))
diff --git a/pkg/apis/storage/validation/validation_test.go b/pkg/apis/storage/validation/validation_test.go
index 4ddbaae0178..ce3b09f1e83 100644
--- a/pkg/apis/storage/validation/validation_test.go
+++ b/pkg/apis/storage/validation/validation_test.go
@@ -827,73 +827,67 @@ func TestValidateAllowedTopologies(t *testing.T) {
cases := map[string]bindingTest{
"no topology": {
- class: makeClass(nil, nil),
+ class: makeClass(&waitingMode, nil),
shouldSucceed: true,
},
"valid topology": {
- class: makeClass(nil, validTopology),
+ class: makeClass(&waitingMode, validTopology),
shouldSucceed: true,
},
"topology invalid key": {
- class: makeClass(nil, topologyInvalidKey),
+ class: makeClass(&waitingMode, topologyInvalidKey),
shouldSucceed: false,
},
"topology lack of values": {
- class: makeClass(nil, topologyLackOfValues),
+ class: makeClass(&waitingMode, topologyLackOfValues),
shouldSucceed: false,
},
"duplicate TopologySelectorRequirement values": {
- class: makeClass(nil, topologyDupValues),
+ class: makeClass(&waitingMode, topologyDupValues),
shouldSucceed: false,
},
"multiple TopologySelectorRequirement values": {
- class: makeClass(nil, topologyMultiValues),
+ class: makeClass(&waitingMode, topologyMultiValues),
shouldSucceed: true,
},
"empty MatchLabelExpressions": {
- class: makeClass(nil, topologyEmptyMatchLabelExpressions),
+ class: makeClass(&waitingMode, topologyEmptyMatchLabelExpressions),
shouldSucceed: false,
},
"duplicate MatchLabelExpression keys": {
- class: makeClass(nil, topologyDupKeys),
+ class: makeClass(&waitingMode, topologyDupKeys),
shouldSucceed: false,
},
"duplicate MatchLabelExpression keys but across separate terms": {
- class: makeClass(nil, topologyMultiTerm),
+ class: makeClass(&waitingMode, topologyMultiTerm),
shouldSucceed: true,
},
"duplicate AllowedTopologies terms - identical": {
- class: makeClass(nil, topologyDupTermsIdentical),
+ class: makeClass(&waitingMode, topologyDupTermsIdentical),
shouldSucceed: false,
},
"two AllowedTopologies terms, with a pair of the same MatchLabelExpressions and a pair of different ones": {
- class: makeClass(nil, topologyExprsOneSameOneDiff),
+ class: makeClass(&waitingMode, topologyExprsOneSameOneDiff),
shouldSucceed: true,
},
"two AllowedTopologies terms, with a pair of the same Values and a pair of different ones": {
- class: makeClass(nil, topologyValuesOneSameOneDiff),
+ class: makeClass(&waitingMode, topologyValuesOneSameOneDiff),
shouldSucceed: true,
},
"duplicate AllowedTopologies terms - different MatchLabelExpressions order": {
- class: makeClass(nil, topologyDupTermsDiffExprOrder),
+ class: makeClass(&waitingMode, topologyDupTermsDiffExprOrder),
shouldSucceed: false,
},
"duplicate AllowedTopologies terms - different TopologySelectorRequirement values order": {
- class: makeClass(nil, topologyDupTermsDiffValueOrder),
+ class: makeClass(&waitingMode, topologyDupTermsDiffValueOrder),
shouldSucceed: false,
},
}
- // Disable VolumeScheduling so nil VolumeBindingMode doesn't fail to validate.
- err := utilfeature.DefaultFeatureGate.Set("VolumeScheduling=false")
- if err != nil {
- t.Fatalf("Failed to disable feature gate for VolumeScheduling: %v", err)
- }
-
// TODO: remove when feature gate not required
- err = utilfeature.DefaultFeatureGate.Set("DynamicProvisioningScheduling=true")
+ err := utilfeature.DefaultFeatureGate.Set("VolumeScheduling=true")
if err != nil {
- t.Fatalf("Failed to enable feature gate for DynamicProvisioningScheduling: %v", err)
+ t.Fatalf("Failed to enable feature gate for VolumeScheduling: %v", err)
}
for testName, testCase := range cases {
@@ -906,9 +900,9 @@ func TestValidateAllowedTopologies(t *testing.T) {
}
}
- err = utilfeature.DefaultFeatureGate.Set("DynamicProvisioningScheduling=false")
+ err = utilfeature.DefaultFeatureGate.Set("VolumeScheduling=false")
if err != nil {
- t.Fatalf("Failed to disable feature gate for DynamicProvisioningScheduling: %v", err)
+ t.Fatalf("Failed to disable feature gate for VolumeScheduling: %v", err)
}
for testName, testCase := range cases {
diff --git a/pkg/controller/volume/persistentvolume/pv_controller.go b/pkg/controller/volume/persistentvolume/pv_controller.go
index 887919156e2..a65ffb1b2b0 100644
--- a/pkg/controller/volume/persistentvolume/pv_controller.go
+++ b/pkg/controller/volume/persistentvolume/pv_controller.go
@@ -140,7 +140,7 @@ const annStorageProvisioner = "volume.beta.kubernetes.io/storage-provisioner"
// This annotation is added to a PVC that has been triggered by scheduler to
// be dynamically provisioned. Its value is the name of the selected node.
-const annSelectedNode = "volume.alpha.kubernetes.io/selected-node"
+const annSelectedNode = "volume.kubernetes.io/selected-node"
// If the provisioner name in a storage class is set to "kubernetes.io/no-provisioner",
// then dynamic provisioning is not supported by the storage.
@@ -290,14 +290,12 @@ func (ctrl *PersistentVolumeController) shouldDelayBinding(claim *v1.PersistentV
return false, nil
}
- if utilfeature.DefaultFeatureGate.Enabled(features.DynamicProvisioningScheduling) {
- // When feature DynamicProvisioningScheduling enabled,
- // Scheduler signal to the PV controller to start dynamic
- // provisioning by setting the "annSelectedNode" annotation
- // in the PVC
- if _, ok := claim.Annotations[annSelectedNode]; ok {
- return false, nil
- }
+ // When feature VolumeScheduling enabled,
+ // Scheduler signal to the PV controller to start dynamic
+ // provisioning by setting the "annSelectedNode" annotation
+ // in the PVC
+ if _, ok := claim.Annotations[annSelectedNode]; ok {
+ return false, nil
}
className := v1helper.GetPersistentVolumeClaimClass(claim)
@@ -1477,25 +1475,22 @@ func (ctrl *PersistentVolumeController) provisionClaimOperation(claim *v1.Persis
}
var selectedNode *v1.Node = nil
- var allowedTopologies []v1.TopologySelectorTerm = nil
- if utilfeature.DefaultFeatureGate.Enabled(features.DynamicProvisioningScheduling) {
- if nodeName, ok := claim.Annotations[annSelectedNode]; ok {
- selectedNode, err = ctrl.NodeLister.Get(nodeName)
- if err != nil {
- strerr := fmt.Sprintf("Failed to get target node: %v", err)
- glog.V(3).Infof("unexpected error getting target node %q for claim %q: %v", nodeName, claimToClaimKey(claim), err)
- ctrl.eventRecorder.Event(claim, v1.EventTypeWarning, events.ProvisioningFailed, strerr)
- return pluginName, err
- }
+ if nodeName, ok := claim.Annotations[annSelectedNode]; ok {
+ selectedNode, err = ctrl.NodeLister.Get(nodeName)
+ if err != nil {
+ strerr := fmt.Sprintf("Failed to get target node: %v", err)
+ glog.V(3).Infof("unexpected error getting target node %q for claim %q: %v", nodeName, claimToClaimKey(claim), err)
+ ctrl.eventRecorder.Event(claim, v1.EventTypeWarning, events.ProvisioningFailed, strerr)
+ return pluginName, err
}
- allowedTopologies = storageClass.AllowedTopologies
}
+ allowedTopologies := storageClass.AllowedTopologies
opComplete := util.OperationCompleteHook(plugin.GetPluginName(), "volume_provision")
volume, err = provisioner.Provision(selectedNode, allowedTopologies)
opComplete(&err)
if err != nil {
- // Other places of failure have nothing to do with DynamicProvisioningScheduling,
+ // Other places of failure have nothing to do with VolumeScheduling,
// so just let controller retry in the next sync. We'll only call func
// rescheduleProvisioning here when the underlying provisioning actually failed.
ctrl.rescheduleProvisioning(claim)
diff --git a/pkg/controller/volume/persistentvolume/pv_controller_test.go b/pkg/controller/volume/persistentvolume/pv_controller_test.go
index 48b7c1d983b..cc372879674 100644
--- a/pkg/controller/volume/persistentvolume/pv_controller_test.go
+++ b/pkg/controller/volume/persistentvolume/pv_controller_test.go
@@ -237,12 +237,21 @@ func addVolumeAnnotation(volume *v1.PersistentVolume, annName, annValue string)
return volume
}
-func makePVCClass(scName *string) *v1.PersistentVolumeClaim {
- return &v1.PersistentVolumeClaim{
+func makePVCClass(scName *string, hasSelectNodeAnno bool) *v1.PersistentVolumeClaim {
+ claim := &v1.PersistentVolumeClaim{
+ ObjectMeta: metav1.ObjectMeta{
+ Annotations: map[string]string{},
+ },
Spec: v1.PersistentVolumeClaimSpec{
StorageClassName: scName,
},
}
+
+ if hasSelectNodeAnno {
+ claim.Annotations[annSelectedNode] = "node-name"
+ }
+
+ return claim
}
func makeStorageClass(scName string, mode *storagev1.VolumeBindingMode) *storagev1.StorageClass {
@@ -271,26 +280,30 @@ func TestDelayBinding(t *testing.T) {
shouldFail bool
}{
"nil-class": {
- pvc: makePVCClass(nil),
+ pvc: makePVCClass(nil, false),
shouldDelay: false,
},
"class-not-found": {
- pvc: makePVCClass(&classNotHere),
+ pvc: makePVCClass(&classNotHere, false),
shouldDelay: false,
},
"no-mode-class": {
- pvc: makePVCClass(&classNoMode),
+ pvc: makePVCClass(&classNoMode, false),
shouldDelay: false,
shouldFail: true,
},
"immediate-mode-class": {
- pvc: makePVCClass(&classImmediateMode),
+ pvc: makePVCClass(&classImmediateMode, false),
shouldDelay: false,
},
"wait-mode-class": {
- pvc: makePVCClass(&classWaitMode),
+ pvc: makePVCClass(&classWaitMode, false),
shouldDelay: true,
},
+ "wait-mode-class-with-selectedNode": {
+ pvc: makePVCClass(&classWaitMode, true),
+ shouldDelay: false,
+ },
}
classes := []*storagev1.StorageClass{
@@ -314,7 +327,7 @@ func TestDelayBinding(t *testing.T) {
// When volumeScheduling feature gate is disabled, should always be delayed
name := "volumeScheduling-feature-disabled"
- shouldDelay, err := ctrl.shouldDelayBinding(makePVCClass(&classWaitMode))
+ shouldDelay, err := ctrl.shouldDelayBinding(makePVCClass(&classWaitMode, false))
if err != nil {
t.Errorf("Test %q returned error: %v", name, err)
}
@@ -338,43 +351,4 @@ func TestDelayBinding(t *testing.T) {
t.Errorf("Test %q returned unexpected %v", name, test.shouldDelay)
}
}
-
- // When dynamicProvisioningScheduling feature gate is disabled, should be delayed,
- // even if the pvc has selectedNode annotation.
- provisionedClaim := makePVCClass(&classWaitMode)
- provisionedClaim.Annotations = map[string]string{annSelectedNode: "node-name"}
- name = "dynamicProvisioningScheduling-feature-disabled"
- shouldDelay, err = ctrl.shouldDelayBinding(provisionedClaim)
- if err != nil {
- t.Errorf("Test %q returned error: %v", name, err)
- }
- if !shouldDelay {
- t.Errorf("Test %q returned false, expected true", name)
- }
-
- // Enable DynamicProvisioningScheduling feature gate
- utilfeature.DefaultFeatureGate.Set("DynamicProvisioningScheduling=true")
- defer utilfeature.DefaultFeatureGate.Set("DynamicProvisioningScheduling=false")
-
- // When the pvc does not have selectedNode annotation, should be delayed,
- // even if dynamicProvisioningScheduling feature gate is enabled.
- name = "dynamicProvisioningScheduling-feature-enabled, selectedNode-annotation-not-set"
- shouldDelay, err = ctrl.shouldDelayBinding(makePVCClass(&classWaitMode))
- if err != nil {
- t.Errorf("Test %q returned error: %v", name, err)
- }
- if !shouldDelay {
- t.Errorf("Test %q returned false, expected true", name)
- }
-
- // Should not be delayed when dynamicProvisioningScheduling feature gate is enabled,
- // and the pvc has selectedNode annotation.
- name = "dynamicProvisioningScheduling-feature-enabled, selectedNode-annotation-set"
- shouldDelay, err = ctrl.shouldDelayBinding(provisionedClaim)
- if err != nil {
- t.Errorf("Test %q returned error: %v", name, err)
- }
- if shouldDelay {
- t.Errorf("Test %q returned true, expected false", name)
- }
}
diff --git a/pkg/controller/volume/persistentvolume/scheduler_assume_cache_test.go b/pkg/controller/volume/persistentvolume/scheduler_assume_cache_test.go
index c6c0f1f0ccd..40f0ff88738 100644
--- a/pkg/controller/volume/persistentvolume/scheduler_assume_cache_test.go
+++ b/pkg/controller/volume/persistentvolume/scheduler_assume_cache_test.go
@@ -456,7 +456,7 @@ func TestAssumeUpdatePVCCache(t *testing.T) {
// Assume PVC
newPVC := pvc.DeepCopy()
- newPVC.Annotations["volume.alpha.kubernetes.io/selected-node"] = "test-node"
+ newPVC.Annotations[annSelectedNode] = "test-node"
if err := cache.Assume(newPVC); err != nil {
t.Fatalf("failed to assume PVC: %v", err)
}
diff --git a/pkg/controller/volume/persistentvolume/scheduler_binder.go b/pkg/controller/volume/persistentvolume/scheduler_binder.go
index 12a851cdfdd..a5474fd2877 100644
--- a/pkg/controller/volume/persistentvolume/scheduler_binder.go
+++ b/pkg/controller/volume/persistentvolume/scheduler_binder.go
@@ -25,12 +25,10 @@ import (
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
- utilfeature "k8s.io/apiserver/pkg/util/feature"
coreinformers "k8s.io/client-go/informers/core/v1"
storageinformers "k8s.io/client-go/informers/storage/v1"
clientset "k8s.io/client-go/kubernetes"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
- "k8s.io/kubernetes/pkg/features"
volumeutil "k8s.io/kubernetes/pkg/volume/util"
)
@@ -169,13 +167,11 @@ func (b *volumeBinder) FindPodVolumes(pod *v1.Pod, node *v1.Node) (unboundVolume
return false, false, err
}
- if utilfeature.DefaultFeatureGate.Enabled(features.DynamicProvisioningScheduling) {
- // Try to provision for unbound volumes
- if !unboundVolumesSatisfied {
- unboundVolumesSatisfied, err = b.checkVolumeProvisions(pod, claimsToProvision, node)
- if err != nil {
- return false, false, err
- }
+ // Try to provision for unbound volumes
+ if !unboundVolumesSatisfied {
+ unboundVolumesSatisfied, err = b.checkVolumeProvisions(pod, claimsToProvision, node)
+ if err != nil {
+ return false, false, err
}
}
}
diff --git a/pkg/controller/volume/persistentvolume/scheduler_binder_test.go b/pkg/controller/volume/persistentvolume/scheduler_binder_test.go
index e1e49d0e3ff..52f7b0aa214 100644
--- a/pkg/controller/volume/persistentvolume/scheduler_binder_test.go
+++ b/pkg/controller/volume/persistentvolume/scheduler_binder_test.go
@@ -46,10 +46,10 @@ var (
badPVC = makeBadPVC()
immediateUnboundPVC = makeTestPVC("immediate-unbound-pvc", "1G", pvcUnbound, "", "1", &immediateClass)
immediateBoundPVC = makeTestPVC("immediate-bound-pvc", "1G", pvcBound, "pv-bound-immediate", "1", &immediateClass)
- provisionedPVC = makeTestPVC("provisioned-pvc", "1Gi", pvcUnbound, "", "1", &waitClass)
- provisionedPVC2 = makeTestPVC("provisioned-pvc2", "1Gi", pvcUnbound, "", "1", &waitClass)
- provisionedPVCHigherVersion = makeTestPVC("provisioned-pvc2", "1Gi", pvcUnbound, "", "2", &waitClass)
- noProvisionerPVC = makeTestPVC("no-provisioner-pvc", "1Gi", pvcUnbound, "", "1", &provisionNotSupportClass)
+ provisionedPVC = makeTestPVC("provisioned-pvc", "1Gi", pvcUnbound, "", "1", &waitClassWithProvisioner)
+ provisionedPVC2 = makeTestPVC("provisioned-pvc2", "1Gi", pvcUnbound, "", "1", &waitClassWithProvisioner)
+ provisionedPVCHigherVersion = makeTestPVC("provisioned-pvc2", "1Gi", pvcUnbound, "", "2", &waitClassWithProvisioner)
+ noProvisionerPVC = makeTestPVC("no-provisioner-pvc", "1Gi", pvcUnbound, "", "1", &waitClass)
topoMismatchPVC = makeTestPVC("topo-mismatch-pvc", "1Gi", pvcUnbound, "", "1", &topoMismatchClass)
pvNoNode = makeTestPV("pv-no-node", "", "1G", "1", nil, waitClass)
@@ -74,7 +74,7 @@ var (
waitClass = "waitClass"
immediateClass = "immediateClass"
- provisionNotSupportClass = "provisionNotSupportedClass"
+ waitClassWithProvisioner = "waitClassWithProvisioner"
topoMismatchClass = "topoMismatchClass"
nodeLabelKey = "nodeKey"
@@ -110,7 +110,7 @@ func newTestBinder(t *testing.T) *testEnv {
classes := []*storagev1.StorageClass{
{
ObjectMeta: metav1.ObjectMeta{
- Name: waitClass,
+ Name: waitClassWithProvisioner,
},
VolumeBindingMode: &waitMode,
Provisioner: "test-provisioner",
@@ -133,7 +133,7 @@ func newTestBinder(t *testing.T) *testEnv {
},
{
ObjectMeta: metav1.ObjectMeta{
- Name: provisionNotSupportClass,
+ Name: waitClass,
},
VolumeBindingMode: &waitMode,
Provisioner: "kubernetes.io/no-provisioner",
@@ -776,9 +776,9 @@ func TestFindPodVolumesWithProvisioning(t *testing.T) {
},
}
- // Set VolumeScheduling and DynamicProvisioningScheduling feature gate
- utilfeature.DefaultFeatureGate.Set("VolumeScheduling=true,DynamicProvisioningScheduling=true")
- defer utilfeature.DefaultFeatureGate.Set("VolumeScheduling=false,DynamicProvisioningScheduling=false")
+ // Set VolumeScheduling feature gate
+ utilfeature.DefaultFeatureGate.Set("VolumeScheduling=true")
+ defer utilfeature.DefaultFeatureGate.Set("VolumeScheduling=false")
testNode := &v1.Node{
ObjectMeta: metav1.ObjectMeta{
diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go
index 5909964bc15..975477b86ce 100644
--- a/pkg/features/kube_features.go
+++ b/pkg/features/kube_features.go
@@ -312,12 +312,6 @@ const (
// Support Pod Ready++
PodReadinessGates utilfeature.Feature = "PodReadinessGates"
- // owner: @lichuqiang
- // alpha: v1.11
- //
- // Extend the default scheduler to be aware of volume topology and handle PV provisioning
- DynamicProvisioningScheduling utilfeature.Feature = "DynamicProvisioningScheduling"
-
// owner: @kevtaylor
// alpha: v1.11
//
@@ -421,7 +415,6 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
RunAsGroup: {Default: false, PreRelease: utilfeature.Alpha},
VolumeSubpath: {Default: true, PreRelease: utilfeature.GA},
BalanceAttachedNodeVolumes: {Default: false, PreRelease: utilfeature.Alpha},
- DynamicProvisioningScheduling: {Default: false, PreRelease: utilfeature.Alpha},
PodReadinessGates: {Default: true, PreRelease: utilfeature.Beta},
VolumeSubpathEnvExpansion: {Default: false, PreRelease: utilfeature.Alpha},
KubeletPluginsWatcher: {Default: false, PreRelease: utilfeature.Alpha},
diff --git a/pkg/printers/internalversion/describe.go b/pkg/printers/internalversion/describe.go
index 534b6884259..e3491634c3c 100644
--- a/pkg/printers/internalversion/describe.go
+++ b/pkg/printers/internalversion/describe.go
@@ -3474,6 +3474,9 @@ func describeStorageClass(sc *storage.StorageClass, events *api.EventList) (stri
if sc.VolumeBindingMode != nil {
w.Write(LEVEL_0, "VolumeBindingMode:\t%s\n", *sc.VolumeBindingMode)
}
+ if sc.AllowedTopologies != nil {
+ printAllowedTopologies(w, sc.AllowedTopologies)
+ }
if events != nil {
DescribeEvents(events, w)
}
@@ -3482,6 +3485,38 @@ func describeStorageClass(sc *storage.StorageClass, events *api.EventList) (stri
})
}
+func printAllowedTopologies(w PrefixWriter, topologies []api.TopologySelectorTerm) {
+ w.Write(LEVEL_0, "AllowedTopologies:\t")
+ if len(topologies) == 0 {
+ w.WriteLine("")
+ return
+ }
+ w.WriteLine("")
+ for i, term := range topologies {
+ printTopologySelectorTermsMultilineWithIndent(w, LEVEL_1, fmt.Sprintf("Term %d", i), "\t", term.MatchLabelExpressions)
+ }
+}
+
+func printTopologySelectorTermsMultilineWithIndent(w PrefixWriter, indentLevel int, title, innerIndent string, reqs []api.TopologySelectorLabelRequirement) {
+ w.Write(indentLevel, "%s:%s", title, innerIndent)
+
+ if len(reqs) == 0 {
+ w.WriteLine("")
+ return
+ }
+
+ for i, req := range reqs {
+ if i != 0 {
+ w.Write(indentLevel, "%s", innerIndent)
+ }
+ exprStr := fmt.Sprintf("%s %s", req.Key, "in")
+ if len(req.Values) > 0 {
+ exprStr = fmt.Sprintf("%s [%s]", exprStr, strings.Join(req.Values, ", "))
+ }
+ w.Write(LEVEL_0, "%s\n", exprStr)
+ }
+}
+
type PodDisruptionBudgetDescriber struct {
clientset.Interface
}
diff --git a/pkg/printers/internalversion/describe_test.go b/pkg/printers/internalversion/describe_test.go
index f11bc7f8b1a..8bdfd943195 100644
--- a/pkg/printers/internalversion/describe_test.go
+++ b/pkg/printers/internalversion/describe_test.go
@@ -1433,6 +1433,32 @@ func TestDescribeStorageClass(t *testing.T) {
},
ReclaimPolicy: &reclaimPolicy,
VolumeBindingMode: &bindingMode,
+ AllowedTopologies: []api.TopologySelectorTerm{
+ {
+ MatchLabelExpressions: []api.TopologySelectorLabelRequirement{
+ {
+ Key: "failure-domain.beta.kubernetes.io/zone",
+ Values: []string{"zone1"},
+ },
+ {
+ Key: "kubernetes.io/hostname",
+ Values: []string{"node1"},
+ },
+ },
+ },
+ {
+ MatchLabelExpressions: []api.TopologySelectorLabelRequirement{
+ {
+ Key: "failure-domain.beta.kubernetes.io/zone",
+ Values: []string{"zone2"},
+ },
+ {
+ Key: "kubernetes.io/hostname",
+ Values: []string{"node2"},
+ },
+ },
+ },
+ },
})
s := StorageClassDescriber{f}
out, err := s.Describe("", "foo", printers.DescriberSettings{ShowEvents: true})
@@ -1446,7 +1472,13 @@ func TestDescribeStorageClass(t *testing.T) {
!strings.Contains(out, "value1") ||
!strings.Contains(out, "value2") ||
!strings.Contains(out, "Retain") ||
- !strings.Contains(out, "bindingmode") {
+ !strings.Contains(out, "bindingmode") ||
+ !strings.Contains(out, "failure-domain.beta.kubernetes.io/zone") ||
+ !strings.Contains(out, "zone1") ||
+ !strings.Contains(out, "kubernetes.io/hostname") ||
+ !strings.Contains(out, "node1") ||
+ !strings.Contains(out, "zone2") ||
+ !strings.Contains(out, "node2") {
t.Errorf("unexpected out: %s", out)
}
}
diff --git a/pkg/volume/util/util.go b/pkg/volume/util/util.go
index 480fd37de58..72d9a781e78 100644
--- a/pkg/volume/util/util.go
+++ b/pkg/volume/util/util.go
@@ -345,7 +345,7 @@ func SelectZonesForVolume(zoneParameterPresent, zonesParameterPresent bool, zone
var zoneFromNode string
// pick one zone from node if present
if node != nil {
- // DynamicProvisioningScheduling implicit since node is not nil
+ // VolumeScheduling implicit since node is not nil
if zoneParameterPresent || zonesParameterPresent {
return nil, fmt.Errorf("zone[s] cannot be specified in StorageClass if VolumeBindingMode is set to WaitForFirstConsumer. Please specify allowedTopologies in StorageClass for constraining zones")
}
@@ -373,7 +373,7 @@ func SelectZonesForVolume(zoneParameterPresent, zonesParameterPresent bool, zone
}
if allowedZones.Len() > 0 {
- // DynamicProvisioningScheduling implicit since allowedZones present
+ // VolumeScheduling implicit since allowedZones present
if zoneParameterPresent || zonesParameterPresent {
return nil, fmt.Errorf("zone[s] cannot be specified in StorageClass if allowedTopologies specified")
}
diff --git a/pkg/volume/util/util_test.go b/pkg/volume/util/util_test.go
index dfc18bd9883..b1f83ac37c2 100644
--- a/pkg/volume/util/util_test.go
+++ b/pkg/volume/util/util_test.go
@@ -1054,15 +1054,15 @@ func TestSelectZoneForVolume(t *testing.T) {
tests := []struct {
// Parameters passed by test to SelectZoneForVolume
- Name string
- ZonePresent bool
- Zone string
- ZonesPresent bool
- Zones string
- ZonesWithNodes string
- Node *v1.Node
- AllowedTopologies []v1.TopologySelectorTerm
- DynamicProvisioningScheduling bool
+ Name string
+ ZonePresent bool
+ Zone string
+ ZonesPresent bool
+ Zones string
+ ZonesWithNodes string
+ Node *v1.Node
+ AllowedTopologies []v1.TopologySelectorTerm
+ VolumeScheduling bool
// Expectations around returned zone from SelectZoneForVolume
Reject bool // expect error due to validation failing
ExpectSpecificZone bool // expect returned zone to specifically match a single zone (rather than one from a set)
@@ -1075,7 +1075,7 @@ func TestSelectZoneForVolume(t *testing.T) {
// [1] Node irrelevant
// [2] Zone and Zones parameters presents
// [3] AllowedTopologies irrelevant
- // [4] DynamicProvisioningScheduling irrelevant
+ // [4] VolumeScheduling irrelevant
{
Name: "Nil_Node_with_Zone_Zones_parameters_present",
ZonePresent: true,
@@ -1089,53 +1089,53 @@ func TestSelectZoneForVolume(t *testing.T) {
// [1] Node with no zone labels
// [2] Zone/Zones parameter irrelevant
// [3] AllowedTopologies irrelevant
- // [4] DynamicProvisioningScheduling enabled
+ // [4] VolumeScheduling enabled
{
- Name: "Node_with_no_Zone_labels",
- Node: nodeWithNoLabels,
- DynamicProvisioningScheduling: true,
- Reject: true,
+ Name: "Node_with_no_Zone_labels",
+ Node: nodeWithNoLabels,
+ VolumeScheduling: true,
+ Reject: true,
},
// Node with Zone labels as well as Zone parameter specified [Fail]
// [1] Node with zone labels
// [2] Zone parameter specified
// [3] AllowedTopologies irrelevant
- // [4] DynamicProvisioningScheduling enabled
+ // [4] VolumeScheduling enabled
{
- Name: "Node_with_Zone_labels_and_Zone_parameter_present",
- Node: nodeWithZoneLabels,
- ZonePresent: true,
- Zone: "zoneX",
- DynamicProvisioningScheduling: true,
- Reject: true,
+ Name: "Node_with_Zone_labels_and_Zone_parameter_present",
+ Node: nodeWithZoneLabels,
+ ZonePresent: true,
+ Zone: "zoneX",
+ VolumeScheduling: true,
+ Reject: true,
},
// Node with Zone labels as well as Zones parameter specified [Fail]
// [1] Node with zone labels
// [2] Zones parameter specified
// [3] AllowedTopologies irrelevant
- // [4] DynamicProvisioningScheduling enabled
+ // [4] VolumeScheduling enabled
{
- Name: "Node_with_Zone_labels_and_Zones_parameter_present",
- Node: nodeWithZoneLabels,
- ZonesPresent: true,
- Zones: "zoneX,zoneY",
- DynamicProvisioningScheduling: true,
- Reject: true,
+ Name: "Node_with_Zone_labels_and_Zones_parameter_present",
+ Node: nodeWithZoneLabels,
+ ZonesPresent: true,
+ Zones: "zoneX,zoneY",
+ VolumeScheduling: true,
+ Reject: true,
},
// Zone parameter as well as AllowedTopologies specified [Fail]
// [1] nil Node
// [2] Zone parameter specified
// [3] AllowedTopologies specified
- // [4] DynamicProvisioningScheduling enabled
+ // [4] VolumeScheduling enabled
{
- Name: "Nil_Node_and_Zone_parameter_and_Allowed_Topology_term",
- Node: nil,
- ZonePresent: true,
- Zone: "zoneX",
- DynamicProvisioningScheduling: true,
+ Name: "Nil_Node_and_Zone_parameter_and_Allowed_Topology_term",
+ Node: nil,
+ ZonePresent: true,
+ Zone: "zoneX",
+ VolumeScheduling: true,
AllowedTopologies: []v1.TopologySelectorTerm{
{
MatchLabelExpressions: []v1.TopologySelectorLabelRequirement{
@@ -1153,13 +1153,13 @@ func TestSelectZoneForVolume(t *testing.T) {
// [1] nil Node
// [2] Zones parameter specified
// [3] AllowedTopologies specified
- // [4] DynamicProvisioningScheduling enabled
+ // [4] VolumeScheduling enabled
{
- Name: "Nil_Node_and_Zones_parameter_and_Allowed_Topology_term",
- Node: nil,
- ZonesPresent: true,
- Zones: "zoneX,zoneY",
- DynamicProvisioningScheduling: true,
+ Name: "Nil_Node_and_Zones_parameter_and_Allowed_Topology_term",
+ Node: nil,
+ ZonesPresent: true,
+ Zones: "zoneX,zoneY",
+ VolumeScheduling: true,
AllowedTopologies: []v1.TopologySelectorTerm{
{
MatchLabelExpressions: []v1.TopologySelectorLabelRequirement{
@@ -1177,11 +1177,11 @@ func TestSelectZoneForVolume(t *testing.T) {
// [1] nil Node
// [2] no Zone/Zones parameter
// [3] AllowedTopologies with invalid key specified
- // [4] DynamicProvisioningScheduling enabled
+ // [4] VolumeScheduling enabled
{
- Name: "Nil_Node_and_Invalid_Allowed_Topology_Key",
- Node: nil,
- DynamicProvisioningScheduling: true,
+ Name: "Nil_Node_and_Invalid_Allowed_Topology_Key",
+ Node: nil,
+ VolumeScheduling: true,
AllowedTopologies: []v1.TopologySelectorTerm{
{
MatchLabelExpressions: []v1.TopologySelectorLabelRequirement{
@@ -1203,11 +1203,11 @@ func TestSelectZoneForVolume(t *testing.T) {
// [1] nil Node
// [2] no Zone/Zones parameter
// [3] Invalid AllowedTopologies
- // [4] DynamicProvisioningScheduling enabled
+ // [4] VolumeScheduling enabled
{
- Name: "Nil_Node_and_Invalid_AllowedTopologies",
- Node: nil,
- DynamicProvisioningScheduling: true,
+ Name: "Nil_Node_and_Invalid_AllowedTopologies",
+ Node: nil,
+ VolumeScheduling: true,
AllowedTopologies: []v1.TopologySelectorTerm{
{
MatchLabelExpressions: []v1.TopologySelectorLabelRequirement{},
@@ -1216,31 +1216,31 @@ func TestSelectZoneForVolume(t *testing.T) {
Reject: true,
},
- // POSITIVE TESTS WITH DynamicProvisioningScheduling DISABLED
+ // POSITIVE TESTS WITH VolumeScheduling DISABLED
// Select zone from active zones [Pass]
// [1] nil Node (Node irrelevant)
// [2] no Zone parameter
// [3] no AllowedTopologies
- // [4] DynamicProvisioningScheduling disabled
+ // [4] VolumeScheduling disabled
{
- Name: "No_Zone_Zones_parameter_and_DynamicProvisioningScheduling_disabled",
- ZonesWithNodes: "zoneX,zoneY",
- DynamicProvisioningScheduling: false,
- Reject: false,
- ExpectedZones: "zoneX,zoneY",
+ Name: "No_Zone_Zones_parameter_and_VolumeScheduling_disabled",
+ ZonesWithNodes: "zoneX,zoneY",
+ VolumeScheduling: false,
+ Reject: false,
+ ExpectedZones: "zoneX,zoneY",
},
// Select zone from single zone parameter [Pass]
// [1] nil Node (Node irrelevant)
// [2] Zone parameter specified
// [3] no AllowedTopologies
- // [4] DynamicProvisioningScheduling disabled
+ // [4] VolumeScheduling disabled
{
- Name: "Zone_parameter_present_and_DynamicProvisioningScheduling_disabled",
- ZonePresent: true,
- Zone: "zoneX",
- DynamicProvisioningScheduling: false,
+ Name: "Zone_parameter_present_and_VolumeScheduling_disabled",
+ ZonePresent: true,
+ Zone: "zoneX",
+ VolumeScheduling: false,
Reject: false,
ExpectSpecificZone: true,
ExpectedZone: "zoneX",
@@ -1250,43 +1250,43 @@ func TestSelectZoneForVolume(t *testing.T) {
// [1] nil Node (Node irrelevant)
// [2] Zones parameter specified
// [3] no AllowedTopologies
- // [4] DynamicProvisioningScheduling disabled
+ // [4] VolumeScheduling disabled
{
- Name: "Zones_parameter_present_and_DynamicProvisioningScheduling_disabled",
- ZonesPresent: true,
- Zones: "zoneX,zoneY",
- DynamicProvisioningScheduling: false,
- Reject: false,
- ExpectedZones: "zoneX,zoneY",
+ Name: "Zones_parameter_present_and_VolumeScheduling_disabled",
+ ZonesPresent: true,
+ Zones: "zoneX,zoneY",
+ VolumeScheduling: false,
+ Reject: false,
+ ExpectedZones: "zoneX,zoneY",
},
- // POSITIVE TESTS WITH DynamicProvisioningScheduling ENABLED
+ // POSITIVE TESTS WITH VolumeScheduling ENABLED
// Select zone from active zones [Pass]
// [1] nil Node
// [2] no Zone parameter specified
// [3] no AllowedTopologies
- // [4] DynamicProvisioningScheduling enabled
+ // [4] VolumeScheduling enabled
{
- Name: "Nil_Node_and_No_Zone_Zones_parameter_and_no_Allowed_topologies_and_DynamicProvisioningScheduling_enabled",
- Node: nil,
- ZonesWithNodes: "zoneX,zoneY",
- DynamicProvisioningScheduling: true,
- Reject: false,
- ExpectedZones: "zoneX,zoneY",
+ Name: "Nil_Node_and_No_Zone_Zones_parameter_and_no_Allowed_topologies_and_VolumeScheduling_enabled",
+ Node: nil,
+ ZonesWithNodes: "zoneX,zoneY",
+ VolumeScheduling: true,
+ Reject: false,
+ ExpectedZones: "zoneX,zoneY",
},
// Select zone from single zone parameter [Pass]
// [1] nil Node
// [2] Zone parameter specified
// [3] no AllowedTopology specified
- // [4] DynamicSchedulingEnabled enabled
+ // [4] VolumeScheduling enabled
{
- Name: "Nil_Node_and_Zone_parameter_present_and_DynamicProvisioningScheduling_enabled",
- ZonePresent: true,
- Zone: "zoneX",
- Node: nil,
- DynamicProvisioningScheduling: true,
+ Name: "Nil_Node_and_Zone_parameter_present_and_VolumeScheduling_enabled",
+ ZonePresent: true,
+ Zone: "zoneX",
+ Node: nil,
+ VolumeScheduling: true,
Reject: false,
ExpectSpecificZone: true,
ExpectedZone: "zoneX",
@@ -1296,26 +1296,26 @@ func TestSelectZoneForVolume(t *testing.T) {
// [1] nil Node
// [2] Zones parameter specified
// [3] no AllowedTopology
- // [4] DynamicSchedulingEnabled enabled
+ // [4] VolumeScheduling enabled
{
- Name: "Nil_Node_and_Zones_parameter_present_and_DynamicProvisioningScheduling_enabled",
- ZonesPresent: true,
- Zones: "zoneX,zoneY",
- Node: nil,
- DynamicProvisioningScheduling: true,
- Reject: false,
- ExpectedZones: "zoneX,zoneY",
+ Name: "Nil_Node_and_Zones_parameter_present_and_VolumeScheduling_enabled",
+ ZonesPresent: true,
+ Zones: "zoneX,zoneY",
+ Node: nil,
+ VolumeScheduling: true,
+ Reject: false,
+ ExpectedZones: "zoneX,zoneY",
},
// Select zone from node label [Pass]
// [1] Node with zone labels
// [2] no zone/zones parameters
// [3] no AllowedTopology
- // [4] DynamicProvisioningScheduling enabled
+ // [4] VolumeScheduling enabled
{
- Name: "Node_with_Zone_labels_and_DynamicProvisioningScheduling_enabled",
- Node: nodeWithZoneLabels,
- DynamicProvisioningScheduling: true,
+ Name: "Node_with_Zone_labels_and_VolumeScheduling_enabled",
+ Node: nodeWithZoneLabels,
+ VolumeScheduling: true,
Reject: false,
ExpectSpecificZone: true,
ExpectedZone: "zoneX",
@@ -1325,11 +1325,11 @@ func TestSelectZoneForVolume(t *testing.T) {
// [1] Node with zone labels
// [2] no Zone/Zones parameters
// [3] AllowedTopology with single term with multiple values specified (ignored)
- // [4] DynamicProvisioningScheduling enabled
+ // [4] VolumeScheduling enabled
{
- Name: "Node_with_Zone_labels_and_Multiple_Allowed_Topology_values_and_DynamicProvisioningScheduling_enabled",
- Node: nodeWithZoneLabels,
- DynamicProvisioningScheduling: true,
+ Name: "Node_with_Zone_labels_and_Multiple_Allowed_Topology_values_and_VolumeScheduling_enabled",
+ Node: nodeWithZoneLabels,
+ VolumeScheduling: true,
AllowedTopologies: []v1.TopologySelectorTerm{
{
MatchLabelExpressions: []v1.TopologySelectorLabelRequirement{
@@ -1349,11 +1349,11 @@ func TestSelectZoneForVolume(t *testing.T) {
// [1] nil Node
// [2] no Zone/Zones parametes specified
// [3] AllowedTopologies with single term with multiple values specified
- // [4] DynamicProvisioningScheduling enabled
+ // [4] VolumeScheduling enabled
{
- Name: "Nil_Node_with_Multiple_Allowed_Topology_values_and_DynamicProvisioningScheduling_enabled",
- Node: nil,
- DynamicProvisioningScheduling: true,
+ Name: "Nil_Node_with_Multiple_Allowed_Topology_values_and_VolumeScheduling_enabled",
+ Node: nil,
+ VolumeScheduling: true,
AllowedTopologies: []v1.TopologySelectorTerm{
{
MatchLabelExpressions: []v1.TopologySelectorLabelRequirement{
@@ -1372,11 +1372,11 @@ func TestSelectZoneForVolume(t *testing.T) {
// [1] nil Node
// [2] no Zone/Zones parametes specified
// [3] AllowedTopologies with multiple terms specified
- // [4] DynamicProvisioningScheduling enabled
+ // [4] VolumeScheduling enabled
{
- Name: "Nil_Node_and_Multiple_Allowed_Topology_terms_and_DynamicProvisioningScheduling_enabled",
- Node: nil,
- DynamicProvisioningScheduling: true,
+ Name: "Nil_Node_and_Multiple_Allowed_Topology_terms_and_VolumeScheduling_enabled",
+ Node: nil,
+ VolumeScheduling: true,
AllowedTopologies: []v1.TopologySelectorTerm{
{
MatchLabelExpressions: []v1.TopologySelectorLabelRequirement{
@@ -1404,11 +1404,11 @@ func TestSelectZoneForVolume(t *testing.T) {
// [1] nil Node
// [2] no Zone/Zones parametes specified
// [3] AllowedTopologies with single term and value specified
- // [4] DynamicProvisioningScheduling enabled
+ // [4] VolumeScheduling enabled
{
- Name: "Nil_Node_and_Single_Allowed_Topology_term_value_and_DynamicProvisioningScheduling_enabled",
- Node: nil,
- DynamicProvisioningScheduling: true,
+ Name: "Nil_Node_and_Single_Allowed_Topology_term_value_and_VolumeScheduling_enabled",
+ Node: nil,
+ VolumeScheduling: true,
AllowedTopologies: []v1.TopologySelectorTerm{
{
MatchLabelExpressions: []v1.TopologySelectorLabelRequirement{
@@ -1426,9 +1426,9 @@ func TestSelectZoneForVolume(t *testing.T) {
}
for _, test := range tests {
- utilfeature.DefaultFeatureGate.Set("DynamicProvisioningScheduling=false")
- if test.DynamicProvisioningScheduling {
- utilfeature.DefaultFeatureGate.Set("DynamicProvisioningScheduling=true")
+ utilfeature.DefaultFeatureGate.Set("VolumeScheduling=false")
+ if test.VolumeScheduling {
+ utilfeature.DefaultFeatureGate.Set("VolumeScheduling=true")
}
var zonesParameter, zonesWithNodes sets.String
diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go
index cdc02f1204c..b8489e76763 100644
--- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go
+++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go
@@ -487,16 +487,13 @@ func ClusterRoles() []rbacv1.ClusterRole {
}
if utilfeature.DefaultFeatureGate.Enabled(features.VolumeScheduling) {
- rules := []rbacv1.PolicyRule{
- rbacv1helpers.NewRule(ReadUpdate...).Groups(legacyGroup).Resources("persistentvolumes").RuleOrDie(),
- rbacv1helpers.NewRule(Read...).Groups(storageGroup).Resources("storageclasses").RuleOrDie(),
- }
- if utilfeature.DefaultFeatureGate.Enabled(features.DynamicProvisioningScheduling) {
- rules = append(rules, rbacv1helpers.NewRule(ReadUpdate...).Groups(legacyGroup).Resources("persistentvolumeclaims").RuleOrDie())
- }
roles = append(roles, rbacv1.ClusterRole{
ObjectMeta: metav1.ObjectMeta{Name: "system:volume-scheduler"},
- Rules: rules,
+ Rules: []rbacv1.PolicyRule{
+ rbacv1helpers.NewRule(ReadUpdate...).Groups(legacyGroup).Resources("persistentvolumes").RuleOrDie(),
+ rbacv1helpers.NewRule(Read...).Groups(storageGroup).Resources("storageclasses").RuleOrDie(),
+ rbacv1helpers.NewRule(ReadUpdate...).Groups(legacyGroup).Resources("persistentvolumeclaims").RuleOrDie(),
+ },
})
}
diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml
index 4f3d010fe44..7b9efd0b4c2 100644
--- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml
+++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml
@@ -1116,6 +1116,16 @@ items:
- get
- list
- watch
+ - apiGroups:
+ - ""
+ resources:
+ - persistentvolumeclaims
+ verbs:
+ - get
+ - list
+ - patch
+ - update
+ - watch
- aggregationRule:
clusterRoleSelectors:
- matchLabels:
diff --git a/staging/src/k8s.io/api/storage/v1/generated.proto b/staging/src/k8s.io/api/storage/v1/generated.proto
index df9f1dc458d..d1785659c02 100644
--- a/staging/src/k8s.io/api/storage/v1/generated.proto
+++ b/staging/src/k8s.io/api/storage/v1/generated.proto
@@ -65,16 +65,14 @@ message StorageClass {
// VolumeBindingMode indicates how PersistentVolumeClaims should be
// provisioned and bound. When unset, VolumeBindingImmediate is used.
- // This field is alpha-level and is only honored by servers that enable
- // the VolumeScheduling feature.
+ // This field is only honored by servers that enable the VolumeScheduling feature.
// +optional
optional string volumeBindingMode = 7;
// Restrict the node topologies where volumes can be dynamically provisioned.
// Each volume plugin defines its own supported topology specifications.
// An empty TopologySelectorTerm list means there is no topology restriction.
- // This field is alpha-level and is only honored by servers that enable
- // the DynamicProvisioningScheduling feature.
+ // This field is only honored by servers that enable the VolumeScheduling feature.
// +optional
repeated k8s.io.api.core.v1.TopologySelectorTerm allowedTopologies = 8;
}
diff --git a/staging/src/k8s.io/api/storage/v1/types.go b/staging/src/k8s.io/api/storage/v1/types.go
index 45bfa7681be..30e6d6d29bc 100644
--- a/staging/src/k8s.io/api/storage/v1/types.go
+++ b/staging/src/k8s.io/api/storage/v1/types.go
@@ -62,16 +62,14 @@ type StorageClass struct {
// VolumeBindingMode indicates how PersistentVolumeClaims should be
// provisioned and bound. When unset, VolumeBindingImmediate is used.
- // This field is alpha-level and is only honored by servers that enable
- // the VolumeScheduling feature.
+ // This field is only honored by servers that enable the VolumeScheduling feature.
// +optional
VolumeBindingMode *VolumeBindingMode `json:"volumeBindingMode,omitempty" protobuf:"bytes,7,opt,name=volumeBindingMode"`
// Restrict the node topologies where volumes can be dynamically provisioned.
// Each volume plugin defines its own supported topology specifications.
// An empty TopologySelectorTerm list means there is no topology restriction.
- // This field is alpha-level and is only honored by servers that enable
- // the DynamicProvisioningScheduling feature.
+ // This field is only honored by servers that enable the VolumeScheduling feature.
// +optional
AllowedTopologies []v1.TopologySelectorTerm `json:"allowedTopologies,omitempty" protobuf:"bytes,8,rep,name=allowedTopologies"`
}
diff --git a/staging/src/k8s.io/api/storage/v1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/storage/v1/types_swagger_doc_generated.go
index 1d658704700..23b76e28de9 100644
--- a/staging/src/k8s.io/api/storage/v1/types_swagger_doc_generated.go
+++ b/staging/src/k8s.io/api/storage/v1/types_swagger_doc_generated.go
@@ -35,8 +35,8 @@ var map_StorageClass = map[string]string{
"reclaimPolicy": "Dynamically provisioned PersistentVolumes of this storage class are created with this reclaimPolicy. Defaults to Delete.",
"mountOptions": "Dynamically provisioned PersistentVolumes of this storage class are created with these mountOptions, e.g. [\"ro\", \"soft\"]. Not validated - mount of the PVs will simply fail if one is invalid.",
"allowVolumeExpansion": "AllowVolumeExpansion shows whether the storage class allow volume expand",
- "volumeBindingMode": "VolumeBindingMode indicates how PersistentVolumeClaims should be provisioned and bound. When unset, VolumeBindingImmediate is used. This field is alpha-level and is only honored by servers that enable the VolumeScheduling feature.",
- "allowedTopologies": "Restrict the node topologies where volumes can be dynamically provisioned. Each volume plugin defines its own supported topology specifications. An empty TopologySelectorTerm list means there is no topology restriction. This field is alpha-level and is only honored by servers that enable the DynamicProvisioningScheduling feature.",
+ "volumeBindingMode": "VolumeBindingMode indicates how PersistentVolumeClaims should be provisioned and bound. When unset, VolumeBindingImmediate is used. This field is only honored by servers that enable the VolumeScheduling feature.",
+ "allowedTopologies": "Restrict the node topologies where volumes can be dynamically provisioned. Each volume plugin defines its own supported topology specifications. An empty TopologySelectorTerm list means there is no topology restriction. This field is only honored by servers that enable the VolumeScheduling feature.",
}
func (StorageClass) SwaggerDoc() map[string]string {
diff --git a/staging/src/k8s.io/api/storage/v1beta1/generated.proto b/staging/src/k8s.io/api/storage/v1beta1/generated.proto
index 359b68634d0..ecf53bef60e 100644
--- a/staging/src/k8s.io/api/storage/v1beta1/generated.proto
+++ b/staging/src/k8s.io/api/storage/v1beta1/generated.proto
@@ -65,16 +65,14 @@ message StorageClass {
// VolumeBindingMode indicates how PersistentVolumeClaims should be
// provisioned and bound. When unset, VolumeBindingImmediate is used.
- // This field is alpha-level and is only honored by servers that enable
- // the VolumeScheduling feature.
+ // This field is only honored by servers that enable the VolumeScheduling feature.
// +optional
optional string volumeBindingMode = 7;
// Restrict the node topologies where volumes can be dynamically provisioned.
// Each volume plugin defines its own supported topology specifications.
// An empty TopologySelectorTerm list means there is no topology restriction.
- // This field is alpha-level and is only honored by servers that enable
- // the DynamicProvisioningScheduling feature.
+ // This field is only honored by servers that enable the VolumeScheduling feature.
// +optional
repeated k8s.io.api.core.v1.TopologySelectorTerm allowedTopologies = 8;
}
diff --git a/staging/src/k8s.io/api/storage/v1beta1/types.go b/staging/src/k8s.io/api/storage/v1beta1/types.go
index 7ec1e908f47..5702c21bcc8 100644
--- a/staging/src/k8s.io/api/storage/v1beta1/types.go
+++ b/staging/src/k8s.io/api/storage/v1beta1/types.go
@@ -62,16 +62,14 @@ type StorageClass struct {
// VolumeBindingMode indicates how PersistentVolumeClaims should be
// provisioned and bound. When unset, VolumeBindingImmediate is used.
- // This field is alpha-level and is only honored by servers that enable
- // the VolumeScheduling feature.
+ // This field is only honored by servers that enable the VolumeScheduling feature.
// +optional
VolumeBindingMode *VolumeBindingMode `json:"volumeBindingMode,omitempty" protobuf:"bytes,7,opt,name=volumeBindingMode"`
// Restrict the node topologies where volumes can be dynamically provisioned.
// Each volume plugin defines its own supported topology specifications.
// An empty TopologySelectorTerm list means there is no topology restriction.
- // This field is alpha-level and is only honored by servers that enable
- // the DynamicProvisioningScheduling feature.
+ // This field is only honored by servers that enable the VolumeScheduling feature.
// +optional
AllowedTopologies []v1.TopologySelectorTerm `json:"allowedTopologies,omitempty" protobuf:"bytes,8,rep,name=allowedTopologies"`
}
diff --git a/staging/src/k8s.io/api/storage/v1beta1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/storage/v1beta1/types_swagger_doc_generated.go
index 423e7f271b4..044d69f5855 100644
--- a/staging/src/k8s.io/api/storage/v1beta1/types_swagger_doc_generated.go
+++ b/staging/src/k8s.io/api/storage/v1beta1/types_swagger_doc_generated.go
@@ -35,8 +35,8 @@ var map_StorageClass = map[string]string{
"reclaimPolicy": "Dynamically provisioned PersistentVolumes of this storage class are created with this reclaimPolicy. Defaults to Delete.",
"mountOptions": "Dynamically provisioned PersistentVolumes of this storage class are created with these mountOptions, e.g. [\"ro\", \"soft\"]. Not validated - mount of the PVs will simply fail if one is invalid.",
"allowVolumeExpansion": "AllowVolumeExpansion shows whether the storage class allow volume expand",
- "volumeBindingMode": "VolumeBindingMode indicates how PersistentVolumeClaims should be provisioned and bound. When unset, VolumeBindingImmediate is used. This field is alpha-level and is only honored by servers that enable the VolumeScheduling feature.",
- "allowedTopologies": "Restrict the node topologies where volumes can be dynamically provisioned. Each volume plugin defines its own supported topology specifications. An empty TopologySelectorTerm list means there is no topology restriction. This field is alpha-level and is only honored by servers that enable the DynamicProvisioningScheduling feature.",
+ "volumeBindingMode": "VolumeBindingMode indicates how PersistentVolumeClaims should be provisioned and bound. When unset, VolumeBindingImmediate is used. This field is only honored by servers that enable the VolumeScheduling feature.",
+ "allowedTopologies": "Restrict the node topologies where volumes can be dynamically provisioned. Each volume plugin defines its own supported topology specifications. An empty TopologySelectorTerm list means there is no topology restriction. This field is only honored by servers that enable the VolumeScheduling feature.",
}
func (StorageClass) SwaggerDoc() map[string]string {
diff --git a/test/integration/scheduler/volume_binding_test.go b/test/integration/scheduler/volume_binding_test.go
index 744f57d3f17..484ce93dc98 100644
--- a/test/integration/scheduler/volume_binding_test.go
+++ b/test/integration/scheduler/volume_binding_test.go
@@ -264,9 +264,8 @@ func TestVolumeBinding(t *testing.T) {
// TestVolumeBindingRescheduling tests scheduler will retry scheduling when needed.
func TestVolumeBindingRescheduling(t *testing.T) {
features := map[string]bool{
- "VolumeScheduling": true,
- "PersistentLocalVolumes": true,
- "DynamicProvisioningScheduling": true,
+ "VolumeScheduling": true,
+ "PersistentLocalVolumes": true,
}
config := setupCluster(t, "volume-scheduling", 2, features, 0)
defer config.teardown()