Skip to content

Commit 091a259

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1579 from leiyiz/pollError
update klog version to latest. change %w unwrap to %v
2 parents afff184 + 0bda8e8 commit 091a259

38 files changed

+1595
-304
lines changed

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
3131
k8s.io/cloud-provider v0.24.1
3232
k8s.io/component-base v0.24.1
33-
k8s.io/klog/v2 v2.100.1
33+
k8s.io/klog/v2 v2.120.1
3434
k8s.io/mount-utils v0.29.0-alpha.2
3535
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
3636
sigs.k8s.io/boskos v0.0.0-20220711194915-6cb8a6fb2dd1
@@ -50,7 +50,7 @@ require (
5050
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
5151
github.com/felixge/httpsnoop v1.0.4 // indirect
5252
github.com/fsnotify/fsnotify v1.5.4 // indirect
53-
github.com/go-logr/logr v1.3.0 // indirect
53+
github.com/go-logr/logr v1.4.1 // indirect
5454
github.com/go-logr/stdr v1.2.2 // indirect
5555
github.com/go-openapi/jsonpointer v0.20.0 // indirect
5656
github.com/go-openapi/jsonreference v0.19.6 // indirect

‎go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -1065,8 +1065,8 @@ github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTg
10651065
github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
10661066
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
10671067
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
1068-
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
1069-
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
1068+
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
1069+
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
10701070
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
10711071
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
10721072
github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk=
@@ -3321,8 +3321,8 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
33213321
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
33223322
k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
33233323
k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
3324-
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
3325-
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
3324+
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
3325+
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
33263326
k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
33273327
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
33283328
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=

‎pkg/gce-pd-csi-driver/node.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -397,9 +397,9 @@ func (ns *GCENodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUns
397397
klog.Errorf("Failed to find device path for volume %s. Device may not be detached cleanly (error is ignored and unstaging is continuing): %v", volumeID, err.Error())
398398
} else {
399399
if devFsPath, err := filepath.EvalSymlinks(devicePath); err != nil {
400-
klog.Warningf("filepath.EvalSymlinks(%q) failed when trying to disable device: %w (ignored, unstaging continues)", devicePath, err)
400+
klog.Warningf("filepath.EvalSymlinks(%q) failed when trying to disable device: %v (ignored, unstaging continues)", devicePath, err)
401401
} else if err := ns.DeviceUtils.DisableDevice(devFsPath); err != nil {
402-
klog.Warningf("Failed to disabled device %s (aka %s) for volume %s. Device may not be detached cleanly (ignored, unstaging continues): %w", devicePath, devFsPath, volumeID, err)
402+
klog.Warningf("Failed to disabled device %s (aka %s) for volume %s. Device may not be detached cleanly (ignored, unstaging continues): %v", devicePath, devFsPath, volumeID, err)
403403
}
404404
}
405405

‎test/e2e/tests/multi_zone_e2e_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ func testAttachAndMount(volID string, volName string, instance *remote.InstanceI
296296
// Detach Disk
297297
err = client.ControllerUnpublishVolume(volID, instance.GetNodeID())
298298
if err != nil {
299-
klog.Errorf("Failed to detach disk: %w", err)
299+
klog.Errorf("Failed to detach disk: %v", err)
300300
}
301301
}
302302

@@ -317,12 +317,12 @@ func testAttachAndMount(volID string, volName string, instance *remote.InstanceI
317317
// Unstage Disk
318318
err = client.NodeUnstageVolume(volID, stageDir)
319319
if err != nil {
320-
klog.Errorf("Failed to unstage volume: %w", err)
320+
klog.Errorf("Failed to unstage volume: %v", err)
321321
}
322322
fp := filepath.Join("/tmp/", volName)
323323
err = testutils.RmAll(instance, fp)
324324
if err != nil {
325-
klog.Errorf("Failed to rm file path %s: %w", fp, err)
325+
klog.Errorf("Failed to rm file path %s: %v", fp, err)
326326
}
327327

328328
detach()

‎test/e2e/tests/resize_e2e_test.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
7474
// Detach Disk
7575
err = client.ControllerUnpublishVolume(volume.VolumeId, instance.GetNodeID())
7676
if err != nil {
77-
klog.Errorf("Failed to detach disk: %w", err)
77+
klog.Errorf("Failed to detach disk: %v", err)
7878
}
7979
}()
8080

@@ -87,12 +87,12 @@ var _ = Describe("GCE PD CSI Driver", func() {
8787
// Unstage Disk
8888
err = client.NodeUnstageVolume(volume.VolumeId, stageDir)
8989
if err != nil {
90-
klog.Errorf("Failed to unstage volume: %w", err)
90+
klog.Errorf("Failed to unstage volume: %v", err)
9191
}
9292
fp := filepath.Join("/tmp/", volName)
9393
err = testutils.RmAll(instance, fp)
9494
if err != nil {
95-
klog.Errorf("Failed to rm file path %s: %w", fp, err)
95+
klog.Errorf("Failed to rm file path %s: %v", fp, err)
9696
}
9797
}()
9898

@@ -105,7 +105,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
105105
// Unmount Disk
106106
err = client.NodeUnpublishVolume(volume.VolumeId, publishDir)
107107
if err != nil {
108-
klog.Errorf("NodeUnpublishVolume failed with error: %w", err)
108+
klog.Errorf("NodeUnpublishVolume failed with error: %v", err)
109109
}
110110
}()
111111

@@ -196,7 +196,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
196196
// Detach Disk
197197
err = client.ControllerUnpublishVolume(volume.VolumeId, instance.GetNodeID())
198198
if err != nil {
199-
klog.Errorf("Failed to detach disk: %w", err)
199+
klog.Errorf("Failed to detach disk: %v", err)
200200
}
201201

202202
}()
@@ -210,12 +210,12 @@ var _ = Describe("GCE PD CSI Driver", func() {
210210
// Unstage Disk
211211
err = client.NodeUnstageVolume(volume.VolumeId, stageDir)
212212
if err != nil {
213-
klog.Errorf("Failed to unstage volume: %w", err)
213+
klog.Errorf("Failed to unstage volume: %v", err)
214214
}
215215
fp := filepath.Join("/tmp/", volName)
216216
err = testutils.RmAll(instance, fp)
217217
if err != nil {
218-
klog.Errorf("Failed to rm file path %s: %w", fp, err)
218+
klog.Errorf("Failed to rm file path %s: %v", fp, err)
219219
}
220220
}()
221221

@@ -228,7 +228,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
228228
// Unmount Disk
229229
err = client.NodeUnpublishVolume(volume.VolumeId, publishDir)
230230
if err != nil {
231-
klog.Errorf("NodeUnpublishVolume failed with error: %w", err)
231+
klog.Errorf("NodeUnpublishVolume failed with error: %v", err)
232232
}
233233
}()
234234

