@@ -30,13 +30,13 @@ import (
3030 e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3131 imageutils "k8s.io/kubernetes/test/utils/image"
3232
33- . "github.com/onsi/ginkgo"
34- . "github.com/onsi/gomega"
33+ "github.com/onsi/ginkgo"
34+ "github.com/onsi/gomega"
3535)
3636
3737const (
38- NodesGroup = "system:nodes"
39- NodeNamePrefix = "system:node:"
38+ nodesGroup = "system:nodes"
39+ nodeNamePrefix = "system:node:"
4040)
4141
4242var _ = SIGDescribe ("[Feature:NodeAuthorizer]" , func () {
@@ -48,47 +48,47 @@ var _ = SIGDescribe("[Feature:NodeAuthorizer]", func() {
4848 var asUser string
4949 var defaultSaSecret string
5050 var nodeName string
51- BeforeEach (func () {
51+ ginkgo . BeforeEach (func () {
5252 ns = f .Namespace .Name
5353
5454 nodeList , err := f .ClientSet .CoreV1 ().Nodes ().List (metav1.ListOptions {})
5555 framework .ExpectNoError (err , "failed to list nodes in namespace: %s" , ns )
56- Expect (len (nodeList .Items )).NotTo (Equal (0 ))
56+ gomega . Expect (len (nodeList .Items )).NotTo (gomega . Equal (0 ))
5757 nodeName = nodeList .Items [0 ].Name
58- asUser = NodeNamePrefix + nodeName
58+ asUser = nodeNamePrefix + nodeName
5959 saName := "default"
6060 sa , err := f .ClientSet .CoreV1 ().ServiceAccounts (ns ).Get (saName , metav1.GetOptions {})
61- Expect (len (sa .Secrets )).NotTo (Equal (0 ))
61+ gomega . Expect (len (sa .Secrets )).NotTo (gomega . Equal (0 ))
6262 framework .ExpectNoError (err , "failed to retrieve service account (%s:%s)" , ns , saName )
6363 defaultSaSecret = sa .Secrets [0 ].Name
64- By ("Creating a kubernetes client that impersonates a node" )
64+ ginkgo . By ("Creating a kubernetes client that impersonates a node" )
6565 config , err := framework .LoadConfig ()
6666 framework .ExpectNoError (err , "failed to load kubernetes client config" )
6767 config .Impersonate = restclient.ImpersonationConfig {
6868 UserName : asUser ,
69- Groups : []string {NodesGroup },
69+ Groups : []string {nodesGroup },
7070 }
7171 c , err = clientset .NewForConfig (config )
7272 framework .ExpectNoError (err , "failed to create Clientset for the given config: %+v" , * config )
7373
7474 })
75- It ("Getting a non-existent secret should exit with the Forbidden error, not a NotFound error" , func () {
75+ ginkgo . It ("Getting a non-existent secret should exit with the Forbidden error, not a NotFound error" , func () {
7676 _ , err := c .CoreV1 ().Secrets (ns ).Get ("foo" , metav1.GetOptions {})
77- Expect (apierrors .IsForbidden (err )).Should (Equal (true ))
77+ gomega . Expect (apierrors .IsForbidden (err )).Should (gomega . Equal (true ))
7878 })
7979
80- It ("Getting an existing secret should exit with the Forbidden error" , func () {
80+ ginkgo . It ("Getting an existing secret should exit with the Forbidden error" , func () {
8181 _ , err := c .CoreV1 ().Secrets (ns ).Get (defaultSaSecret , metav1.GetOptions {})
82- Expect (apierrors .IsForbidden (err )).Should (Equal (true ))
82+ gomega . Expect (apierrors .IsForbidden (err )).Should (gomega . Equal (true ))
8383 })
8484
85- It ("Getting a non-existent configmap should exit with the Forbidden error, not a NotFound error" , func () {
85+ ginkgo . It ("Getting a non-existent configmap should exit with the Forbidden error, not a NotFound error" , func () {
8686 _ , err := c .CoreV1 ().ConfigMaps (ns ).Get ("foo" , metav1.GetOptions {})
87- Expect (apierrors .IsForbidden (err )).Should (Equal (true ))
87+ gomega . Expect (apierrors .IsForbidden (err )).Should (gomega . Equal (true ))
8888 })
8989
90- It ("Getting an existing configmap should exit with the Forbidden error" , func () {
91- By ("Create a configmap for testing" )
90+ ginkgo . It ("Getting an existing configmap should exit with the Forbidden error" , func () {
91+ ginkgo . By ("Create a configmap for testing" )
9292 configmap := & v1.ConfigMap {
9393 ObjectMeta : metav1.ObjectMeta {
9494 Namespace : ns ,
@@ -101,11 +101,11 @@ var _ = SIGDescribe("[Feature:NodeAuthorizer]", func() {
101101 _ , err := f .ClientSet .CoreV1 ().ConfigMaps (ns ).Create (configmap )
102102 framework .ExpectNoError (err , "failed to create configmap (%s:%s) %+v" , ns , configmap .Name , * configmap )
103103 _ , err = c .CoreV1 ().ConfigMaps (ns ).Get (configmap .Name , metav1.GetOptions {})
104- Expect (apierrors .IsForbidden (err )).Should (Equal (true ))
104+ gomega . Expect (apierrors .IsForbidden (err )).Should (gomega . Equal (true ))
105105 })
106106
107- It ("Getting a secret for a workload the node has access to should succeed" , func () {
108- By ("Create a secret for testing" )
107+ ginkgo . It ("Getting a secret for a workload the node has access to should succeed" , func () {
108+ ginkgo . By ("Create a secret for testing" )
109109 secret := & v1.Secret {
110110 ObjectMeta : metav1.ObjectMeta {
111111 Namespace : ns ,
@@ -118,11 +118,11 @@ var _ = SIGDescribe("[Feature:NodeAuthorizer]", func() {
118118 _ , err := f .ClientSet .CoreV1 ().Secrets (ns ).Create (secret )
119119 framework .ExpectNoError (err , "failed to create secret (%s:%s)" , ns , secret .Name )
120120
121- By ("Node should not get the secret" )
121+ ginkgo . By ("Node should not get the secret" )
122122 _ , err = c .CoreV1 ().Secrets (ns ).Get (secret .Name , metav1.GetOptions {})
123- Expect (apierrors .IsForbidden (err )).Should (Equal (true ))
123+ gomega . Expect (apierrors .IsForbidden (err )).Should (gomega . Equal (true ))
124124
125- By ("Create a pod that use the secret" )
125+ ginkgo . By ("Create a pod that use the secret" )
126126 pod := & v1.Pod {
127127 ObjectMeta : metav1.ObjectMeta {
128128 Name : "pause" ,
@@ -151,7 +151,7 @@ var _ = SIGDescribe("[Feature:NodeAuthorizer]", func() {
151151 _ , err = f .ClientSet .CoreV1 ().Pods (ns ).Create (pod )
152152 framework .ExpectNoError (err , "failed to create pod (%s:%s)" , ns , pod .Name )
153153
154- By ("The node should able to access the secret" )
154+ ginkgo . By ("The node should able to access the secret" )
155155 itv := framework .Poll
156156 dur := 1 * time .Minute
157157 err = wait .Poll (itv , dur , func () (bool , error ) {
@@ -165,22 +165,22 @@ var _ = SIGDescribe("[Feature:NodeAuthorizer]", func() {
165165 framework .ExpectNoError (err , "failed to get secret after trying every %v for %v (%s:%s)" , itv , dur , ns , secret .Name )
166166 })
167167
168- It ("A node shouldn't be able to create another node" , func () {
168+ ginkgo . It ("A node shouldn't be able to create another node" , func () {
169169 node := & v1.Node {
170170 ObjectMeta : metav1.ObjectMeta {Name : "foo" },
171171 TypeMeta : metav1.TypeMeta {
172172 Kind : "Node" ,
173173 APIVersion : "v1" ,
174174 },
175175 }
176- By (fmt .Sprintf ("Create node foo by user: %v" , asUser ))
176+ ginkgo . By (fmt .Sprintf ("Create node foo by user: %v" , asUser ))
177177 _ , err := c .CoreV1 ().Nodes ().Create (node )
178- Expect (apierrors .IsForbidden (err )).Should (Equal (true ))
178+ gomega . Expect (apierrors .IsForbidden (err )).Should (gomega . Equal (true ))
179179 })
180180
181- It ("A node shouldn't be able to delete another node" , func () {
182- By (fmt .Sprintf ("Create node foo by user: %v" , asUser ))
181+ ginkgo . It ("A node shouldn't be able to delete another node" , func () {
182+ ginkgo . By (fmt .Sprintf ("Create node foo by user: %v" , asUser ))
183183 err := c .CoreV1 ().Nodes ().Delete ("foo" , & metav1.DeleteOptions {})
184- Expect (apierrors .IsForbidden (err )).Should (Equal (true ))
184+ gomega . Expect (apierrors .IsForbidden (err )).Should (gomega . Equal (true ))
185185 })
186186})
0 commit comments