Skip to content

Commit 37c6b09

Browse files
nikhilbargenikhilbarge
committed
Bumping up kubernetes version to 1.31.2
1 parent f97164f commit 37c6b09

19 files changed

+77
-78
lines changed

‎pkg/syncer/metadatasyncer.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3447,7 +3447,8 @@ func initVolumeHealthReconciler(ctx context.Context, tkgKubeClient clientset.Int
34473447
defer close(stopCh)
34483448
rc, err := NewVolumeHealthReconciler(tkgKubeClient, svcKubeClient, volumeHealthResyncPeriod,
34493449
tkgInformerFactory, svcInformerFactory,
3450-
workqueue.NewTypedItemExponentialFailureRateLimiter[any](volumeHealthRetryIntervalStart, volumeHealthRetryIntervalMax),
3450+
workqueue.NewTypedItemExponentialFailureRateLimiter[any](volumeHealthRetryIntervalStart,
3451+
volumeHealthRetryIntervalMax),
34513452
supervisorNamespace, stopCh,
34523453
)
34533454
if err != nil {
@@ -3473,10 +3474,9 @@ func initResizeReconciler(ctx context.Context, tkgClient clientset.Interface,
34733474
// https://github.com/kubernetes-sigs/vsphere-csi-driver/issues/585
34743475
informerFactory := informers.NewSharedInformerFactory(tkgClient, resizeResyncPeriod)
34753476

3476-
rc, err := newResizeReconciler(tkgClient, supervisorClient, supervisorNamespace, resizeResyncPeriod, informerFactory,
3477-
workqueue.NewTypedItemExponentialFailureRateLimiter[any](resizeRetryIntervalStart, resizeRetryIntervalMax),
3478-
stopCh,
3479-
)
3477+
rc, err := newResizeReconciler(tkgClient, supervisorClient, supervisorNamespace,
3478+
resizeResyncPeriod, informerFactory, workqueue.NewTypedItemExponentialFailureRateLimiter[any](
3479+
resizeRetryIntervalStart, resizeRetryIntervalMax), stopCh)
34803480
if err != nil {
34813481
return err
34823482
}

‎tests/e2e/csi_snapshot_utils.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,8 +563,8 @@ func createPreProvisionedSnapshotInGuestCluster(ctx context.Context, volumeSnaps
563563
return nil, nil, false, false, fmt.Errorf("failed to delete VolumeSnapshotContent: %v", err)
564564
}
565565

566-
framework.Logf(fmt.Sprintf("Creating static VolumeSnapshotContent in Guest Cluster using "+
567-
"supervisor VolumeSnapshotName %s", svcVolumeSnapshotName))
566+
framework.Logf("Creating static VolumeSnapshotContent in Guest Cluster using "+
567+
"supervisor VolumeSnapshotName %s", svcVolumeSnapshotName)
568568
staticSnapshotContent, err := snapc.SnapshotV1().VolumeSnapshotContents().Create(ctx,
569569
getVolumeSnapshotContentSpec(snapV1.DeletionPolicy("Delete"), svcVolumeSnapshotName,
570570
"static-vs", namespace), metav1.CreateOptions{})

‎tests/e2e/csi_static_provisioning_basic.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
10011001
ginkgo.By("Creating pod")
10021002
pod, err := createPod(ctx, client, namespace, nil, []*v1.PersistentVolumeClaim{pvc}, false, "")
10031003
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1004-
podName := pod.GetName
1004+
podName := pod.GetName()
10051005
framework.Logf("podName: %s", podName)
10061006

10071007
ginkgo.By(fmt.Sprintf("Verify volume: %s is attached to the node: %s",

‎tests/e2e/fullsync_test_for_block_volume.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@ func verifyCnsVolumeMetadata4GCVol(volumeID string, svcPVCName string, gcPvc *v1
935935
cnsQueryResult, err := e2eVSphere.queryCNSVolumeWithResult(volumeID)
936936
gomega.Expect(err).NotTo(gomega.HaveOccurred())
937937
if len(cnsQueryResult.Volumes) == 0 {
938-
framework.Logf("CNS volume query yielded no results for volume id: " + volumeID)
938+
framework.Logf("CNS volume query yielded no results for volume id: %s", volumeID)
939939
return false
940940
}
941941
cnsVolume := cnsQueryResult.Volumes[0]

‎tests/e2e/gc_metadata_syncer.go‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,15 @@ var _ = ginkgo.Describe("[csi-guest] pvCSI metadata syncer tests", func() {
164164
gomega.Expect(isDiskAttached).To(gomega.BeTrue(), fmt.Sprintf("Volume is not attached to the node, %s", vmUUID))
165165

166166
podUID := string(pod.UID)
167-
framework.Logf("Pod uuid : " + podUID)
168-
framework.Logf("PVC name in SV " + svcPVCName)
167+
framework.Logf("Pod uuid : %s", podUID)
168+
framework.Logf("PVC name in SV %s", svcPVCName)
169169
pvcUID = string(pvc.GetUID())
170-
framework.Logf("PVC UUID in GC " + pvcUID)
170+
framework.Logf("PVC UUID in GC %s", pvcUID)
171171
gcClusterID = strings.Replace(svcPVCName, pvcUID, "", -1)
172172

173-
framework.Logf("gcClusterId " + gcClusterID)
173+
framework.Logf("gcClusterId %s", gcClusterID)
174174
pvUID := string(pv.UID)
175-
framework.Logf("PV uuid " + pvUID)
175+
framework.Logf("PV uuid %s", pvUID)
176176

177177
verifyEntityReferenceInCRDInSupervisor(ctx, f, pv.Spec.CSI.VolumeHandle, crdCNSVolumeMetadatas,
178178
crdVersion, crdGroup, true, pv.Spec.CSI.VolumeHandle, false, nil, false)
@@ -241,14 +241,14 @@ var _ = ginkgo.Describe("[csi-guest] pvCSI metadata syncer tests", func() {
241241
gomega.Expect(err).NotTo(gomega.HaveOccurred())
242242
}()
243243

244-
framework.Logf("PVC name in SV " + svcPVCName)
244+
framework.Logf("PVC name in SV %s", svcPVCName)
245245
pvcUID = string(pvc.GetUID())
246-
framework.Logf("PVC UUID in GC " + pvcUID)
246+
framework.Logf("PVC UUID in GC %s", pvcUID)
247247
gcClusterID = strings.Replace(svcPVCName, pvcUID, "", -1)
248248

249-
framework.Logf("gcClusterId " + gcClusterID)
249+
framework.Logf("gcClusterId %s", gcClusterID)
250250
pvUID := string(pv.UID)
251-
framework.Logf("PV uuid " + pvUID)
251+
framework.Logf("PV uuid %s", pvUID)
252252

253253
verifyEntityReferenceInCRDInSupervisor(ctx, f, pv.Spec.CSI.VolumeHandle,
254254
crdCNSVolumeMetadatas, crdVersion, crdGroup, true, pv.Spec.CSI.VolumeHandle, false, nil, false)
@@ -337,15 +337,15 @@ var _ = ginkgo.Describe("[csi-guest] pvCSI metadata syncer tests", func() {
337337
gomega.Expect(isDiskAttached).To(gomega.BeTrue(), fmt.Sprintf("Volume is not attached to the node, %s", vmUUID))
338338

339339
podUID := string(pod.UID)
340-
framework.Logf("Pod uuid : " + podUID)
341-
framework.Logf("PVC name in SV " + svcPVCName)
340+
framework.Logf("Pod uuid : %s", podUID)
341+
framework.Logf("PVC name in SV %s", svcPVCName)
342342
pvcUID = string(pvc.GetUID())
343-
framework.Logf("PVC UUID in GC " + pvcUID)
343+
framework.Logf("PVC UUID in GC %s", pvcUID)
344344
gcClusterID = strings.Replace(svcPVCName, pvcUID, "", -1)
345345

346-
framework.Logf("gcClusterId " + gcClusterID)
346+
framework.Logf("gcClusterId %s", gcClusterID)
347347
pvUID := string(pv.UID)
348-
framework.Logf("PV uuid " + pvUID)
348+
framework.Logf("PV uuid %s", pvUID)
349349

350350
verifyEntityReferenceInCRDInSupervisor(ctx, f, pv.Spec.CSI.VolumeHandle,
351351
crdCNSVolumeMetadatas, crdVersion, crdGroup, true, pv.Spec.CSI.VolumeHandle, false, nil, false)
@@ -444,7 +444,7 @@ var _ = ginkgo.Describe("[csi-guest] pvCSI metadata syncer tests", func() {
444444
gomega.Expect(err).NotTo(gomega.HaveOccurred())
445445
volumeID = getVolumeIDFromSupervisorCluster(pv.Spec.CSI.VolumeHandle)
446446
gomega.Expect(volumeID).NotTo(gomega.BeEmpty())
447-
framework.Logf("value of volumeID " + volumeID)
447+
framework.Logf("value of volumeID %s", volumeID)
448448
ginkgo.By(fmt.Sprintf("Waiting for labels %+v to be updated for pvc %s in namespace %s",
449449
pvclabels, volumespec.PersistentVolumeClaim.ClaimName,
450450
GetAndExpectStringEnvVar(envSupervisorClusterNamespace)))
@@ -477,7 +477,7 @@ var _ = ginkgo.Describe("[csi-guest] pvCSI metadata syncer tests", func() {
477477
gomega.Expect(err).NotTo(gomega.HaveOccurred())
478478
volumeID = getVolumeIDFromSupervisorCluster(pv.Spec.CSI.VolumeHandle)
479479
gomega.Expect(volumeID).NotTo(gomega.BeEmpty())
480-
framework.Logf("value of volumeID " + volumeID)
480+
framework.Logf("value of volumeID %s", volumeID)
481481
ginkgo.By(fmt.Sprintf("Waiting for labels %+v to be updated for pv %s", pvlabels, pv.Name))
482482
err = e2eVSphere.waitForLabelsToBeUpdated(volumeID, pvlabels,
483483
string(cnstypes.CnsKubernetesEntityTypePV), pv.Name, "")
@@ -554,15 +554,15 @@ var _ = ginkgo.Describe("[csi-guest] pvCSI metadata syncer tests", func() {
554554
gomega.Expect(isDiskAttached).To(gomega.BeTrue(), fmt.Sprintf("Volume is not attached to the node, %s", vmUUID))
555555

556556
podUID := string(pod.UID)
557-
framework.Logf("Pod uuid : " + podUID)
558-
framework.Logf("PVC name in SV " + svcPVCName)
557+
framework.Logf("Pod uuid : %s", podUID)
558+
framework.Logf("PVC name in SV %s", svcPVCName)
559559
pvcUID = string(pvc.GetUID())
560-
framework.Logf("PVC UUID in GC " + pvcUID)
560+
framework.Logf("PVC UUID in GC %s", pvcUID)
561561
gcClusterID = strings.Replace(svcPVCName, pvcUID, "", -1)
562562

563-
framework.Logf("gcClusterId " + gcClusterID)
563+
framework.Logf("gcClusterId %s", gcClusterID)
564564
pvUID := string(pv.UID)
565-
framework.Logf("PV uuid " + pvUID)
565+
framework.Logf("PV uuid %s", pvUID)
566566

567567
verifyEntityReferenceInCRDInSupervisor(ctx, f, pv.Spec.CSI.VolumeHandle,
568568
crdCNSVolumeMetadatas, crdVersion, crdGroup, true, pv.Spec.CSI.VolumeHandle, false, nil, false)
@@ -1173,14 +1173,14 @@ var _ = ginkgo.Describe("[csi-guest] pvCSI metadata syncer tests", func() {
11731173
volumeID = getVolumeIDFromSupervisorCluster(svcPVCName)
11741174
gomega.Expect(volumeID).NotTo(gomega.BeEmpty())
11751175

1176-
framework.Logf("PVC name in SV " + svcPVCName)
1176+
framework.Logf("PVC name in SV %s", svcPVCName)
11771177
pvcUID := string(pvclaim.GetUID())
1178-
framework.Logf("PVC UUID in GC " + pvcUID)
1178+
framework.Logf("PVC UUID in GC %s", pvcUID)
11791179
gcClusterID := strings.Replace(svcPVCName, pvcUID, "", -1)
11801180

1181-
framework.Logf("gcClusterId " + gcClusterID)
1181+
framework.Logf("gcClusterId %s", gcClusterID)
11821182
pvUID := string(pv.UID)
1183-
framework.Logf("PV uuid " + pvUID)
1183+
framework.Logf("PV uuid %s", pvUID)
11841184

11851185
verifyEntityReferenceInCRDInSupervisor(ctx, f, pv.Spec.CSI.VolumeHandle,
11861186
crdCNSVolumeMetadatas, crdVersion, crdGroup, true, pv.Spec.CSI.VolumeHandle, false, nil, false)
@@ -1274,9 +1274,9 @@ var _ = ginkgo.Describe("[csi-guest] pvCSI metadata syncer tests", func() {
12741274
volumeIDNewGC = getVolumeIDFromSupervisorCluster(svcNewPVCName)
12751275
gomega.Expect(volumeIDNewGC).NotTo(gomega.BeEmpty())
12761276

1277-
framework.Logf("PVC name in SV " + svcNewPVCName)
1277+
framework.Logf("PVC name in SV %s", svcNewPVCName)
12781278
pvcNewUID := string(pvcNew.GetUID())
1279-
framework.Logf("pvcNewUID in GC " + pvcNewUID)
1279+
framework.Logf("pvcNewUID in GC %s", pvcNewUID)
12801280
gcNewClusterID := strings.Replace(svcNewPVCName, pvcNewUID, "", -1)
12811281

12821282
ginkgo.By("Creating PV in new guest cluster with volume handle from SVC")
@@ -1289,7 +1289,7 @@ var _ = ginkgo.Describe("[csi-guest] pvCSI metadata syncer tests", func() {
12891289
gomega.Expect(err).NotTo(gomega.HaveOccurred())
12901290

12911291
pvNewUID := string(pvNew.UID)
1292-
framework.Logf("pvNew uuid " + pvNewUID)
1292+
framework.Logf("pvNew uuid %s", pvNewUID)
12931293

12941294
ginkgo.By("verify crd in supervisor")
12951295
time.Sleep(10 * time.Second)
@@ -1400,14 +1400,14 @@ var _ = ginkgo.Describe("[csi-guest] pvCSI metadata syncer tests", func() {
14001400
volumeID = getVolumeIDFromSupervisorCluster(svcPVCName)
14011401
gomega.Expect(volumeID).NotTo(gomega.BeEmpty())
14021402

1403-
framework.Logf("PVC name in SV " + svcPVCName)
1403+
framework.Logf("PVC name in SV %s", svcPVCName)
14041404
pvcUID := string(pvclaim.GetUID())
1405-
framework.Logf("PVC UUID in GC " + pvcUID)
1405+
framework.Logf("PVC UUID in GC %s", pvcUID)
14061406
gcClusterID := strings.Replace(svcPVCName, pvcUID, "", -1)
14071407

1408-
framework.Logf("gcClusterId " + gcClusterID)
1408+
framework.Logf("gcClusterId %s", gcClusterID)
14091409
pvUID := string(pv.UID)
1410-
framework.Logf("PV uuid " + pvUID)
1410+
framework.Logf("PV uuid %s", pvUID)
14111411

14121412
verifyEntityReferenceInCRDInSupervisor(ctx, f, pv.Spec.CSI.VolumeHandle,
14131413
crdCNSVolumeMetadatas, crdVersion, crdGroup, true, pv.Spec.CSI.VolumeHandle, false, nil, false)
@@ -1468,7 +1468,7 @@ var _ = ginkgo.Describe("[csi-guest] pvCSI metadata syncer tests", func() {
14681468
gomega.Expect(err).NotTo(gomega.HaveOccurred())
14691469

14701470
pvNewUID := string(pvNew.UID)
1471-
framework.Logf("pvNew uuid " + pvNewUID)
1471+
framework.Logf("pvNew uuid %s", pvNewUID)
14721472

14731473
defer func() {
14741474
if pvc != nil {

‎tests/e2e/multi_svc_util.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ func getDatastoreNamesFromDCs(sshClientConfig *ssh.ClientConfig,
243243
ds := govcLoginCmd() + "govc ls " + dataCenters[i].InventoryPath + "/datastore"
244244
dsResult, err := exec.Command("/bin/sh", "-c", ds).Output()
245245
if err != nil {
246-
framework.Logf(string(dsResult))
246+
framework.Logf("dsResult %s", string(dsResult))
247247
return nil, fmt.Errorf("couldn't execute command: %s , error: %s",
248248
ds, err)
249249
}

‎tests/e2e/multi_vc.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1920,7 +1920,7 @@ var _ = ginkgo.Describe("[multivc-positive] MultiVc-Topology-Positive", func() {
19201920
}
19211921
vimClient, err := convertToVimClient(ctx, soapClient)
19221922
if err != nil {
1923-
framework.Logf("Error: ", err)
1923+
framework.Logf("Error: %v", err)
19241924
}
19251925
finder := find.NewFinder(vimClient, false)
19261926

‎tests/e2e/multi_vc_utils.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@ func createVsphereConfigSecret(namespace string, cfg e2eTestConfig, sshClientCon
10351035
conf += fmt.Sprintf("[Labels]\ntopology-categories = \"%s\"\n", cfg.Labels.TopologyCategories)
10361036
conf += "\nEOF"
10371037

1038-
framework.Logf(conf)
1038+
framework.Logf("conf: %s", conf)
10391039

10401040
result, err := sshExec(sshClientConfig, controlIp, conf)
10411041
if err != nil && result.Code != 0 {
@@ -1044,7 +1044,7 @@ func createVsphereConfigSecret(namespace string, cfg e2eTestConfig, sshClientCon
10441044
}
10451045
applyConf := "kubectl create secret generic vsphere-config-secret --from-file=csi-vsphere.conf " +
10461046
"-n " + namespace
1047-
framework.Logf(applyConf)
1047+
framework.Logf("applyConf: %s", applyConf)
10481048
result, err = sshExec(sshClientConfig, controlIp, applyConf)
10491049
if err != nil && result.Code != 0 {
10501050
fssh.LogResult(result)
@@ -1147,7 +1147,7 @@ func createStaticFCDPvAndPvc(ctx context.Context, f *framework.Framework,
11471147
fcdID, err := multiVCe2eVSphere.createFCDInMultiVC(ctx, "BasicStaticFCD"+curtimeinstring, diskSizeInMb,
11481148
defaultDatastore.Reference(), clientIndex)
11491149
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1150-
framework.Logf("FCD ID :", fcdID)
1150+
framework.Logf("FCD ID : %s", fcdID)
11511151

11521152
ginkgo.By(fmt.Sprintf("Sleeping for %v seconds to allow newly created FCD:%s to sync with pandora",
11531153
pandoraSyncWaitTime, fcdID))

‎tests/e2e/policy_driven_vol_allocation.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3723,7 +3723,7 @@ func verifyKnownDataInPod(f *framework.Framework, pod *v1.Pod, testdataFile stri
37233723

37243724
framework.Logf("Running diff with source file and file from pod %v for 100M starting %vM", pod.Name, skip)
37253725
op, err := exec.Command("diff", testdataFile, testdataFile+pod.Name).Output()
3726-
framework.Logf("diff: ", op)
3726+
framework.Logf("diff: %v", op)
37273727
gomega.Expect(err).NotTo(gomega.HaveOccurred())
37283728
gomega.Expect(len(op)).To(gomega.BeZero())
37293729
}

‎tests/e2e/snapshot_stretched_supervisor.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ var _ = ginkgo.Describe("Stretched-Supervisor-Snapshot", func() {
723723
ginkgo.By("Verify filesystem size for mount point /mnt/volume1")
724724
fsSize, err := getFSSizeMb(f, pod)
725725
gomega.Expect(err).NotTo(gomega.HaveOccurred())
726-
framework.Logf("File system size after expansion : %s, before expansion: %s", fsSize, diskSizeInMb)
726+
framework.Logf("File system size after expansion : %d, before expansion: %d", fsSize, diskSizeInMb)
727727
if fsSize < diskSizeInMb {
728728
framework.Failf("error updating filesystem size for %q. Resulting filesystem size is %d", pvclaim.Name, fsSize)
729729
}
@@ -886,7 +886,7 @@ var _ = ginkgo.Describe("Stretched-Supervisor-Snapshot", func() {
886886
ginkgo.By("Creating pod")
887887
pod, err := createPod(ctx, client, namespace, nil, []*v1.PersistentVolumeClaim{pvc}, false, execRWXCommandPod1)
888888
gomega.Expect(err).NotTo(gomega.HaveOccurred())
889-
podName := pod.GetName
889+
podName := pod.GetName()
890890
framework.Logf("podName : %s", podName)
891891

892892
ginkgo.By(fmt.Sprintf("Verify volume: %s is attached to the node: %s",

0 commit comments

Comments
 (0)