Update the related tests
1. add AllocateLoadBalancerNodePorts fields in specs for validation test cases 2. update fuzzer 3. in resource quota e2e, allocate node port for loadbalancer type service and exceed the node port quota Signed-off-by: Hanlin Shi <shihanlin9@gmail.com>
This commit is contained in:
@@ -36,7 +36,6 @@ import (
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
"k8s.io/kubernetes/test/utils/crd"
|
||||
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||
"k8s.io/utils/pointer"
|
||||
|
||||
"github.com/onsi/ginkgo"
|
||||
)
|
||||
@@ -111,7 +110,7 @@ var _ = SIGDescribe("ResourceQuota", func() {
|
||||
framework.ExpectNoError(err)
|
||||
|
||||
ginkgo.By("Not allowing a LoadBalancer Service with NodePort to be created that exceeds remaining quota")
|
||||
loadbalancer := newTestServiceForQuota("test-service-lb", v1.ServiceTypeLoadBalancer, false)
|
||||
loadbalancer := newTestServiceForQuota("test-service-lb", v1.ServiceTypeLoadBalancer, true)
|
||||
_, err = f.ClientSet.CoreV1().Services(f.Namespace.Name).Create(context.TODO(), loadbalancer, metav1.CreateOptions{})
|
||||
framework.ExpectError(err)
|
||||
|
||||
@@ -1737,6 +1736,12 @@ func newTestReplicaSetForQuota(name, image string, replicas int32) *appsv1.Repli
|
||||
|
||||
// newTestServiceForQuota returns a simple service
|
||||
func newTestServiceForQuota(name string, serviceType v1.ServiceType, allocateLoadBalancerNodePorts bool) *v1.Service {
|
||||
var allocateNPs *bool
|
||||
// Only set allocateLoadBalancerNodePorts when service type is LB
|
||||
if serviceType == v1.ServiceTypeLoadBalancer {
|
||||
allocateNPs = &allocateLoadBalancerNodePorts
|
||||
}
|
||||
|
||||
return &v1.Service{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: name,
|
||||
@@ -1747,7 +1752,7 @@ func newTestServiceForQuota(name string, serviceType v1.ServiceType, allocateLoa
|
||||
Port: 80,
|
||||
TargetPort: intstr.FromInt(80),
|
||||
}},
|
||||
AllocateLoadBalancerNodePorts: pointer.BoolPtr(allocateLoadBalancerNodePorts),
|
||||
AllocateLoadBalancerNodePorts: allocateNPs,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user