@@ -288,7 +288,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
288288
// Detach Disk
289289
err = client.ControllerUnpublishVolume(volume.VolumeId, instance.GetNodeID())
290290
if err != nil {
291-
klog.Errorf("Failed to detach disk: %w", err)
291+
klog.Errorf("Failed to detach disk: %v", err)
292292
}
293293

294294
}()
@@ -302,12 +302,12 @@ var _ = Describe("GCE PD CSI Driver", func() {
302302
// Unstage Disk
303303
err = client.NodeUnstageVolume(volume.VolumeId, stageDir)
304304
if err != nil {
305-
klog.Errorf("Failed to unstage volume: %w", err)
305+
klog.Errorf("Failed to unstage volume: %v", err)
306306
}
307307
fp := filepath.Join("/tmp/", volName)
308308
err = testutils.RmAll(instance, fp)
309309
if err != nil {
310-
klog.Errorf("Failed to rm file path %s: %w", fp, err)
310+
klog.Errorf("Failed to rm file path %s: %v", fp, err)
311311
}
312312
}()
313313

@@ -320,7 +320,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
320320
// Unmount Disk
321321
err = client.NodeUnpublishVolume(volume.VolumeId, publishDir)
322322
if err != nil {
323-
klog.Errorf("NodeUnpublishVolume failed with error: %w", err)
323+
klog.Errorf("NodeUnpublishVolume failed with error: %v", err)
324324
}
325325
}()
326326

