github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 02:09:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #120690 from skitt/csi-test-limit-int32

Browse Source 
Scheduler CSI tests: switch maxVols to int32
This commit is contained in:
Kubernetes Prow Robot 2023-09-15 08:24:12 -07:00 committed by GitHub
commit 7c42715e57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/scheduler/framework/plugins/nodevolumelimits/csi_test.go
View File

@ -281,7 +281,7 @@ func TestCSILimits(t *testing.T) {
existingPods []*v1.Pod existingPods []*v1.Pod
extraClaims []v1.PersistentVolumeClaim extraClaims []v1.PersistentVolumeClaim
filterName string filterName string
maxVols int maxVols int32
driverNames []string driverNames []string
test string test string
migrationEnabled bool migrationEnabled bool
@ -613,7 +613,7 @@ func TestCSILimits(t *testing.T) {
// running attachable predicate tests with feature gate and limit present on nodes // running attachable predicate tests with feature gate and limit present on nodes
for _, test := range tests { for _, test := range tests {
t.Run(test.test, func(t *testing.T) { t.Run(test.test, func(t *testing.T) {
node, csiNode := getNodeWithPodAndVolumeLimits(test.limitSource, test.existingPods, int64(test.maxVols), test.driverNames...) node, csiNode := getNodeWithPodAndVolumeLimits(test.limitSource, test.existingPods, test.maxVols, test.driverNames...)
if csiNode != nil { if csiNode != nil {
enableMigrationOnNode(csiNode, csilibplugins.AWSEBSInTreePluginName) enableMigrationOnNode(csiNode, csilibplugins.AWSEBSInTreePluginName)
} }
@ -746,7 +746,7 @@ func getFakeCSINodeLister(csiNode *storagev1.CSINode) tf.CSINodeLister {
return csiNodeLister return csiNodeLister
} }
func getNodeWithPodAndVolumeLimits(limitSource string, pods []*v1.Pod, limit int64, driverNames ...string) (*framework.NodeInfo, *storagev1.CSINode) { func getNodeWithPodAndVolumeLimits(limitSource string, pods []*v1.Pod, limit int32, driverNames ...string) (*framework.NodeInfo, *storagev1.CSINode) {
nodeInfo := framework.NewNodeInfo(pods...) nodeInfo := framework.NewNodeInfo(pods...)
node := &v1.Node{ node := &v1.Node{
ObjectMeta: metav1.ObjectMeta{Name: "node-for-max-pd-test-1"}, ObjectMeta: metav1.ObjectMeta{Name: "node-for-max-pd-test-1"},
@ -758,7 +758,7 @@ func getNodeWithPodAndVolumeLimits(limitSource string, pods []*v1.Pod, limit int
addLimitToNode := func() { addLimitToNode := func() {
for _, driver := range driverNames { for _, driver := range driverNames {
node.Status.Allocatable[getVolumeLimitKey(driver)] = *resource.NewQuantity(limit, resource.DecimalSI) node.Status.Allocatable[getVolumeLimitKey(driver)] = *resource.NewQuantity(int64(limit), resource.DecimalSI)
} }
} }
@ -780,7 +780,7 @@ func getNodeWithPodAndVolumeLimits(limitSource string, pods []*v1.Pod, limit int
} }
if addLimits { if addLimits {
driver.Allocatable = &storagev1.VolumeNodeResources{ driver.Allocatable = &storagev1.VolumeNodeResources{
Count: ptr.To(int32(limit)), Count: ptr.To(limit),
} }
} }
csiNode.Spec.Drivers = append(csiNode.Spec.Drivers, driver) csiNode.Spec.Drivers = append(csiNode.Spec.Drivers, driver)

16
pkg/scheduler/framework/plugins/nodevolumelimits/non_csi_test.go
View File

@ -129,7 +129,7 @@ func TestEphemeralLimits(t *testing.T) {
existingPods []*v1.Pod existingPods []*v1.Pod
extraClaims []v1.PersistentVolumeClaim extraClaims []v1.PersistentVolumeClaim
ephemeralEnabled bool ephemeralEnabled bool
maxVols int maxVols int32
test string test string
wantStatus *framework.Status wantStatus *framework.Status
wantPreFilterStatus *framework.Status wantPreFilterStatus *framework.Status
@ -182,7 +182,7 @@ func TestEphemeralLimits(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.test, func(t *testing.T) { t.Run(test.test, func(t *testing.T) {
fts := feature.Features{} fts := feature.Features{}
node, csiNode := getNodeWithPodAndVolumeLimits("node", test.existingPods, int64(test.maxVols), filterName) node, csiNode := getNodeWithPodAndVolumeLimits("node", test.existingPods, test.maxVols, filterName)
p := newNonCSILimits(filterName, getFakeCSINodeLister(csiNode), getFakeCSIStorageClassLister(filterName, driverName), getFakePVLister(filterName), append(getFakePVCLister(filterName), test.extraClaims...), fts).(framework.FilterPlugin) p := newNonCSILimits(filterName, getFakeCSINodeLister(csiNode), getFakeCSIStorageClassLister(filterName, driverName), getFakePVLister(filterName), append(getFakePVCLister(filterName), test.extraClaims...), fts).(framework.FilterPlugin)
_, gotPreFilterStatus := p.(*nonCSILimits).PreFilter(context.Background(), nil, test.newPod) _, gotPreFilterStatus := p.(*nonCSILimits).PreFilter(context.Background(), nil, test.newPod)
if diff := cmp.Diff(test.wantPreFilterStatus, gotPreFilterStatus); diff != "" { if diff := cmp.Diff(test.wantPreFilterStatus, gotPreFilterStatus); diff != "" {
@ -241,7 +241,7 @@ func TestAzureDiskLimits(t *testing.T) {
existingPods []*v1.Pod existingPods []*v1.Pod
filterName string filterName string
driverName string driverName string
maxVols int maxVols int32
test string test string
wantStatus *framework.Status wantStatus *framework.Status
wantPreFilterStatus *framework.Status wantPreFilterStatus *framework.Status
@ -412,7 +412,7 @@ func TestAzureDiskLimits(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.test, func(t *testing.T) { t.Run(test.test, func(t *testing.T) {
node, csiNode := getNodeWithPodAndVolumeLimits("node", test.existingPods, int64(test.maxVols), test.filterName) node, csiNode := getNodeWithPodAndVolumeLimits("node", test.existingPods, test.maxVols, test.filterName)
p := newNonCSILimits(test.filterName, getFakeCSINodeLister(csiNode), getFakeCSIStorageClassLister(test.filterName, test.driverName), getFakePVLister(test.filterName), getFakePVCLister(test.filterName), feature.Features{}).(framework.FilterPlugin) p := newNonCSILimits(test.filterName, getFakeCSINodeLister(csiNode), getFakeCSIStorageClassLister(test.filterName, test.driverName), getFakePVLister(test.filterName), getFakePVCLister(test.filterName), feature.Features{}).(framework.FilterPlugin)
_, gotPreFilterStatus := p.(*nonCSILimits).PreFilter(context.Background(), nil, test.newPod) _, gotPreFilterStatus := p.(*nonCSILimits).PreFilter(context.Background(), nil, test.newPod)
if diff := cmp.Diff(test.wantPreFilterStatus, gotPreFilterStatus); diff != "" { if diff := cmp.Diff(test.wantPreFilterStatus, gotPreFilterStatus); diff != "" {
@ -476,7 +476,7 @@ func TestEBSLimits(t *testing.T) {
existingPods []*v1.Pod existingPods []*v1.Pod
filterName string filterName string
driverName string driverName string
maxVols int maxVols int32
test string test string
wantStatus *framework.Status wantStatus *framework.Status
wantPreFilterStatus *framework.Status wantPreFilterStatus *framework.Status
@ -693,7 +693,7 @@ func TestEBSLimits(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.test, func(t *testing.T) { t.Run(test.test, func(t *testing.T) {
node, csiNode := getNodeWithPodAndVolumeLimits("node", test.existingPods, int64(test.maxVols), test.filterName) node, csiNode := getNodeWithPodAndVolumeLimits("node", test.existingPods, test.maxVols, test.filterName)
p := newNonCSILimits(test.filterName, getFakeCSINodeLister(csiNode), getFakeCSIStorageClassLister(test.filterName, test.driverName), getFakePVLister(test.filterName), getFakePVCLister(test.filterName), feature.Features{}).(framework.FilterPlugin) p := newNonCSILimits(test.filterName, getFakeCSINodeLister(csiNode), getFakeCSIStorageClassLister(test.filterName, test.driverName), getFakePVLister(test.filterName), getFakePVCLister(test.filterName), feature.Features{}).(framework.FilterPlugin)
_, gotPreFilterStatus := p.(*nonCSILimits).PreFilter(context.Background(), nil, test.newPod) _, gotPreFilterStatus := p.(*nonCSILimits).PreFilter(context.Background(), nil, test.newPod)
if diff := cmp.Diff(test.wantPreFilterStatus, gotPreFilterStatus); diff != "" { if diff := cmp.Diff(test.wantPreFilterStatus, gotPreFilterStatus); diff != "" {
@ -752,7 +752,7 @@ func TestGCEPDLimits(t *testing.T) {
existingPods []*v1.Pod existingPods []*v1.Pod
filterName string filterName string
driverName string driverName string
maxVols int maxVols int32
test string test string
wantStatus *framework.Status wantStatus *framework.Status
wantPreFilterStatus *framework.Status wantPreFilterStatus *framework.Status
@ -923,7 +923,7 @@ func TestGCEPDLimits(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.test, func(t *testing.T) { t.Run(test.test, func(t *testing.T) {
node, csiNode := getNodeWithPodAndVolumeLimits("node", test.existingPods, int64(test.maxVols), test.filterName) node, csiNode := getNodeWithPodAndVolumeLimits("node", test.existingPods, test.maxVols, test.filterName)
p := newNonCSILimits(test.filterName, getFakeCSINodeLister(csiNode), getFakeCSIStorageClassLister(test.filterName, test.driverName), getFakePVLister(test.filterName), getFakePVCLister(test.filterName), feature.Features{}).(framework.FilterPlugin) p := newNonCSILimits(test.filterName, getFakeCSINodeLister(csiNode), getFakeCSIStorageClassLister(test.filterName, test.driverName), getFakePVLister(test.filterName), getFakePVCLister(test.filterName), feature.Features{}).(framework.FilterPlugin)
_, gotPreFilterStatus := p.(*nonCSILimits).PreFilter(context.Background(), nil, test.newPod) _, gotPreFilterStatus := p.(*nonCSILimits).PreFilter(context.Background(), nil, test.newPod)
if diff := cmp.Diff(test.wantPreFilterStatus, gotPreFilterStatus); diff != "" { if diff := cmp.Diff(test.wantPreFilterStatus, gotPreFilterStatus); diff != "" {