diff --git a/go.mod b/go.mod index 4e96d49f439..99e1c89ebf8 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 - //pinned k8s.io to v0.28.x tag + //pinned k8s.io to v0.29.x tag k8s.io/api v0.29.0 k8s.io/apiextensions-apiserver v0.29.0 k8s.io/apimachinery v0.29.0 diff --git a/pkg/app/csi-snapshot.go b/pkg/app/csi-snapshot.go index b5891bbbb94..9723c288096 100644 --- a/pkg/app/csi-snapshot.go +++ b/pkg/app/csi-snapshot.go @@ -230,7 +230,7 @@ func (tlc TimeLogCSI) getAppPersistentVolumeClaimObj() *corev1.PersistentVolumeC Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: &storageClassName, AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: *resource.NewQuantity(1073741824, resource.BinarySI), }, diff --git a/pkg/controllers/repositoryserver/repositoryserver_controller_test.go b/pkg/controllers/repositoryserver/repositoryserver_controller_test.go index 5235e3a6c7c..5b646a3e61c 100644 --- a/pkg/controllers/repositoryserver/repositoryserver_controller_test.go +++ b/pkg/controllers/repositoryserver/repositoryserver_controller_test.go @@ -414,7 +414,7 @@ func (s *RepoServerControllerSuite) TestFilestoreLocationVolumeMountOnRepoServer }, Spec: corev1.PersistentVolumeClaimSpec{ AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceName(corev1.ResourceStorage): k8sresource.MustParse("1Gi"), }, diff --git a/pkg/function/create_csi_snapshot_test.go b/pkg/function/create_csi_snapshot_test.go index 1097ee3f776..8bcfb101ac4 100644 --- a/pkg/function/create_csi_snapshot_test.go +++ b/pkg/function/create_csi_snapshot_test.go @@ -113,7 +113,7 @@ func getPVCManifest(pvcName, storageClassName string) *corev1.PersistentVolumeCl Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: &storageClassName, AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Gi"), }, diff --git a/pkg/function/delete_csi_snapshot_test.go b/pkg/function/delete_csi_snapshot_test.go index 1755e56c7af..41ba3dc4b3e 100644 --- a/pkg/function/delete_csi_snapshot_test.go +++ b/pkg/function/delete_csi_snapshot_test.go @@ -95,7 +95,7 @@ func (testSuite *DeleteCSISnapshotTestSuite) TestDeleteCSISnapshot(c *C) { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: &testSuite.storageClass, AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Gi"), }, diff --git a/pkg/function/e2e_volume_snapshot_test.go b/pkg/function/e2e_volume_snapshot_test.go index 9977fd962c7..5868a52f2cc 100644 --- a/pkg/function/e2e_volume_snapshot_test.go +++ b/pkg/function/e2e_volume_snapshot_test.go @@ -296,7 +296,7 @@ func newStatefulSet(namespace string) *appsv1.StatefulSet { }, Spec: corev1.PersistentVolumeClaimSpec{ AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceName(corev1.ResourceStorage): k8sresource.MustParse("1Gi"), }, diff --git a/pkg/function/restore_csi_snapshot.go b/pkg/function/restore_csi_snapshot.go index 694cd421b14..f71e5f8dfef 100644 --- a/pkg/function/restore_csi_snapshot.go +++ b/pkg/function/restore_csi_snapshot.go @@ -198,7 +198,7 @@ func newPVCManifest(args restoreCSISnapshotArgs) *corev1.PersistentVolumeClaim { Name: args.Name, }, StorageClassName: &args.StorageClass, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: *args.RestoreSize, }, diff --git a/pkg/function/restore_csi_snapshot_test.go b/pkg/function/restore_csi_snapshot_test.go index 87bd628f07c..a969ba1bbf7 100644 --- a/pkg/function/restore_csi_snapshot_test.go +++ b/pkg/function/restore_csi_snapshot_test.go @@ -174,7 +174,7 @@ func getOriginalPVCManifest(pvcName, storageClassName string) *corev1.Persistent StorageClassName: &storageClassName, AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, VolumeMode: &volumeMode, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Gi"), }, diff --git a/pkg/kube/pod_test.go b/pkg/kube/pod_test.go index 786b706794c..b41e5004bc6 100644 --- a/pkg/kube/pod_test.go +++ b/pkg/kube/pod_test.go @@ -295,7 +295,7 @@ func (s *PodSuite) TestPodWithFilesystemModeVolumes(c *C) { }, Spec: corev1.PersistentVolumeClaimSpec{ AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceName(corev1.ResourceStorage): resource.MustParse("1Gi"), }, @@ -344,7 +344,7 @@ func (s *PodSuite) TestPodWithFilesystemModeReadOnlyVolumes(c *C) { }, Spec: corev1.PersistentVolumeClaimSpec{ AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadOnlyMany}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceName(corev1.ResourceStorage): resource.MustParse("1Gi"), }, @@ -395,7 +395,7 @@ func (s *PodSuite) TestPodWithBlockModeVolumes(c *C) { Spec: corev1.PersistentVolumeClaimSpec{ AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, VolumeMode: &blockMode, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceName(corev1.ResourceStorage): resource.MustParse("1Gi"), }, diff --git a/pkg/kube/snapshot/snapshot_test.go b/pkg/kube/snapshot/snapshot_test.go index fda54114e44..cb3f9d0369d 100644 --- a/pkg/kube/snapshot/snapshot_test.go +++ b/pkg/kube/snapshot/snapshot_test.go @@ -163,7 +163,7 @@ func (s *SnapshotTestSuite) TestVolumeSnapshotFake(c *C) { Name: volName, }, Spec: corev1.PersistentVolumeClaimSpec{ - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: size, }, @@ -381,7 +381,7 @@ func (s *SnapshotTestSuite) TestWaitOnReadyToUse(c *C) { Name: volName, }, Spec: corev1.PersistentVolumeClaimSpec{ - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: size, }, @@ -599,7 +599,7 @@ func (s *SnapshotTestSuite) testVolumeSnapshot(c *C, snapshotter snapshot.Snapsh }, Spec: corev1.PersistentVolumeClaimSpec{ AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceName(corev1.ResourceStorage): size, }, diff --git a/pkg/kube/volume/volume.go b/pkg/kube/volume/volume.go index b90f1da8684..021a7b0b791 100644 --- a/pkg/kube/volume/volume.go +++ b/pkg/kube/volume/volume.go @@ -76,7 +76,7 @@ func CreatePVC( Spec: corev1.PersistentVolumeClaimSpec{ AccessModes: accessmodes, VolumeMode: volumemode, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceName(corev1.ResourceStorage): size, }, @@ -165,7 +165,7 @@ func CreatePVCFromSnapshot(ctx context.Context, args *CreatePVCFromSnapshotArgs) Kind: snapshotKind, Name: args.SnapshotName, }, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: *storageSize, }, diff --git a/pkg/param/param_test.go b/pkg/param/param_test.go index be76297ccc9..61e2dc4736b 100644 --- a/pkg/param/param_test.go +++ b/pkg/param/param_test.go @@ -79,7 +79,7 @@ func (s *ParamsSuite) SetUpTest(c *C) { }, Spec: corev1.PersistentVolumeClaimSpec{ AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceName(corev1.ResourceStorage): resource.MustParse("1Gi"), }, diff --git a/pkg/testutil/testutil.go b/pkg/testutil/testutil.go index 77be767e613..4b402c13dad 100644 --- a/pkg/testutil/testutil.go +++ b/pkg/testutil/testutil.go @@ -61,7 +61,7 @@ func NewTestPVC() *corev1.PersistentVolumeClaim { }, Spec: corev1.PersistentVolumeClaimSpec{ AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceName(corev1.ResourceStorage): resource.MustParse("1Gi"), },