Skip to content

Commit e6389ba

Browse files
author
Daniel Chen
authored
Merge pull request buildpacks-community#1482 from eirini-forks/bump-k8s-dependencies
Bump k8s api dependencies to 0.29.0
2 parents 3344d70 + 6ceff17 commit e6389ba

5 files changed

Lines changed: 27 additions & 27 deletions

File tree

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ require (
3131
golang.org/x/crypto v0.18.0
3232
golang.org/x/net v0.19.0
3333
golang.org/x/sync v0.5.0
34-
k8s.io/api v0.28.3
35-
k8s.io/apimachinery v0.28.3
36-
k8s.io/client-go v0.28.3
34+
k8s.io/api v0.29.0
35+
k8s.io/apimachinery v0.29.0
36+
k8s.io/client-go v0.29.0
3737
k8s.io/code-generator v0.26.5
3838
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
3939
knative.dev/pkg v0.0.0-20230821102121-81e4ee140363
@@ -288,10 +288,10 @@ require (
288288
gopkg.in/yaml.v3 v3.0.1 // indirect
289289
k8s.io/apiextensions-apiserver v0.26.5 // indirect
290290
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
291-
k8s.io/klog/v2 v2.100.1 // indirect
291+
k8s.io/klog/v2 v2.110.1 // indirect
292292
k8s.io/legacy-cloud-providers v0.23.9 // indirect
293293
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
294294
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
295295
sigs.k8s.io/release-utils v0.7.7 // indirect
296-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
296+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
297297
)

‎go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -940,17 +940,17 @@ github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vv
940940
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
941941
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
942942
github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
943-
github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE=
944-
github.com/onsi/ginkgo/v2 v2.9.4/go.mod h1:gCQYp2Q+kSoIj7ykSVb9nskRSsR6PUj4AiLywzIhbKM=
943+
github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
944+
github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
945945
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
946946
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
947947
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
948948
github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
949949
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
950950
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
951951
github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
952-
github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
953-
github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
952+
github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
953+
github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
954954
github.com/open-policy-agent/opa v0.59.0 h1:1WFU/KUhJAr3qatm0Lf8Ea5jp10ZmlE2M07oaLiHypg=
955955
github.com/open-policy-agent/opa v0.59.0/go.mod h1:rdJSkEc4oQ+0074/3Fsgno5bkPsYxTjU5aLNmMujIvI=
956956
github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
@@ -1873,20 +1873,20 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
18731873
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
18741874
k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk=
18751875
k8s.io/api v0.23.9/go.mod h1:r4g0GrGdLgwSYB90qgO4tBrbKtALBhUfut+oFt4ikCc=
1876-
k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM=
1877-
k8s.io/api v0.28.3/go.mod h1:MRCV/jr1dW87/qJnZ57U5Pak65LGmQVkKTzf3AtKFHc=
1876+
k8s.io/api v0.29.0 h1:NiCdQMY1QOp1H8lfRyeEf8eOwV6+0xA6XEE44ohDX2A=
1877+
k8s.io/api v0.29.0/go.mod h1:sdVmXoz2Bo/cb77Pxi71IPTSErEW32xa4aXwKH7gfBA=
18781878
k8s.io/apiextensions-apiserver v0.26.5 h1:VJ946z9RjyCPn3qiz4Kus/UYjCRrdn1xUvEsJFvN5Yo=
18791879
k8s.io/apiextensions-apiserver v0.26.5/go.mod h1:Olsde7ZNWnyz9rsL13iXYXmL1h7kWujtKeC3yWVCDPo=
18801880
k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0=
18811881
k8s.io/apimachinery v0.23.9/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
1882-
k8s.io/apimachinery v0.28.3 h1:B1wYx8txOaCQG0HmYF6nbpU8dg6HvA06x5tEffvOe7A=
1883-
k8s.io/apimachinery v0.28.3/go.mod h1:uQTKmIqs+rAYaq+DFaoD2X7pcjLOqbQX2AOiO0nIpb8=
1882+
k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o=
1883+
k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis=
18841884
k8s.io/apiserver v0.22.4/go.mod h1:38WmcUZiiy41A7Aty8/VorWRa8vDGqoUzDf2XYlku0E=
18851885
k8s.io/apiserver v0.23.9/go.mod h1:vIXpgCnHep34bP/y+wGhYdn1NgxAvWtntxfEjst0e74=
18861886
k8s.io/client-go v0.22.4/go.mod h1:Yzw4e5e7h1LNHA4uqnMVrpEpUs1hJOiuBsJKIlRCHDA=
18871887
k8s.io/client-go v0.23.9/go.mod h1:sNo0X0MZqo4Uu0qDY5Fl5Y60cJFinBDWWUBOAM5JUCM=
1888-
k8s.io/client-go v0.28.3 h1:2OqNb72ZuTZPKCl+4gTKvqao0AMOl9f3o2ijbAj3LI4=
1889-
k8s.io/client-go v0.28.3/go.mod h1:LTykbBp9gsA7SwqirlCXBWtK0guzfhpoW4qSm7i9dxo=
1888+
k8s.io/client-go v0.29.0 h1:KmlDtFcrdUzOYrBhXHgKw5ycWzc3ryPX5mQe0SkG3y8=
1889+
k8s.io/client-go v0.29.0/go.mod h1:yLkXH4HKMAywcrD82KMSmfYg2DlE8mepPR4JGSo5n38=
18901890
k8s.io/cloud-provider v0.22.4/go.mod h1:lTaIKDEqJt7UPbsz9sk1Aa719ADIWuFtbh/mgq72UE8=
18911891
k8s.io/cloud-provider v0.23.9/go.mod h1:pvwJIqXO2VdS5BH7O1kDJ0YNGLR2VF3g1H5vl8iZ9ak=
18921892
k8s.io/code-generator v0.26.5 h1:0p350mqxkbs29h8/yF4AMilApLVUhnRx3EAfhTWR5fY=
@@ -1906,8 +1906,8 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
19061906
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
19071907
k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
19081908
k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
1909-
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
1910-
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
1909+
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
1910+
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
19111911
k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
19121912
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk=
19131913
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
@@ -1937,8 +1937,8 @@ sigs.k8s.io/release-utils v0.7.7/go.mod h1:iU7DGVNi3umZJ8q6aHyUFzsDUIaYwNnNKGHo3
19371937
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
19381938
sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
19391939
sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
1940-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk=
1941-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
1940+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
1941+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
19421942
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
19431943
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
19441944
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

‎pkg/apis/build/v1alpha1/image_builds.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func (im *Image) BuildCache() *corev1.PersistentVolumeClaim {
7878
},
7979
Spec: corev1.PersistentVolumeClaimSpec{
8080
AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
81-
Resources: corev1.ResourceRequirements{
81+
Resources: corev1.VolumeResourceRequirements{
8282
Requests: corev1.ResourceList{
8383
corev1.ResourceStorage: *im.Spec.CacheSize,
8484
},

‎pkg/apis/build/v1alpha2/image_builds.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ func (im *Image) BuildCache() *corev1.PersistentVolumeClaim {
221221
},
222222
Spec: corev1.PersistentVolumeClaimSpec{
223223
AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
224-
Resources: corev1.ResourceRequirements{
224+
Resources: corev1.VolumeResourceRequirements{
225225
Requests: corev1.ResourceList{
226226
corev1.ResourceStorage: *im.Spec.Cache.Volume.Size,
227227
},

‎pkg/reconciler/image/image_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ imageWithBuilder := &buildapi.Image{
498498
},
499499
Spec: corev1.PersistentVolumeClaimSpec{
500500
AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
501-
Resources: corev1.ResourceRequirements{
501+
Resources: corev1.VolumeResourceRequirements{
502502
Requests: corev1.ResourceList{
503503
corev1.ResourceStorage: cacheSize,
504504
},
@@ -547,7 +547,7 @@ imageWithBuilder := &buildapi.Image{
547547
},
548548
Spec: corev1.PersistentVolumeClaimSpec{
549549
AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
550-
Resources: corev1.ResourceRequirements{
550+
Resources: corev1.VolumeResourceRequirements{
551551
Requests: corev1.ResourceList{
552552
corev1.ResourceStorage: cacheSize,
553553
},
@@ -584,7 +584,7 @@ imageWithBuilder := &buildapi.Image{
584584
},
585585
Spec: corev1.PersistentVolumeClaimSpec{
586586
AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
587-
Resources: corev1.ResourceRequirements{
587+
Resources: corev1.VolumeResourceRequirements{
588588
Requests: corev1.ResourceList{
589589
corev1.ResourceStorage: cacheSize,
590590
},
@@ -608,7 +608,7 @@ imageWithBuilder := &buildapi.Image{
608608
},
609609
Spec: corev1.PersistentVolumeClaimSpec{
610610
AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
611-
Resources: corev1.ResourceRequirements{
611+
Resources: corev1.VolumeResourceRequirements{
612612
Requests: corev1.ResourceList{
613613
corev1.ResourceStorage: newCacheSize,
614614
},
@@ -653,7 +653,7 @@ imageWithBuilder := &buildapi.Image{
653653
},
654654
Spec: corev1.PersistentVolumeClaimSpec{
655655
AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
656-
Resources: corev1.ResourceRequirements{
656+
Resources: corev1.VolumeResourceRequirements{
657657
Requests: corev1.ResourceList{
658658
corev1.ResourceStorage: cacheSize,
659659
},
@@ -735,7 +735,7 @@ imageWithBuilder := &buildapi.Image{
735735
},
736736
Spec: corev1.PersistentVolumeClaimSpec{
737737
AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
738-
Resources: corev1.ResourceRequirements{
738+
Resources: corev1.VolumeResourceRequirements{
739739
Requests: corev1.ResourceList{
740740
corev1.ResourceStorage: cacheSize,
741741
},

0 commit comments

Comments
 (0)