Skip to content

Commit 2151876

Browse files
gayathrimenath-ibmgayathrimenath-ibm
authored
Lint fix, dependency update, UBI update (#173)
* Golang updated to 1.18.8 * UBI image update * golang update 1.18.9 * lint fix * UBI image update
1 parent 9347b2f commit 2151876

File tree

14 files changed

+70
-63
lines changed

14 files changed

+70
-63
lines changed

‎block-storage-attacher/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM wcp-alchemy-containers-team-access-redhat-docker-remote.artifactory.swg-devops.com/ubi8/ubi-minimal:8.7-923.1669829893
1+
FROM wcp-alchemy-containers-team-access-redhat-docker-remote.artifactory.swg-devops.com/ubi8/ubi-minimal:8.7-1031
22
# Default values
33
ARG git_commit_id=unknown
44
ARG git_remote_url=unknown

‎block-storage-attacher/OPENSOURCE‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
docker://wcp-alchemy-containers-team-access-redhat-docker-remote.artifactory.swg-devops.com/ubi8/ubi-minimal,8.7-923.1669829893
1+
docker://wcp-alchemy-containers-team-access-redhat-docker-remote.artifactory.swg-devops.com/ubi8/ubi-minimal,8.7-1031
22
github.com/BurntSushi/toml,v0.3.1,direct
33
github.com/coreos/go-systemd/v22,v22.2.0,direct
44
github.com/gofrs/uuid,v4.2.0+incompatible,direct
@@ -31,12 +31,11 @@ go.uber.org/atomic,v1.7.0,indirect
3131
go.uber.org/multierr,v1.6.0,indirect
3232
golang.org/x/crypto,v0.0.0-20211202192323-5770296d904e,indirect
3333
golang.org/x/lint,v0.0.0-20201208152925-83fdc39ff7b5,indirect
34-
golang.org/x/net,v0.0.0-20211112202133-69e39bad7dc2,indirect
34+
golang.org/x/net,v0.0.0-20220722155237-a158d28d115b,indirect
3535
golang.org/x/oauth2,v0.0.0-20210313182246-cd4f82c27b84,indirect
36-
golang.org/x/sys,v0.0.0-20220319134239-a9b59b0215f8,indirect
37-
golang.org/x/term,v0.0.0-20210317153231-de623e64d2a6,indirect
38-
golang.org/x/text,v0.3.7,indirect
39-
golang.org/x/tools,v0.1.10,indirect
36+
golang.org/x/sys,v0.0.0-20220722155257-8c9f86f7a55f,indirect
37+
golang.org/x/term,v0.0.0-20210927222741-03fcf44c2211,indirect
38+
golang.org/x/text,v0.3.8,indirect
4039
google.golang.org/appengine,v1.6.7,indirect
4140
google.golang.org/protobuf,v1.26.0,indirect
4241
gopkg.in/inf.v0,v0.9.1,indirect

‎block-storage-attacher/go.mod‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,11 @@ require (
3838
go.uber.org/multierr v1.6.0 // indirect
3939
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e // indirect
4040
golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect
41-
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
41+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
4242
golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84 // indirect
43-
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
44-
golang.org/x/term v0.0.0-20210317153231-de623e64d2a6 // indirect
43+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
44+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
4545
golang.org/x/text v0.3.7 // indirect
46-
golang.org/x/tools v0.1.10 // indirect
4746
google.golang.org/appengine v1.6.7 // indirect
4847
google.golang.org/protobuf v1.26.0 // indirect
4948
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -59,7 +58,7 @@ require (
5958

6059
replace (
6160
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.1.0
62-
golang.org/x/text => golang.org/x/text v0.3.7
61+
golang.org/x/text => golang.org/x/text v0.3.8
6362
k8s.io/api => k8s.io/api v0.19.2
6463
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.2
6564
k8s.io/apimachinery => k8s.io/apimachinery v0.19.2

‎block-storage-attacher/go.sum‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
220220
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
221221
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
222222
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
223+
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
223224
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
224225
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
225226
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -240,6 +241,7 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
240241
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
241242
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
242243
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
244+
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
243245
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e h1:MUP6MR3rJ7Gk9LEia0LP2ytiH6MuCfs7qYz+47jGdD8=
244246
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
245247
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -274,7 +276,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
274276
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
275277
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
276278
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
277-
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
279+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
280+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
278281
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
279282
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
280283
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -303,8 +306,9 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R
303306
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
304307
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
305308
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
306-
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
307-
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
309+
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
310+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
311+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
308312
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
309313
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
310314
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -321,6 +325,7 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
321325
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
322326
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
323327
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
328+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
324329
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
325330
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
326331
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -353,18 +358,20 @@ golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7w
353358
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
354359
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
355360
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
356-
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs=
357-
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
358-
golang.org/x/term v0.0.0-20210317153231-de623e64d2a6 h1:EC6+IGYTjPpRfv9a2b/6Puw0W+hLtAhkV1tPsXhutqs=
359-
golang.org/x/term v0.0.0-20210317153231-de623e64d2a6/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
360-
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
361-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
361+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
362+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
363+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
364+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
365+
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
366+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
367+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
368+
golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
369+
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
362370
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
363371
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
364372
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
365373
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE=
366374
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
367-
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
368375
golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
369376
golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
370377
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -411,8 +418,8 @@ golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc
411418
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
412419
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
413420
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
414-
golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
415-
golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
421+
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
422+
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
416423
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
417424
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
418425
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎block-storage-attacher/tests/e2e/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-923.1669829893
1+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1031
22
# Create Directory to hold all testing binaries
33
RUN mkdir /pvg-tests
44

‎block-storage-attacher/tests/e2e/common/common_util_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ import (
2525
"time"
2626

2727
"github.com/IBM/ibmcloud-storage-utilities/block-storage-attacher/tests/e2e/framework"
28-
clientset "k8s.io/client-go/kubernetes"
29-
"k8s.io/apimachinery/pkg/api/resource"
30-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3128
"k8s.io/api/core/v1"
32-
extensions "k8s.io/client-go/kubernetes/typed/extensions/v1beta1"
3329
"k8s.io/api/storage/v1beta1"
30+
"k8s.io/apimachinery/pkg/api/resource"
31+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3432
"k8s.io/apimachinery/pkg/runtime"
3533
utilyaml "k8s.io/apimachinery/pkg/util/yaml"
34+
clientset "k8s.io/client-go/kubernetes"
35+
extensions "k8s.io/client-go/kubernetes/typed/extensions/v1beta1"
3636

3737
. "github.com/onsi/ginkgo"
3838
. "github.com/onsi/gomega"
@@ -318,7 +318,7 @@ func StartProvisionerDeployment(c clientset.Interface, ns string) (*v1.Service,
318318
if selinux.GetEnabled() {
319319
//fcon, err := selinux.Getfilecon(tmpDir)
320320
//Expect(err).NotTo(HaveOccurred())
321-
context := selinux.NewContext(ProvisionerPodName+"-deployment") //(fcon)
321+
context := selinux.NewContext(ProvisionerPodName + "-deployment") //(fcon)
322322
context["type"] = "svirt_sandbox_file_t"
323323
err = selinux.Chcon(tmpDir, context.Get(), false)
324324
Expect(err).NotTo(HaveOccurred())

‎block-storage-attacher/tests/e2e/e2e-tests/block_volume_attach_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
"github.com/IBM/ibmcloud-storage-utilities/block-storage-attacher/tests/e2e/framework"
3131
. "github.com/onsi/ginkgo"
3232
. "github.com/onsi/gomega"
33-
clientset "k8s.io/client-go/kubernetes"
3433
"k8s.io/api/core/v1"
34+
clientset "k8s.io/client-go/kubernetes"
3535
"os"
3636
"os/exec"
3737
"strings"
@@ -376,5 +376,5 @@ func portworxcleanup(classname string) {
376376

377377
filepatharg := fmt.Sprintf("%s", classname)
378378
cmd := exec.Command(pvscriptpath, filepatharg, "portworxdelete") //#nosec G204 test file
379-
cmd.Run() //#nosec G104 test file
379+
cmd.Run() //#nosec G104 test file
380380
}

‎block-storage-attacher/tests/e2e/e2e-tests/e2e_suite_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
)
2020

2121
func init() {
22-
testing.Init()
22+
testing.Init()
2323
framework.ViperizeFlags()
2424
}
2525

‎block-storage-attacher/tests/e2e/framework/framework_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ import (
3232
"strings"
3333
"time"
3434

35-
"k8s.io/client-go/dynamic"
36-
clientset "k8s.io/client-go/kubernetes"
37-
apierrs "k8s.io/apimachinery/pkg/api/errors"
38-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3935
"k8s.io/api/core/v1"
36+
apierrs "k8s.io/apimachinery/pkg/api/errors"
4037
registered "k8s.io/apimachinery/pkg/api/meta"
38+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
39+
"k8s.io/client-go/dynamic"
40+
clientset "k8s.io/client-go/kubernetes"
4141

4242
. "github.com/onsi/ginkgo"
4343
. "github.com/onsi/gomega"

‎block-storage-attacher/tests/e2e/framework/util_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@ import (
3333
"time"
3434

3535
"github.com/blang/semver"
36-
"k8s.io/client-go/discovery"
37-
"k8s.io/client-go/dynamic"
38-
clientset "k8s.io/client-go/kubernetes"
36+
"k8s.io/api/core/v1"
3937
apierrs "k8s.io/apimachinery/pkg/api/errors"
4038
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
41-
"k8s.io/api/core/v1"
4239
"k8s.io/apimachinery/pkg/fields"
4340
"k8s.io/apimachinery/pkg/labels"
4441
"k8s.io/apimachinery/pkg/runtime"
4542
"k8s.io/apimachinery/pkg/util/sets"
4643
"k8s.io/apimachinery/pkg/util/uuid"
4744
"k8s.io/apimachinery/pkg/util/wait"
45+
"k8s.io/client-go/discovery"
46+
"k8s.io/client-go/dynamic"
47+
clientset "k8s.io/client-go/kubernetes"
4848
"k8s.io/client-go/pkg/version"
49-
"k8s.io/client-go/tools/watch"
5049
restclient "k8s.io/client-go/rest"
5150
"k8s.io/client-go/tools/clientcmd"
5251
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
52+
"k8s.io/client-go/tools/watch"
5353

5454
. "github.com/onsi/ginkgo"
5555
. "github.com/onsi/gomega"

0 commit comments

Comments
 (0)