‎test/e2e/tests/setup_e2e_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -122,28 +122,28 @@ func NewTestContext(zone string) *remote.TestContext {
122122

123123
i, err := remote.SetupInstance(*project, *architecture, zone, nodeID, *machineType, *serviceAccount, *imageURL, computeService)
124124
if err != nil {
125-
klog.Fatalf("Failed to setup instance %v: %w", nodeID, err)
125+
klog.Fatalf("Failed to setup instance %v: %v", nodeID, err)
126126
}
127127

128128
err = testutils.MkdirAll(i, "/lib/udev_containerized")
129129
if err != nil {
130-
klog.Fatalf("Failed to make scsi_id containerized directory: %w", err)
130+
klog.Fatalf("Failed to make scsi_id containerized directory: %v", err)
131131
}
132132

133133
err = testutils.CopyFile(i, "/lib/udev/scsi_id", "/lib/udev_containerized/scsi_id")
134134
if err != nil {
135-
klog.Fatalf("Failed to copy scsi_id to containerized directory: %w", err)
135+
klog.Fatalf("Failed to copy scsi_id to containerized directory: %v", err)
136136
}
137137

138138
err = testutils.CopyFile(i, "/lib/udev/google_nvme_id", "/lib/udev_containerized/google_nvme_id")
139139
if err != nil {
140-
klog.Fatalf("Failed to copy google_nvme_id to containerized directory: %w", err)
140+
klog.Fatalf("Failed to copy google_nvme_id to containerized directory: %v", err)
141141
}
142142

143143
klog.Infof("Creating new driver and client for node %s", i.GetName())
144144
tc, err := testutils.GCEClientAndDriverSetup(i, "")
145145
if err != nil {
146-
klog.Fatalf("Failed to set up TestContext for instance %v: %w", i.GetName(), err)
146+
klog.Fatalf("Failed to set up TestContext for instance %v: %v", i.GetName(), err)
147147
}
148148

149149
klog.Infof("Finished creating TestContext for node %s", tc.Instance.GetName())

‎test/e2e/tests/single_zone_e2e_test.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
125125
// Detach Disk
126126
err = client.ControllerUnpublishVolume(volID, instance.GetNodeID())
127127
if err != nil {
128-
klog.Errorf("Failed to detach disk: %w", err)
128+
klog.Errorf("Failed to detach disk: %v", err)
129129
}
130130

131131
}()
@@ -159,12 +159,12 @@ var _ = Describe("GCE PD CSI Driver", func() {
159159
// Unstage Disk
160160
err = client.NodeUnstageVolume(volID, stageDir)
161161
if err != nil {
162-
klog.Errorf("Failed to unstage volume: %w", err)
162+
klog.Errorf("Failed to unstage volume: %v", err)
163163
}
164164
fp := filepath.Join("/tmp/", volName)
165165
err = testutils.RmAll(instance, fp)
166166
if err != nil {
167-
klog.Errorf("Failed to rm file path %s: %w", fp, err)
167+
klog.Errorf("Failed to rm file path %s: %v", fp, err)
168168
}
169169
}()
170170
})
@@ -197,7 +197,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
197197
// Detach Disk
198198
err = client.ControllerUnpublishVolume(volID, instance.GetNodeID())
199199
if err != nil {
200-
klog.Errorf("Failed to detach disk: %w", err)
200+
klog.Errorf("Failed to detach disk: %v", err)
201201
}
202202

