From fd3d555f2ca9b0d652d613e15709d8e3f1984a01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 18:44:41 +0000 Subject: [PATCH 1/6] Bump k8s.io/client-go from 0.28.4 to 0.29.0 Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.28.4 to 0.29.0. - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/kubernetes/client-go/compare/v0.28.4...v0.29.0) --- updated-dependencies: - dependency-name: k8s.io/client-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 18 +++++++++--------- go.sum | 44 ++++++++++++++++++++++---------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/go.mod b/go.mod index b9cc0e0..d2c7d84 100644 --- a/go.mod +++ b/go.mod @@ -5,10 +5,10 @@ go 1.19 require ( github.com/google/go-cmp v0.6.0 github.com/stretchr/testify v1.8.4 - k8s.io/api v0.28.4 - k8s.io/apimachinery v0.28.4 - k8s.io/client-go v0.28.4 - k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 + k8s.io/api v0.29.0 + k8s.io/apimachinery v0.29.0 + k8s.io/client-go v0.29.0 + k8s.io/utils v0.0.0-20230726121419-3b25d923346b sigs.k8s.io/controller-runtime v0.16.3 ) @@ -16,7 +16,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/evanphx/json-patch v5.6.0+incompatible // indirect - github.com/go-logr/logr v1.2.4 // indirect + github.com/go-logr/logr v1.3.0 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect @@ -36,7 +36,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect golang.org/x/net v0.17.0 // indirect - golang.org/x/oauth2 v0.8.0 // indirect + golang.org/x/oauth2 v0.10.0 // indirect golang.org/x/sys v0.13.0 // indirect golang.org/x/term v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect @@ -46,9 +46,9 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/klog/v2 v2.100.1 // indirect - k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect + k8s.io/klog/v2 v2.110.1 // indirect + k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/go.sum b/go.sum index 4dd3c85..fc7c826 100644 --- a/go.sum +++ b/go.sum @@ -6,9 +6,8 @@ github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxER github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= +github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= @@ -26,6 +25,7 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -57,8 +57,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= -github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= +github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= +github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -91,8 +91,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= -golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= +golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8= +golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -114,7 +114,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM= +golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -137,23 +137,23 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.28.4 h1:8ZBrLjwosLl/NYgv1P7EQLqoO8MGQApnbgH8tu3BMzY= -k8s.io/api v0.28.4/go.mod h1:axWTGrY88s/5YE+JSt4uUi6NMM+gur1en2REMR7IRj0= -k8s.io/apimachinery v0.28.4 h1:zOSJe1mc+GxuMnFzD4Z/U1wst50X28ZNsn5bhgIIao8= -k8s.io/apimachinery v0.28.4/go.mod h1:wI37ncBvfAoswfq626yPTe6Bz1c22L7uaJ8dho83mgg= -k8s.io/client-go v0.28.4 h1:Np5ocjlZcTrkyRJ3+T3PkXDpe4UpatQxj85+xjaD2wY= -k8s.io/client-go v0.28.4/go.mod h1:0VDZFpgoZfelyP5Wqu0/r/TRYcLYuJ2U1KEeoaPa1N4= -k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= -k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= -k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= -k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk= -k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/api v0.29.0 h1:NiCdQMY1QOp1H8lfRyeEf8eOwV6+0xA6XEE44ohDX2A= +k8s.io/api v0.29.0/go.mod h1:sdVmXoz2Bo/cb77Pxi71IPTSErEW32xa4aXwKH7gfBA= +k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o= +k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis= +k8s.io/client-go v0.29.0 h1:KmlDtFcrdUzOYrBhXHgKw5ycWzc3ryPX5mQe0SkG3y8= +k8s.io/client-go v0.29.0/go.mod h1:yLkXH4HKMAywcrD82KMSmfYg2DlE8mepPR4JGSo5n38= +k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= +k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= +k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= +k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4= sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= From bd7a1790f55aea8a280ba6560b476d08b853dd6e Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Wed, 20 Dec 2023 18:47:25 +0000 Subject: [PATCH 2/6] update struct member type --- pkg/migrate/migrate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/migrate/migrate.go b/pkg/migrate/migrate.go index 44ef4ca..73072d3 100644 --- a/pkg/migrate/migrate.go +++ b/pkg/migrate/migrate.go @@ -523,7 +523,7 @@ func getPVCs(ctx context.Context, w *log.Logger, clientset k8sclient.Interface, }, Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: &destSCName, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: map[corev1.ResourceName]resource.Quantity{ corev1.ResourceStorage: desiredPvStorage, }, From 4b181b51c568980cc001b34bcfa6c3ec7d901d4e Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Wed, 20 Dec 2023 18:53:36 +0000 Subject: [PATCH 3/6] update test --- pkg/migrate/migrate_test.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkg/migrate/migrate_test.go b/pkg/migrate/migrate_test.go index f13c2e6..cc1a0e0 100644 --- a/pkg/migrate/migrate_test.go +++ b/pkg/migrate/migrate_test.go @@ -519,7 +519,7 @@ func TestGetPVCs(t *testing.T) { }, Spec: corev1.PersistentVolumeClaimSpec{ VolumeName: "pv2", - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Gi"), }, @@ -611,7 +611,7 @@ func TestGetPVCs(t *testing.T) { }, Spec: corev1.PersistentVolumeClaimSpec{ VolumeName: "pv2", - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("2Gi"), }, @@ -1360,7 +1360,7 @@ func Test_swapPVs(t *testing.T) { AccessModes: []corev1.PersistentVolumeAccessMode{ corev1.ReadWriteMany, }, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: map[corev1.ResourceName]resource.Quantity{ corev1.ResourceStorage: resource.MustParse("1Gi"), }, @@ -1397,7 +1397,7 @@ func Test_swapPVs(t *testing.T) { AccessModes: []corev1.PersistentVolumeAccessMode{ corev1.ReadWriteOnce, }, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: map[corev1.ResourceName]resource.Quantity{ corev1.ResourceStorage: resource.MustParse("1Gi"), }, @@ -1541,7 +1541,7 @@ func Test_swapPVs(t *testing.T) { AccessModes: []corev1.PersistentVolumeAccessMode{ corev1.ReadWriteMany, }, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: map[corev1.ResourceName]resource.Quantity{ corev1.ResourceStorage: resource.MustParse("1Gi"), }, @@ -1616,7 +1616,7 @@ func Test_swapPVs(t *testing.T) { AccessModes: []corev1.PersistentVolumeAccessMode{ corev1.ReadWriteOnce, }, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: map[corev1.ResourceName]resource.Quantity{ corev1.ResourceStorage: resource.MustParse("1Gi"), }, @@ -1653,7 +1653,7 @@ func Test_swapPVs(t *testing.T) { AccessModes: []corev1.PersistentVolumeAccessMode{ corev1.ReadWriteMany, }, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: map[corev1.ResourceName]resource.Quantity{ corev1.ResourceStorage: resource.MustParse("1Gi"), }, @@ -1797,7 +1797,7 @@ func Test_swapPVs(t *testing.T) { AccessModes: []corev1.PersistentVolumeAccessMode{ corev1.ReadWriteMany, }, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: map[corev1.ResourceName]resource.Quantity{ corev1.ResourceStorage: resource.MustParse("1Gi"), }, @@ -3614,7 +3614,7 @@ func Test_GetDestAccessModes(t *testing.T) { }, Spec: corev1.PersistentVolumeClaimSpec{ VolumeName: "pv2", - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Gi"), }, @@ -3638,7 +3638,7 @@ func Test_GetDestAccessModes(t *testing.T) { }, Spec: corev1.PersistentVolumeClaimSpec{ VolumeName: "pv2", - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Gi"), }, @@ -3662,7 +3662,7 @@ func Test_GetDestAccessModes(t *testing.T) { }, Spec: corev1.PersistentVolumeClaimSpec{ VolumeName: "pv2", - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Gi"), }, @@ -3686,7 +3686,7 @@ func Test_GetDestAccessModes(t *testing.T) { }, Spec: corev1.PersistentVolumeClaimSpec{ VolumeName: "pv2", - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Gi"), }, @@ -3707,7 +3707,7 @@ func Test_GetDestAccessModes(t *testing.T) { }, Spec: corev1.PersistentVolumeClaimSpec{ VolumeName: "pv2", - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Gi"), }, From c83d44e64f0f151b7546f13c3b20ac568e563e3d Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Wed, 20 Dec 2023 18:56:42 +0000 Subject: [PATCH 4/6] update preflight --- pkg/preflight/validate.go | 2 +- pkg/preflight/validate_test.go | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkg/preflight/validate.go b/pkg/preflight/validate.go index c062191..58b4ef8 100644 --- a/pkg/preflight/validate.go +++ b/pkg/preflight/validate.go @@ -197,7 +197,7 @@ func buildTmpPVC(pvc corev1.PersistentVolumeClaim, sc string) (*corev1.Persisten Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: &sc, AccessModes: destAccessModes, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Mi"), }, diff --git a/pkg/preflight/validate_test.go b/pkg/preflight/validate_test.go index 6d0d42c..54ed9b6 100644 --- a/pkg/preflight/validate_test.go +++ b/pkg/preflight/validate_test.go @@ -41,7 +41,7 @@ func Test_validateVolumeAccessModes(t *testing.T) { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: pointer.String("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteMany"}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Mi"), }, @@ -56,7 +56,7 @@ func Test_validateVolumeAccessModes(t *testing.T) { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: pointer.String("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteMany"}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Mi"), }, @@ -476,7 +476,7 @@ func Test_buildTmpPVC(t *testing.T) { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: pointer.String("dstSc"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Mi"), }, @@ -508,7 +508,7 @@ func Test_buildTmpPVC(t *testing.T) { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: pointer.String("dstSc"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteMany"}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Mi"), }, @@ -619,7 +619,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: pointer.String("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Mi"), }, @@ -682,7 +682,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: pointer.String("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Mi"), }, @@ -697,7 +697,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: pointer.String("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Mi"), }, @@ -712,7 +712,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: pointer.String("rook"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteMany"}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Mi"), }, @@ -734,7 +734,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: pointer.String("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Mi"), }, @@ -749,7 +749,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: pointer.String("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Mi"), }, @@ -795,7 +795,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: pointer.String("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Mi"), }, @@ -810,7 +810,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: pointer.String("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Mi"), }, @@ -864,7 +864,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: pointer.String("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Mi"), }, @@ -879,7 +879,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: pointer.String("rook"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteMany"}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Mi"), }, From 6a794579e9fa1deb43a010edc8026841a8541389 Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Wed, 20 Dec 2023 19:00:49 +0000 Subject: [PATCH 5/6] remove pointer calls --- pkg/migrate/migrate_test.go | 4 ++-- pkg/preflight/validate_test.go | 38 +++++++++++++++++----------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkg/migrate/migrate_test.go b/pkg/migrate/migrate_test.go index cc1a0e0..0e94205 100644 --- a/pkg/migrate/migrate_test.go +++ b/pkg/migrate/migrate_test.go @@ -17,7 +17,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" k8sclient "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) type testWriter struct { @@ -859,7 +859,7 @@ func TestGetPVCs(t *testing.T) { }, Spec: corev1.PersistentVolumeClaimSpec{ VolumeName: "pv2", - StorageClassName: pointer.String("sc1"), + StorageClassName: ptr.To("sc1"), }, }, }, diff --git a/pkg/preflight/validate_test.go b/pkg/preflight/validate_test.go index 54ed9b6..2728fbb 100644 --- a/pkg/preflight/validate_test.go +++ b/pkg/preflight/validate_test.go @@ -15,7 +15,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" k8sclient "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) func Test_validateVolumeAccessModes(t *testing.T) { @@ -39,7 +39,7 @@ func Test_validateVolumeAccessModes(t *testing.T) { Namespace: "default", }, Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.String("default"), + StorageClassName: ptr.To("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteMany"}, Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ @@ -54,7 +54,7 @@ func Test_validateVolumeAccessModes(t *testing.T) { Namespace: "default", }, Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.String("default"), + StorageClassName: ptr.To("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteMany"}, Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ @@ -329,7 +329,7 @@ func Test_checkVolumeAccessModes(t *testing.T) { UID: "12345", }, Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.String("srcSc"), + StorageClassName: ptr.To("srcSc"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteMany"}, }, Status: corev1.PersistentVolumeClaimStatus{Phase: corev1.ClaimPending}, @@ -375,7 +375,7 @@ func Test_checkVolumeAccessModes(t *testing.T) { UID: "12345", }, Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.String("dstSc"), + StorageClassName: ptr.To("dstSc"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteMany"}, }, Status: corev1.PersistentVolumeClaimStatus{Phase: corev1.ClaimPending}, @@ -464,7 +464,7 @@ func Test_buildTmpPVC(t *testing.T) { Namespace: "default", }, Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.String("dstSc"), + StorageClassName: ptr.To("dstSc"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, }, }, @@ -474,7 +474,7 @@ func Test_buildTmpPVC(t *testing.T) { Namespace: "default", }, Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.String("dstSc"), + StorageClassName: ptr.To("dstSc"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ @@ -496,7 +496,7 @@ func Test_buildTmpPVC(t *testing.T) { }, }, Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.String("dstSc"), + StorageClassName: ptr.To("dstSc"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, }, }, @@ -506,7 +506,7 @@ func Test_buildTmpPVC(t *testing.T) { Namespace: "default", }, Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.String("dstSc"), + StorageClassName: ptr.To("dstSc"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteMany"}, Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ @@ -617,7 +617,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Namespace: "default", }, Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.String("default"), + StorageClassName: ptr.To("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ @@ -680,7 +680,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Namespace: "default", }, Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.String("default"), + StorageClassName: ptr.To("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ @@ -695,7 +695,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Namespace: "test", }, Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.String("default"), + StorageClassName: ptr.To("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ @@ -710,7 +710,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Namespace: "test", }, Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.String("rook"), + StorageClassName: ptr.To("rook"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteMany"}, Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ @@ -732,7 +732,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Namespace: "default", }, Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.String("default"), + StorageClassName: ptr.To("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ @@ -747,7 +747,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Namespace: "test", }, Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.String("default"), + StorageClassName: ptr.To("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ @@ -793,7 +793,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Namespace: "default", }, Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.String("default"), + StorageClassName: ptr.To("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ @@ -808,7 +808,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Namespace: "test", }, Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.String("default"), + StorageClassName: ptr.To("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ @@ -862,7 +862,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Namespace: "default", }, Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.String("default"), + StorageClassName: ptr.To("default"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"}, Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ @@ -877,7 +877,7 @@ func Test_pvcsForStorageClass(t *testing.T) { Namespace: "test", }, Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.String("rook"), + StorageClassName: ptr.To("rook"), AccessModes: []corev1.PersistentVolumeAccessMode{"ReadWriteMany"}, Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ From 7cc286430a08ff3274f783fdaa254ea131cbb0da Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Wed, 20 Dec 2023 19:03:15 +0000 Subject: [PATCH 6/6] ptr --- pkg/preflight/validate.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/preflight/validate.go b/pkg/preflight/validate.go index 58b4ef8..a65bd0b 100644 --- a/pkg/preflight/validate.go +++ b/pkg/preflight/validate.go @@ -16,7 +16,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8sclient "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) const ( @@ -346,7 +346,7 @@ func deleteTmpPVC(l *log.Logger, client k8sclient.Interface, pvc *corev1.Persist // deletePVConsumerPod removes the pod resource from the api servere func deletePVConsumerPod(client k8sclient.Interface, pod *corev1.Pod) error { propagation := metav1.DeletePropagationForeground - delopts := metav1.DeleteOptions{GracePeriodSeconds: pointer.Int64(0), PropagationPolicy: &propagation} + delopts := metav1.DeleteOptions{GracePeriodSeconds: ptr.To(int64(0)), PropagationPolicy: &propagation} if pod != nil { if err := client.CoreV1().Pods(pod.Namespace).Delete(context.Background(), pod.Name, delopts); err != nil { return err