Merge pull request #1786 from Sneha-at/data-cache

Fix Go CVEs and update flaky test

Author: k8s-ci-robot

Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=$BUILDPLATFORM golang:1.22.2 as builder
+FROM --platform=$BUILDPLATFORM golang:1.22.4 as builder
 
 ARG STAGINGVERSION
 ARG TARGETPLATFORM

test/e2e/tests/single_zone_e2e_test.go

@@ -549,7 +549,14 @@ var _ = Describe("GCE PD CSI Driver", func() {
 
 		defer func() {
 			// Delete Disk
-			err := client.DeleteVolume(volID)
+			err = wait.Poll(5*time.Second, 1*time.Minute, func() (bool, error) {
+				err := client.DeleteVolume(volID)
+				if err == nil {
+					return true, err
+				}
+				return false, err
+			})
+
 			Expect(err).To(BeNil(), "DeleteVolume failed")
 
 			// Validate Disk Deleted
@@ -1407,7 +1414,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
 		p, z, _ := testContext.Instance.GetIdentity()
 		client := testContext.Client
 		instance := testContext.Instance
-		volName, volID := createAndValidateUniqueZonalDisk(client, p, z, standardDiskType)
+		volName, volID := createAndValidateUniqueZonalDisk(client, p, z, hdtDiskType)
 		defer deleteVolumeOrError(client, volID)
 
 		// Attach Disk
@@ -1441,7 +1448,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
 		client := testContextForVm1.Client
 		firstInstance := testContextForVm1.Instance
 
-		volName, volID := createAndValidateUniqueZonalDisk(client, p, z, standardDiskType)
+		volName, volID := createAndValidateUniqueZonalDisk(client, p, z, hdtDiskType)
 		defer deleteVolumeOrError(client, volID)
 
 		testContextForVm2 := testZoneContexts[1]