203203
}()
@@ -229,12 +229,12 @@ var _ = Describe("GCE PD CSI Driver", func() {
229229
// Unstage Disk
230230
err = client.NodeUnstageVolume(volID, stageDir)
231231
if err != nil {
232-
klog.Errorf("Failed to unstage volume: %w", err)
232+
klog.Errorf("Failed to unstage volume: %v", err)
233233
}
234234
fp := filepath.Join("/tmp/", volName)
235235
err = testutils.RmAll(instance, fp)
236236
if err != nil {
237-
klog.Errorf("Failed to rm file path %s: %w", fp, err)
237+
klog.Errorf("Failed to rm file path %s: %v", fp, err)
238238
}
239239
}()
240240
})
@@ -1290,15 +1290,15 @@ var _ = Describe("GCE PD CSI Driver", func() {
12901290
i, err := remote.SetupInstance(*project, *architecture, zone, nodeID, *machineType, *serviceAccount, *imageURL, computeService)
12911291

12921292
if err != nil {
1293-
klog.Fatalf("Failed to setup instance %v: %w", nodeID, err)
1293+
klog.Fatalf("Failed to setup instance %v: %v", nodeID, err)
12941294
}
12951295

12961296
klog.Infof("Creating new driver and client for node %s\n", i.GetName())
12971297

12981298
// Create new driver and client w/ invalid endpoint
12991299
tcInvalid, err := testutils.GCEClientAndDriverSetup(i, "invalid-string")
13001300
if err != nil {
1301-
klog.Fatalf("Failed to set up Test Context for instance %v: %w", i.GetName(), err)
1301+
klog.Fatalf("Failed to set up Test Context for instance %v: %v", i.GetName(), err)
13021302
}
13031303

13041304
_, err = tcInvalid.Client.ListVolumes()
@@ -1307,7 +1307,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
13071307
// Create new driver and client w/ valid, passed-in endpoint
13081308
tcValid, err := testutils.GCEClientAndDriverSetup(i, "https://compute.googleapis.com")
13091309
if err != nil {
1310-
klog.Fatalf("Failed to set up Test Context for instance %v: %w", i.GetName(), err)
1310+
klog.Fatalf("Failed to set up Test Context for instance %v: %v", i.GetName(), err)
13111311
}
13121312
_, err = tcValid.Client.ListVolumes()
13131313

‎test/e2e/utils/utils.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func getBoskosProject(resourceType string) *common.Resource {
9696
case <-ticker.C:
9797
p, err := boskos.Acquire(resourceType, "free", "busy")
9898
if err != nil {
99-
klog.Warningf("boskos failed to acquire project: %w", err)
99+
klog.Warningf("boskos failed to acquire project: %v", err)
100100
} else if p == nil {
101101
klog.Warningf("boskos does not have a free %s at the moment", resourceType)
102102
} else {
@@ -128,17 +128,17 @@ func SetupProwConfig(resourceType string) (project, serviceAccount string) {
128128

129129
c, err := google.DefaultClient(context.Background(), cloudresourcemanager.CloudPlatformScope)
130130
if err != nil {
131-
klog.Fatalf("Failed to get Google Default Client: %w", err)
131+
klog.Fatalf("Failed to get Google Default Client: %v", err)
132132
}
133133

134134
cloudresourcemanagerService, err := cloudresourcemanager.New(c)
135135
if err != nil {
136-
klog.Fatalf("Failed to create new cloudresourcemanager: %w", err)
136+
klog.Fatalf("Failed to create new cloudresourcemanager: %v", err)
137137
}
138138

139139
resp, err := cloudresourcemanagerService.Projects.Get(project).Do()
140140
if err != nil {
141-
klog.Fatalf("Failed to get project %v from Cloud Resource Manager: %w", project, err)
141+
klog.Fatalf("Failed to get project %v from Cloud Resource Manager: %v", project, err)
142142
}
143143

144144
// Default Compute Engine service account

‎test/k8s-integration/filter-junit.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func MergeJUnit(testFilter string, sourceDirectories []string, destination strin
7777
for _, dir := range sourceDirectories {
7878
files, err := os.ReadDir(dir)
7979
if err != nil {
80-
klog.Errorf("Failed to read juint directory %s: %w", dir, err)
80+
klog.Errorf("Failed to read juint directory %s: %v", dir, err)
8181
mergeErrors = append(mergeErrors, err.Error())
8282
continue
8383
}

‎test/k8s-integration/main.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ func main() {
217217

218218
err := handle()
219219
if err != nil {
220-
klog.Fatalf("Failed to run integration test: %w", err)
220+
klog.Fatalf("Failed to run integration test: %v", err)
221221
}
222222
}
223223

@@ -274,7 +274,7 @@ func handle() error {
274274
defer func() {
275275
err = setEnvProject(string(oldProject))
276276
if err != nil {
277-
klog.Errorf("failed to set project environment to %s: %w", oldProject, err.Error())
277+
klog.Errorf("failed to set project environment to %s: %v", oldProject, err.Error())
278278
}
279279
}()
280280
project = newproject
@@ -300,7 +300,7 @@ func handle() error {
300300
if *teardownCluster {
301301
err := deleteImage(*stagingImage, testParams.stagingVersion)
302302
if err != nil {
303-
klog.Errorf("failed to delete image: %w", err)
303+
klog.Errorf("failed to delete image: %v", err)
304304
}
305305
}
306306
}()
@@ -325,7 +325,7 @@ func handle() error {
325325
return fmt.Errorf("failed to build Kubernetes: %v", err.Error())
326326
}
327327
} else {
328-
klog.Info("Fetching precompiled Kubernetes artifacts for %s/%s", *platform, *arch)
328+
klog.Infof("Fetching precompiled Kubernetes artifacts for %s/%s", *platform, *arch)
329329
if err := downloadKubernetesRelease(testParams.k8sSourceDir, *kubeVersion, *platform, *arch); err != nil {
330330
return fmt.Errorf("failed to download Kubernetes release: %v", err.Error())
331331
}
@@ -382,12 +382,12 @@ func handle() error {
382382
case "gce":
383383
err := clusterDownGCE(testParams.k8sSourceDir)
384384
if err != nil {
385-
klog.Errorf("failed to cluster down: %w", err)
385+
klog.Errorf("failed to cluster down: %v", err)
386386
}
387387
case "gke":
388388
err := clusterDownGKE(*gceZone, *gceRegion)
389389
if err != nil {
390-
klog.Errorf("failed to cluster down: %w", err)
390+
klog.Errorf("failed to cluster down: %v", err)
391391
}
392392
default:
393393
klog.Errorf("deployment-strategy must be set to 'gce' or 'gke', but is: %s", testParams.deploymentStrategy)
@@ -441,7 +441,7 @@ func handle() error {
441441
if *teardownDriver {
442442
defer func() {
443443
if teardownErr := deleteDriver(testParams, *deployOverlayName); teardownErr != nil {
444-
klog.Errorf("failed to delete driver: %w", teardownErr)
444+
klog.Errorf("failed to delete driver: %v", teardownErr)
445445
}
446446
}()
447447
}

0 commit comments

Comments
 (0)