@@ -30,8 +30,8 @@ import (
3030 "k8s.io/kubernetes/test/e2e/framework"
3131 e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3232
33- . "github.com/onsi/ginkgo"
34- . "github.com/onsi/gomega"
33+ "github.com/onsi/ginkgo"
34+ "github.com/onsi/gomega"
3535)
3636
3737const (
@@ -41,8 +41,8 @@ const (
4141var _ = SIGDescribe ("LimitRange" , func () {
4242 f := framework .NewDefaultFramework ("limitrange" )
4343
44- It ("should create a LimitRange with defaults and ensure pod has those defaults applied." , func () {
45- By ("Creating a LimitRange" )
44+ ginkgo . It ("should create a LimitRange with defaults and ensure pod has those defaults applied." , func () {
45+ ginkgo . By ("Creating a LimitRange" )
4646
4747 min := getResourceList ("50m" , "100Mi" , "100Gi" )
4848 max := getResourceList ("500m" , "500Mi" , "500Gi" )
@@ -54,24 +54,24 @@ var _ = SIGDescribe("LimitRange", func() {
5454 defaultLimit , defaultRequest ,
5555 maxLimitRequestRatio )
5656
57- By ("Setting up watch" )
57+ ginkgo . By ("Setting up watch" )
5858 selector := labels .SelectorFromSet (labels .Set (map [string ]string {"name" : limitRange .Name }))
5959 options := metav1.ListOptions {LabelSelector : selector .String ()}
6060 limitRanges , err := f .ClientSet .CoreV1 ().LimitRanges (f .Namespace .Name ).List (options )
61- Expect (err ).NotTo (HaveOccurred (), "failed to query for limitRanges" )
62- Expect (len (limitRanges .Items )).To (Equal (0 ))
61+ gomega . Expect (err ).NotTo (gomega . HaveOccurred (), "failed to query for limitRanges" )
62+ gomega . Expect (len (limitRanges .Items )).To (gomega . Equal (0 ))
6363 options = metav1.ListOptions {
6464 LabelSelector : selector .String (),
6565 ResourceVersion : limitRanges .ListMeta .ResourceVersion ,
6666 }
6767 w , err := f .ClientSet .CoreV1 ().LimitRanges (f .Namespace .Name ).Watch (metav1.ListOptions {})
68- Expect (err ).NotTo (HaveOccurred (), "failed to set up watch" )
68+ gomega . Expect (err ).NotTo (gomega . HaveOccurred (), "failed to set up watch" )
6969
70- By ("Submitting a LimitRange" )
70+ ginkgo . By ("Submitting a LimitRange" )
7171 limitRange , err = f .ClientSet .CoreV1 ().LimitRanges (f .Namespace .Name ).Create (limitRange )
72- Expect (err ).NotTo (HaveOccurred ())
72+ gomega . Expect (err ).NotTo (gomega . HaveOccurred ())
7373
74- By ("Verifying LimitRange creation was observed" )
74+ ginkgo . By ("Verifying LimitRange creation was observed" )
7575 select {
7676 case event , _ := <- w .ResultChan ():
7777 if event .Type != watch .Added {
@@ -81,39 +81,39 @@ var _ = SIGDescribe("LimitRange", func() {
8181 framework .Failf ("Timeout while waiting for LimitRange creation" )
8282 }
8383
84- By ("Fetching the LimitRange to ensure it has proper values" )
84+ ginkgo . By ("Fetching the LimitRange to ensure it has proper values" )
8585 limitRange , err = f .ClientSet .CoreV1 ().LimitRanges (f .Namespace .Name ).Get (limitRange .Name , metav1.GetOptions {})
86- Expect (err ).NotTo (HaveOccurred ())
86+ gomega . Expect (err ).NotTo (gomega . HaveOccurred ())
8787 expected := v1.ResourceRequirements {Requests : defaultRequest , Limits : defaultLimit }
8888 actual := v1.ResourceRequirements {Requests : limitRange .Spec .Limits [0 ].DefaultRequest , Limits : limitRange .Spec .Limits [0 ].Default }
8989 err = equalResourceRequirement (expected , actual )
90- Expect (err ).NotTo (HaveOccurred ())
90+ gomega . Expect (err ).NotTo (gomega . HaveOccurred ())
9191
92- By ("Creating a Pod with no resource requirements" )
92+ ginkgo . By ("Creating a Pod with no resource requirements" )
9393 pod := f .NewTestPod ("pod-no-resources" , v1.ResourceList {}, v1.ResourceList {})
9494 pod , err = f .ClientSet .CoreV1 ().Pods (f .Namespace .Name ).Create (pod )
95- Expect (err ).NotTo (HaveOccurred ())
95+ gomega . Expect (err ).NotTo (gomega . HaveOccurred ())
9696
97- By ("Ensuring Pod has resource requirements applied from LimitRange" )
97+ ginkgo . By ("Ensuring Pod has resource requirements applied from LimitRange" )
9898 pod , err = f .ClientSet .CoreV1 ().Pods (f .Namespace .Name ).Get (pod .Name , metav1.GetOptions {})
99- Expect (err ).NotTo (HaveOccurred ())
99+ gomega . Expect (err ).NotTo (gomega . HaveOccurred ())
100100 for i := range pod .Spec .Containers {
101101 err = equalResourceRequirement (expected , pod .Spec .Containers [i ].Resources )
102102 if err != nil {
103103 // Print the pod to help in debugging.
104104 e2elog .Logf ("Pod %+v does not have the expected requirements" , pod )
105- Expect (err ).NotTo (HaveOccurred ())
105+ gomega . Expect (err ).NotTo (gomega . HaveOccurred ())
106106 }
107107 }
108108
109- By ("Creating a Pod with partial resource requirements" )
109+ ginkgo . By ("Creating a Pod with partial resource requirements" )
110110 pod = f .NewTestPod ("pod-partial-resources" , getResourceList ("" , "150Mi" , "150Gi" ), getResourceList ("300m" , "" , "" ))
111111 pod , err = f .ClientSet .CoreV1 ().Pods (f .Namespace .Name ).Create (pod )
112- Expect (err ).NotTo (HaveOccurred ())
112+ gomega . Expect (err ).NotTo (gomega . HaveOccurred ())
113113
114- By ("Ensuring Pod has merged resource requirements applied from LimitRange" )
114+ ginkgo . By ("Ensuring Pod has merged resource requirements applied from LimitRange" )
115115 pod , err = f .ClientSet .CoreV1 ().Pods (f .Namespace .Name ).Get (pod .Name , metav1.GetOptions {})
116- Expect (err ).NotTo (HaveOccurred ())
116+ gomega . Expect (err ).NotTo (gomega . HaveOccurred ())
117117 // This is an interesting case, so it's worth a comment
118118 // If you specify a Limit, and no Request, the Limit will default to the Request
119119 // This means that the LimitRange.DefaultRequest will ONLY take affect if a container.resources.limit is not supplied
@@ -123,49 +123,49 @@ var _ = SIGDescribe("LimitRange", func() {
123123 if err != nil {
124124 // Print the pod to help in debugging.
125125 e2elog .Logf ("Pod %+v does not have the expected requirements" , pod )
126- Expect (err ).NotTo (HaveOccurred ())
126+ gomega . Expect (err ).NotTo (gomega . HaveOccurred ())
127127 }
128128 }
129129
130- By ("Failing to create a Pod with less than min resources" )
130+ ginkgo . By ("Failing to create a Pod with less than min resources" )
131131 pod = f .NewTestPod (podName , getResourceList ("10m" , "50Mi" , "50Gi" ), v1.ResourceList {})
132132 pod , err = f .ClientSet .CoreV1 ().Pods (f .Namespace .Name ).Create (pod )
133- Expect ( err ). To ( HaveOccurred () )
133+ framework . ExpectError ( err )
134134
135- By ("Failing to create a Pod with more than max resources" )
135+ ginkgo . By ("Failing to create a Pod with more than max resources" )
136136 pod = f .NewTestPod (podName , getResourceList ("600m" , "600Mi" , "600Gi" ), v1.ResourceList {})
137137 pod , err = f .ClientSet .CoreV1 ().Pods (f .Namespace .Name ).Create (pod )
138- Expect ( err ). To ( HaveOccurred () )
138+ framework . ExpectError ( err )
139139
140- By ("Updating a LimitRange" )
140+ ginkgo . By ("Updating a LimitRange" )
141141 newMin := getResourceList ("9m" , "49Mi" , "49Gi" )
142142 limitRange .Spec .Limits [0 ].Min = newMin
143143 limitRange , err = f .ClientSet .CoreV1 ().LimitRanges (f .Namespace .Name ).Update (limitRange )
144- Expect (err ).NotTo (HaveOccurred ())
144+ gomega . Expect (err ).NotTo (gomega . HaveOccurred ())
145145
146- By ("Verifying LimitRange updating is effective" )
147- Expect (wait .Poll (time .Second * 2 , time .Second * 20 , func () (bool , error ) {
146+ ginkgo . By ("Verifying LimitRange updating is effective" )
147+ gomega . Expect (wait .Poll (time .Second * 2 , time .Second * 20 , func () (bool , error ) {
148148 limitRange , err = f .ClientSet .CoreV1 ().LimitRanges (f .Namespace .Name ).Get (limitRange .Name , metav1.GetOptions {})
149- Expect (err ).NotTo (HaveOccurred ())
149+ gomega . Expect (err ).NotTo (gomega . HaveOccurred ())
150150 return reflect .DeepEqual (limitRange .Spec .Limits [0 ].Min , newMin ), nil
151- })).NotTo (HaveOccurred ())
151+ })).NotTo (gomega . HaveOccurred ())
152152
153- By ("Creating a Pod with less than former min resources" )
153+ ginkgo . By ("Creating a Pod with less than former min resources" )
154154 pod = f .NewTestPod (podName , getResourceList ("10m" , "50Mi" , "50Gi" ), v1.ResourceList {})
155155 pod , err = f .ClientSet .CoreV1 ().Pods (f .Namespace .Name ).Create (pod )
156- Expect (err ).NotTo (HaveOccurred ())
156+ gomega . Expect (err ).NotTo (gomega . HaveOccurred ())
157157
158- By ("Failing to create a Pod with more than max resources" )
158+ ginkgo . By ("Failing to create a Pod with more than max resources" )
159159 pod = f .NewTestPod (podName , getResourceList ("600m" , "600Mi" , "600Gi" ), v1.ResourceList {})
160160 pod , err = f .ClientSet .CoreV1 ().Pods (f .Namespace .Name ).Create (pod )
161- Expect ( err ). To ( HaveOccurred () )
161+ framework . ExpectError ( err )
162162
163- By ("Deleting a LimitRange" )
163+ ginkgo . By ("Deleting a LimitRange" )
164164 err = f .ClientSet .CoreV1 ().LimitRanges (f .Namespace .Name ).Delete (limitRange .Name , metav1 .NewDeleteOptions (30 ))
165- Expect (err ).NotTo (HaveOccurred ())
165+ gomega . Expect (err ).NotTo (gomega . HaveOccurred ())
166166
167- By ("Verifying the LimitRange was deleted" )
168- Expect (wait .Poll (time .Second * 5 , time .Second * 30 , func () (bool , error ) {
167+ ginkgo . By ("Verifying the LimitRange was deleted" )
168+ gomega . Expect (wait .Poll (time .Second * 5 , time .Second * 30 , func () (bool , error ) {
169169 selector := labels .SelectorFromSet (labels .Set (map [string ]string {"name" : limitRange .Name }))
170170 options := metav1.ListOptions {LabelSelector : selector .String ()}
171171 limitRanges , err := f .ClientSet .CoreV1 ().LimitRanges (f .Namespace .Name ).List (options )
@@ -190,12 +190,12 @@ var _ = SIGDescribe("LimitRange", func() {
190190
191191 return false , nil
192192
193- })).NotTo (HaveOccurred (), "kubelet never observed the termination notice" )
193+ })).NotTo (gomega . HaveOccurred (), "kubelet never observed the termination notice" )
194194
195- By ("Creating a Pod with more than former max resources" )
195+ ginkgo . By ("Creating a Pod with more than former max resources" )
196196 pod = f .NewTestPod (podName + "2" , getResourceList ("600m" , "600Mi" , "600Gi" ), v1.ResourceList {})
197197 pod , err = f .ClientSet .CoreV1 ().Pods (f .Namespace .Name ).Create (pod )
198- Expect (err ).NotTo (HaveOccurred ())
198+ gomega . Expect (err ).NotTo (gomega . HaveOccurred ())
199199 })
200200
201201})
0 commit comments