mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-01-05 11:39:29 +00:00
rebase: update Kubernetes packages to v0.31.3
Some packages were updated to more recent versions, others were not. Now everything is at the latest v0.31.3. Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos
mergify[bot]
parent
beaafdebb6
commit
7731a913e9
74
go.mod
74
go.mod
@ -33,14 +33,14 @@ require (
|
||||
//
|
||||
// when updating k8s.io/kubernetes, make sure to update the replace section too
|
||||
//
|
||||
k8s.io/api v0.31.2
|
||||
k8s.io/apimachinery v0.31.2
|
||||
k8s.io/api v0.31.3
|
||||
k8s.io/apimachinery v0.31.3
|
||||
k8s.io/client-go v12.0.0+incompatible
|
||||
k8s.io/cloud-provider v0.31.1
|
||||
k8s.io/cloud-provider v0.31.3
|
||||
k8s.io/klog/v2 v2.130.1
|
||||
k8s.io/kubernetes v1.31.3
|
||||
k8s.io/mount-utils v0.31.1
|
||||
k8s.io/pod-security-admission v0.31.1
|
||||
k8s.io/mount-utils v0.31.3
|
||||
k8s.io/pod-security-admission v0.31.3
|
||||
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
|
||||
sigs.k8s.io/controller-runtime v0.19.2
|
||||
)
|
||||
@ -173,11 +173,11 @@ require (
|
||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
k8s.io/apiextensions-apiserver v0.31.1 // indirect
|
||||
k8s.io/apiserver v0.31.1 // indirect
|
||||
k8s.io/component-base v0.31.1 // indirect
|
||||
k8s.io/component-helpers v0.31.1 // indirect
|
||||
k8s.io/controller-manager v0.31.1 // indirect
|
||||
k8s.io/kms v0.31.1 // indirect
|
||||
k8s.io/apiserver v0.31.3 // indirect
|
||||
k8s.io/component-base v0.31.3 // indirect
|
||||
k8s.io/component-helpers v0.31.3 // indirect
|
||||
k8s.io/controller-manager v0.31.3 // indirect
|
||||
k8s.io/kms v0.31.3 // indirect
|
||||
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
|
||||
k8s.io/kubectl v0.0.0 // indirect
|
||||
k8s.io/kubelet v0.0.0 // indirect
|
||||
@ -200,36 +200,36 @@ replace (
|
||||
//
|
||||
// k8s.io/kubernetes depends on these k8s.io packages, but unversioned
|
||||
//
|
||||
k8s.io/api => k8s.io/api v0.31.1
|
||||
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.1
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.31.1
|
||||
k8s.io/apiserver => k8s.io/apiserver v0.31.1
|
||||
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.1
|
||||
k8s.io/client-go => k8s.io/client-go v0.31.1
|
||||
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.1
|
||||
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.1
|
||||
k8s.io/code-generator => k8s.io/code-generator v0.31.1
|
||||
k8s.io/component-base => k8s.io/component-base v0.31.1
|
||||
k8s.io/component-helpers => k8s.io/component-helpers v0.31.1
|
||||
k8s.io/controller-manager => k8s.io/controller-manager v0.31.1
|
||||
k8s.io/cri-api => k8s.io/cri-api v0.31.1
|
||||
k8s.io/cri-client => k8s.io/cri-client v0.31.1
|
||||
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.1
|
||||
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.1
|
||||
k8s.io/endpointslice => k8s.io/endpointslice v0.31.1
|
||||
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.1
|
||||
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.1
|
||||
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.1
|
||||
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.1
|
||||
k8s.io/kubectl => k8s.io/kubectl v0.31.1
|
||||
k8s.io/kubelet => k8s.io/kubelet v0.31.1
|
||||
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.1
|
||||
k8s.io/metrics => k8s.io/metrics v0.31.1
|
||||
k8s.io/api => k8s.io/api v0.31.3
|
||||
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.3
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.31.3
|
||||
k8s.io/apiserver => k8s.io/apiserver v0.31.3
|
||||
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.3
|
||||
k8s.io/client-go => k8s.io/client-go v0.31.3
|
||||
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.3
|
||||
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.3
|
||||
k8s.io/code-generator => k8s.io/code-generator v0.31.3
|
||||
k8s.io/component-base => k8s.io/component-base v0.31.3
|
||||
k8s.io/component-helpers => k8s.io/component-helpers v0.31.3
|
||||
k8s.io/controller-manager => k8s.io/controller-manager v0.31.3
|
||||
k8s.io/cri-api => k8s.io/cri-api v0.31.3
|
||||
k8s.io/cri-client => k8s.io/cri-client v0.31.3
|
||||
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.3
|
||||
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.3
|
||||
k8s.io/endpointslice => k8s.io/endpointslice v0.31.3
|
||||
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.3
|
||||
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.3
|
||||
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.3
|
||||
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.3
|
||||
k8s.io/kubectl => k8s.io/kubectl v0.31.3
|
||||
k8s.io/kubelet => k8s.io/kubelet v0.31.3
|
||||
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.3
|
||||
k8s.io/metrics => k8s.io/metrics v0.31.3
|
||||
|
||||
// TODO: replace with latest once https://github.com/ceph/ceph-csi/issues/4633 is fixed
|
||||
k8s.io/mount-utils => k8s.io/mount-utils v0.29.3
|
||||
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.1
|
||||
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.1
|
||||
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.3
|
||||
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.3
|
||||
// layeh.com seems to be misbehaving
|
||||
layeh.com/radius => github.com/layeh/radius v0.0.0-20190322222518-890bc1058917
|
||||
)
|
||||
|
||||
58
go.sum
58
go.sum
@ -3452,27 +3452,27 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
|
||||
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||
honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las=
|
||||
k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU=
|
||||
k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI=
|
||||
k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40=
|
||||
k8s.io/apiextensions-apiserver v0.31.1/go.mod h1:tWMPR3sgW+jsl2xm9v7lAyRF1rYEK71i9G5dRtkknoQ=
|
||||
k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U=
|
||||
k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
|
||||
k8s.io/apiserver v0.31.1 h1:Sars5ejQDCRBY5f7R3QFHdqN3s61nhkpaX8/k1iEw1c=
|
||||
k8s.io/apiserver v0.31.1/go.mod h1:lzDhpeToamVZJmmFlaLwdYZwd7zB+WYRYIboqA1kGxM=
|
||||
k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0=
|
||||
k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg=
|
||||
k8s.io/cloud-provider v0.31.1 h1:40b6AgDizwm5eWratZbqubTHMob25VWr6NX2Ei5TwZA=
|
||||
k8s.io/cloud-provider v0.31.1/go.mod h1:xAdkE7fdZdu9rKLuOZUMBfagu7bM+bas3iPux/2nLGg=
|
||||
k8s.io/code-generator v0.31.1/go.mod h1:oL2ky46L48osNqqZAeOcWWy0S5BXj50vVdwOtTefqIs=
|
||||
k8s.io/component-base v0.31.1 h1:UpOepcrX3rQ3ab5NB6g5iP0tvsgJWzxTyAo20sgYSy8=
|
||||
k8s.io/component-base v0.31.1/go.mod h1:WGeaw7t/kTsqpVTaCoVEtillbqAhF2/JgvO0LDOMa0w=
|
||||
k8s.io/component-helpers v0.31.1 h1:5hZUf3747atdgtR3gPntrG35rC2CkK7rYq2KUraz6Os=
|
||||
k8s.io/component-helpers v0.31.1/go.mod h1:ye0Gi8KzFNTfpIuzvVDtxJQMP/0Owkukf1vGf22Hl6U=
|
||||
k8s.io/controller-manager v0.31.1 h1:bwiy8y//EG5lJL2mdbOvZWrOgw2EXXIvwp95VYgoIis=
|
||||
k8s.io/controller-manager v0.31.1/go.mod h1:O440MSE6EI1AEVhB2Fc8FYqv6r8BHrSXjm5aj3886No=
|
||||
k8s.io/csi-translation-lib v0.31.1 h1:ps9kya8+ih0CVL59JO2B4AYH8U/e3WLQxl9sx19NjjM=
|
||||
k8s.io/csi-translation-lib v0.31.1/go.mod h1:VeYSucPZJbAt6RT25AzfG7WjyxCcmqxtr4V/CaDdNZc=
|
||||
k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8=
|
||||
k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE=
|
||||
k8s.io/apiextensions-apiserver v0.31.3 h1:+GFGj2qFiU7rGCsA5o+p/rul1OQIq6oYpQw4+u+nciE=
|
||||
k8s.io/apiextensions-apiserver v0.31.3/go.mod h1:2DSpFhUZZJmn/cr/RweH1cEVVbzFw9YBu4T+U3mf1e4=
|
||||
k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4=
|
||||
k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
|
||||
k8s.io/apiserver v0.31.3 h1:+1oHTtCB+OheqFEz375D0IlzHZ5VeQKX1KGXnx+TTuY=
|
||||
k8s.io/apiserver v0.31.3/go.mod h1:PrxVbebxrxQPFhJk4powDISIROkNMKHibTg9lTRQ0Qg=
|
||||
k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4=
|
||||
k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs=
|
||||
k8s.io/cloud-provider v0.31.3 h1:7C3CHQUUwnv/HWWVIaibZH06iPg663RYQ6C6Zy4FnO8=
|
||||
k8s.io/cloud-provider v0.31.3/go.mod h1:c7csKppoVb9Ej6upJ28AvHy4B3BtlRMzXfgezsDdPKw=
|
||||
k8s.io/code-generator v0.31.3/go.mod h1:/umCIlT84g1+Yu5ZXtP1KGSRTnGiIzzX5AzUAxsNlts=
|
||||
k8s.io/component-base v0.31.3 h1:DMCXXVx546Rfvhj+3cOm2EUxhS+EyztH423j+8sOwhQ=
|
||||
k8s.io/component-base v0.31.3/go.mod h1:xME6BHfUOafRgT0rGVBGl7TuSg8Z9/deT7qq6w7qjIU=
|
||||
k8s.io/component-helpers v0.31.3 h1:0zGPD2PrekhFWgmz85XxlMEl7dfhlKC1tERZDe3onQc=
|
||||
k8s.io/component-helpers v0.31.3/go.mod h1:HZ1HZx2TKXM7xSUV2cR9L5yDoyZPhhHQNaE3BPBLPUQ=
|
||||
k8s.io/controller-manager v0.31.3 h1:TyUav69iNYwLGwA96JDhusoZoGRdh1sdrLjXmWTcPgs=
|
||||
k8s.io/controller-manager v0.31.3/go.mod h1:yuhec+dbXmBz+4c32kxJxmcauB+1pjO2ttfYODWuv18=
|
||||
k8s.io/csi-translation-lib v0.31.3 h1:hxcPRNdtEsk766jCXSKjgH1V8jUNx5tVqdooQ1Ars/M=
|
||||
k8s.io/csi-translation-lib v0.31.3/go.mod h1:0B1gQwd868XUIDwJYy5gB2jDXWEwlcWvSsfcQEgzbRk=
|
||||
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
|
||||
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8=
|
||||
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
|
||||
@ -3483,22 +3483,22 @@ k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
|
||||
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
|
||||
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
|
||||
k8s.io/kms v0.31.1 h1:cGLyV3cIwb0ovpP/jtyIe2mEuQ/MkbhmeBF2IYCA9Io=
|
||||
k8s.io/kms v0.31.1/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94=
|
||||
k8s.io/kms v0.31.3 h1:XCFmiJn5CCKs8xoOLpCmu42Ubm/KW85wNHybGFcSAYc=
|
||||
k8s.io/kms v0.31.3/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94=
|
||||
k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
|
||||
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
|
||||
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
|
||||
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
|
||||
k8s.io/kubectl v0.31.1 h1:ih4JQJHxsEggFqDJEHSOdJ69ZxZftgeZvYo7M/cpp24=
|
||||
k8s.io/kubectl v0.31.1/go.mod h1:aNuQoR43W6MLAtXQ/Bu4GDmoHlbhHKuyD49lmTC8eJM=
|
||||
k8s.io/kubelet v0.31.1 h1:aAxwVxGzbbMKKk/FnSjvkN52K3LdHhjhzmYcyGBuE0c=
|
||||
k8s.io/kubelet v0.31.1/go.mod h1:8ZbexYHqUO946gXEfFmnMZiK2UKRGhk7LlGvJ71p2Ig=
|
||||
k8s.io/kubectl v0.31.3 h1:3r111pCjPsvnR98oLLxDMwAeM6OPGmPty6gSKaLTQes=
|
||||
k8s.io/kubectl v0.31.3/go.mod h1:lhMECDCbJN8He12qcKqs2QfmVo9Pue30geovBVpH5fs=
|
||||
k8s.io/kubelet v0.31.3 h1:DIXRAmvVGp42mV2vpA1GCLU6oO8who0/vp3Oq6kSpbI=
|
||||
k8s.io/kubelet v0.31.3/go.mod h1:KSdbEfNy5VzqUlAHlytA/fH12s+sE1u8fb/8JY9sL/8=
|
||||
k8s.io/kubernetes v1.31.3 h1:oqb7HdfnTelrGlZ6ziNugvQ/L/aJWR704114EAhUn9Q=
|
||||
k8s.io/kubernetes v1.31.3/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs=
|
||||
k8s.io/mount-utils v0.29.3 h1:iEcqPP7Vv8UClH8nnMfovtmy/04fIloRW9JuSXykoZ0=
|
||||
k8s.io/mount-utils v0.29.3/go.mod h1:9IWJTMe8tG0MYMLEp60xK9GYVeCdA3g4LowmnVi+t9Y=
|
||||
k8s.io/pod-security-admission v0.31.1 h1:j++ISpfQU0mWpKhoS4tY06Wm5EKdn65teL4lPJhEMIM=
|
||||
k8s.io/pod-security-admission v0.31.1/go.mod h1:0aE5T6MGm/50Nr/diBrC6+wwpxsT2E7NECe+TepUuEg=
|
||||
k8s.io/pod-security-admission v0.31.3 h1:8NzEV0HtdStX367AuSKfRMIZHn0hT4xuz8xNEf7/zO8=
|
||||
k8s.io/pod-security-admission v0.31.3/go.mod h1:YMIcTe/7f9R9d+3ErCMMM3Wtbj9ejKo7Z9S0OxZQrRg=
|
||||
k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
|
||||
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
|
||||
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||
|
||||
2
vendor/k8s.io/apiserver/pkg/server/config.go
generated
vendored
2
vendor/k8s.io/apiserver/pkg/server/config.go
generated
vendored
@ -1170,7 +1170,7 @@ func AuthorizeClientBearerToken(loopback *restclient.Config, authn *Authenticati
|
||||
tokens[privilegedLoopbackToken] = &user.DefaultInfo{
|
||||
Name: user.APIServerUser,
|
||||
UID: uid,
|
||||
Groups: []string{user.SystemPrivilegedGroup},
|
||||
Groups: []string{user.AllAuthenticated, user.SystemPrivilegedGroup},
|
||||
}
|
||||
|
||||
tokenAuthenticator := authenticatorfactory.NewFromTokens(tokens, authn.APIAudiences)
|
||||
|
||||
8
vendor/k8s.io/apiserver/pkg/server/options/tracing.go
generated
vendored
8
vendor/k8s.io/apiserver/pkg/server/options/tracing.go
generated
vendored
@ -23,7 +23,9 @@ import (
|
||||
"net"
|
||||
|
||||
"github.com/spf13/pflag"
|
||||
"go.opentelemetry.io/otel"
|
||||
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
|
||||
"go.opentelemetry.io/otel/metric/noop"
|
||||
"go.opentelemetry.io/otel/sdk/resource"
|
||||
"go.opentelemetry.io/otel/semconv/v1.12.0"
|
||||
"google.golang.org/grpc"
|
||||
@ -48,6 +50,12 @@ var (
|
||||
codecs = serializer.NewCodecFactory(cfgScheme)
|
||||
)
|
||||
|
||||
func init() {
|
||||
// Prevent memory leak from OTel metrics, which we don't use:
|
||||
// https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5190
|
||||
otel.SetMeterProvider(noop.NewMeterProvider())
|
||||
}
|
||||
|
||||
func init() {
|
||||
install.Install(cfgScheme)
|
||||
}
|
||||
|
||||
19
vendor/k8s.io/apiserver/pkg/server/storage/resource_encoding_config.go
generated
vendored
19
vendor/k8s.io/apiserver/pkg/server/storage/resource_encoding_config.go
generated
vendored
@ -130,13 +130,24 @@ func emulatedStorageVersion(binaryVersionOfResource schema.GroupVersion, example
|
||||
gvks, _, err := scheme.ObjectKinds(example)
|
||||
if err != nil {
|
||||
return schema.GroupVersion{}, err
|
||||
} else if len(gvks) == 0 {
|
||||
// Probably shouldn't happen if err is non-nil
|
||||
}
|
||||
|
||||
var gvk schema.GroupVersionKind
|
||||
for _, item := range gvks {
|
||||
if item.Group != binaryVersionOfResource.Group {
|
||||
continue
|
||||
}
|
||||
|
||||
gvk = item
|
||||
break
|
||||
}
|
||||
|
||||
if len(gvk.Kind) == 0 {
|
||||
return schema.GroupVersion{}, fmt.Errorf("object %T has no GVKs registered in scheme", example)
|
||||
}
|
||||
|
||||
// VersionsForGroupKind returns versions in priority order
|
||||
versions := scheme.VersionsForGroupKind(schema.GroupKind{Group: gvks[0].Group, Kind: gvks[0].Kind})
|
||||
versions := scheme.VersionsForGroupKind(schema.GroupKind{Group: gvk.Group, Kind: gvk.Kind})
|
||||
|
||||
compatibilityVersion := effectiveVersion.MinCompatibilityVersion()
|
||||
|
||||
@ -148,7 +159,7 @@ func emulatedStorageVersion(binaryVersionOfResource schema.GroupVersion, example
|
||||
gvk := schema.GroupVersionKind{
|
||||
Group: gv.Group,
|
||||
Version: gv.Version,
|
||||
Kind: gvks[0].Kind,
|
||||
Kind: gvk.Kind,
|
||||
}
|
||||
|
||||
exampleOfGVK, err := scheme.New(gvk)
|
||||
|
||||
2
vendor/k8s.io/apiserver/pkg/server/storage/storage_factory.go
generated
vendored
2
vendor/k8s.io/apiserver/pkg/server/storage/storage_factory.go
generated
vendored
@ -245,7 +245,7 @@ func (s *DefaultStorageFactory) NewConfig(groupResource schema.GroupResource, ex
|
||||
|
||||
var err error
|
||||
if backwardCompatibleInterface, ok := s.ResourceEncodingConfig.(CompatibilityResourceEncodingConfig); ok {
|
||||
codecConfig.StorageVersion, err = backwardCompatibleInterface.BackwardCompatibileStorageEncodingFor(groupResource, example)
|
||||
codecConfig.StorageVersion, err = backwardCompatibleInterface.BackwardCompatibileStorageEncodingFor(chosenStorageResource, example)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
82
vendor/modules.txt
vendored
82
vendor/modules.txt
vendored
@ -958,7 +958,7 @@ gopkg.in/yaml.v2
|
||||
# gopkg.in/yaml.v3 v3.0.1
|
||||
## explicit
|
||||
gopkg.in/yaml.v3
|
||||
# k8s.io/api v0.31.2 => k8s.io/api v0.31.1
|
||||
# k8s.io/api v0.31.3 => k8s.io/api v0.31.3
|
||||
## explicit; go 1.22.0
|
||||
k8s.io/api/admission/v1
|
||||
k8s.io/api/admission/v1beta1
|
||||
@ -1018,12 +1018,12 @@ k8s.io/api/storage/v1
|
||||
k8s.io/api/storage/v1alpha1
|
||||
k8s.io/api/storage/v1beta1
|
||||
k8s.io/api/storagemigration/v1alpha1
|
||||
# k8s.io/apiextensions-apiserver v0.31.1 => k8s.io/apiextensions-apiserver v0.31.1
|
||||
# k8s.io/apiextensions-apiserver v0.31.1 => k8s.io/apiextensions-apiserver v0.31.3
|
||||
## explicit; go 1.22.0
|
||||
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
|
||||
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
|
||||
k8s.io/apiextensions-apiserver/pkg/features
|
||||
# k8s.io/apimachinery v0.31.2 => k8s.io/apimachinery v0.31.1
|
||||
# k8s.io/apimachinery v0.31.3 => k8s.io/apimachinery v0.31.3
|
||||
## explicit; go 1.22.0
|
||||
k8s.io/apimachinery/pkg/api/equality
|
||||
k8s.io/apimachinery/pkg/api/errors
|
||||
@ -1090,7 +1090,7 @@ k8s.io/apimachinery/pkg/watch
|
||||
k8s.io/apimachinery/third_party/forked/golang/json
|
||||
k8s.io/apimachinery/third_party/forked/golang/netutil
|
||||
k8s.io/apimachinery/third_party/forked/golang/reflect
|
||||
# k8s.io/apiserver v0.31.1 => k8s.io/apiserver v0.31.1
|
||||
# k8s.io/apiserver v0.31.3 => k8s.io/apiserver v0.31.3
|
||||
## explicit; go 1.22.0
|
||||
k8s.io/apiserver/pkg/admission
|
||||
k8s.io/apiserver/pkg/admission/configuration
|
||||
@ -1241,7 +1241,7 @@ k8s.io/apiserver/plugin/pkg/audit/webhook
|
||||
k8s.io/apiserver/plugin/pkg/authenticator/token/webhook
|
||||
k8s.io/apiserver/plugin/pkg/authorizer/webhook
|
||||
k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics
|
||||
# k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.31.1
|
||||
# k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.31.3
|
||||
## explicit; go 1.22.0
|
||||
k8s.io/client-go/applyconfigurations
|
||||
k8s.io/client-go/applyconfigurations/admissionregistration/v1
|
||||
@ -1586,7 +1586,7 @@ k8s.io/client-go/util/keyutil
|
||||
k8s.io/client-go/util/retry
|
||||
k8s.io/client-go/util/watchlist
|
||||
k8s.io/client-go/util/workqueue
|
||||
# k8s.io/cloud-provider v0.31.1 => k8s.io/cloud-provider v0.31.1
|
||||
# k8s.io/cloud-provider v0.31.3 => k8s.io/cloud-provider v0.31.3
|
||||
## explicit; go 1.22.0
|
||||
k8s.io/cloud-provider
|
||||
k8s.io/cloud-provider/app/config
|
||||
@ -1601,7 +1601,7 @@ k8s.io/cloud-provider/names
|
||||
k8s.io/cloud-provider/options
|
||||
k8s.io/cloud-provider/volume
|
||||
k8s.io/cloud-provider/volume/helpers
|
||||
# k8s.io/component-base v0.31.1 => k8s.io/component-base v0.31.1
|
||||
# k8s.io/component-base v0.31.3 => k8s.io/component-base v0.31.3
|
||||
## explicit; go 1.22.0
|
||||
k8s.io/component-base/cli/flag
|
||||
k8s.io/component-base/config
|
||||
@ -1624,12 +1624,12 @@ k8s.io/component-base/metrics/testutil
|
||||
k8s.io/component-base/tracing
|
||||
k8s.io/component-base/tracing/api/v1
|
||||
k8s.io/component-base/version
|
||||
# k8s.io/component-helpers v0.31.1 => k8s.io/component-helpers v0.31.1
|
||||
# k8s.io/component-helpers v0.31.3 => k8s.io/component-helpers v0.31.3
|
||||
## explicit; go 1.22.0
|
||||
k8s.io/component-helpers/node/util/sysctl
|
||||
k8s.io/component-helpers/scheduling/corev1
|
||||
k8s.io/component-helpers/scheduling/corev1/nodeaffinity
|
||||
# k8s.io/controller-manager v0.31.1 => k8s.io/controller-manager v0.31.1
|
||||
# k8s.io/controller-manager v0.31.3 => k8s.io/controller-manager v0.31.3
|
||||
## explicit; go 1.22.0
|
||||
k8s.io/controller-manager/config
|
||||
k8s.io/controller-manager/config/v1
|
||||
@ -1652,7 +1652,7 @@ k8s.io/klog/v2/internal/severity
|
||||
k8s.io/klog/v2/internal/sloghandler
|
||||
k8s.io/klog/v2/internal/verbosity
|
||||
k8s.io/klog/v2/textlogger
|
||||
# k8s.io/kms v0.31.1
|
||||
# k8s.io/kms v0.31.3
|
||||
## explicit; go 1.22.0
|
||||
k8s.io/kms/apis/v1beta1
|
||||
k8s.io/kms/apis/v2
|
||||
@ -1679,11 +1679,11 @@ k8s.io/kube-openapi/pkg/validation/errors
|
||||
k8s.io/kube-openapi/pkg/validation/spec
|
||||
k8s.io/kube-openapi/pkg/validation/strfmt
|
||||
k8s.io/kube-openapi/pkg/validation/strfmt/bson
|
||||
# k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.31.1
|
||||
# k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.31.3
|
||||
## explicit; go 1.22.0
|
||||
k8s.io/kubectl/pkg/scale
|
||||
k8s.io/kubectl/pkg/util/podutils
|
||||
# k8s.io/kubelet v0.0.0 => k8s.io/kubelet v0.31.1
|
||||
# k8s.io/kubelet v0.0.0 => k8s.io/kubelet v0.31.3
|
||||
## explicit; go 1.22.0
|
||||
k8s.io/kubelet/pkg/apis
|
||||
k8s.io/kubelet/pkg/apis/stats/v1alpha1
|
||||
@ -1752,10 +1752,10 @@ k8s.io/kubernetes/test/utils
|
||||
k8s.io/kubernetes/test/utils/format
|
||||
k8s.io/kubernetes/test/utils/image
|
||||
k8s.io/kubernetes/test/utils/kubeconfig
|
||||
# k8s.io/mount-utils v0.31.1 => k8s.io/mount-utils v0.29.3
|
||||
# k8s.io/mount-utils v0.31.3 => k8s.io/mount-utils v0.29.3
|
||||
## explicit; go 1.21
|
||||
k8s.io/mount-utils
|
||||
# k8s.io/pod-security-admission v0.31.1 => k8s.io/pod-security-admission v0.31.1
|
||||
# k8s.io/pod-security-admission v0.31.3 => k8s.io/pod-security-admission v0.31.3
|
||||
## explicit; go 1.22.0
|
||||
k8s.io/pod-security-admission/api
|
||||
k8s.io/pod-security-admission/policy
|
||||
@ -1841,32 +1841,32 @@ sigs.k8s.io/yaml/goyaml.v2
|
||||
# github.com/ceph/ceph-csi/api => ./api
|
||||
# github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3
|
||||
# gomodules.xyz/jsonpatch/v2 => github.com/gomodules/jsonpatch/v2 v2.2.0
|
||||
# k8s.io/api => k8s.io/api v0.31.1
|
||||
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.1
|
||||
# k8s.io/apimachinery => k8s.io/apimachinery v0.31.1
|
||||
# k8s.io/apiserver => k8s.io/apiserver v0.31.1
|
||||
# k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.1
|
||||
# k8s.io/client-go => k8s.io/client-go v0.31.1
|
||||
# k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.1
|
||||
# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.1
|
||||
# k8s.io/code-generator => k8s.io/code-generator v0.31.1
|
||||
# k8s.io/component-base => k8s.io/component-base v0.31.1
|
||||
# k8s.io/component-helpers => k8s.io/component-helpers v0.31.1
|
||||
# k8s.io/controller-manager => k8s.io/controller-manager v0.31.1
|
||||
# k8s.io/cri-api => k8s.io/cri-api v0.31.1
|
||||
# k8s.io/cri-client => k8s.io/cri-client v0.31.1
|
||||
# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.1
|
||||
# k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.1
|
||||
# k8s.io/endpointslice => k8s.io/endpointslice v0.31.1
|
||||
# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.1
|
||||
# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.1
|
||||
# k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.1
|
||||
# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.1
|
||||
# k8s.io/kubectl => k8s.io/kubectl v0.31.1
|
||||
# k8s.io/kubelet => k8s.io/kubelet v0.31.1
|
||||
# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.1
|
||||
# k8s.io/metrics => k8s.io/metrics v0.31.1
|
||||
# k8s.io/api => k8s.io/api v0.31.3
|
||||
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.3
|
||||
# k8s.io/apimachinery => k8s.io/apimachinery v0.31.3
|
||||
# k8s.io/apiserver => k8s.io/apiserver v0.31.3
|
||||
# k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.3
|
||||
# k8s.io/client-go => k8s.io/client-go v0.31.3
|
||||
# k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.3
|
||||
# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.3
|
||||
# k8s.io/code-generator => k8s.io/code-generator v0.31.3
|
||||
# k8s.io/component-base => k8s.io/component-base v0.31.3
|
||||
# k8s.io/component-helpers => k8s.io/component-helpers v0.31.3
|
||||
# k8s.io/controller-manager => k8s.io/controller-manager v0.31.3
|
||||
# k8s.io/cri-api => k8s.io/cri-api v0.31.3
|
||||
# k8s.io/cri-client => k8s.io/cri-client v0.31.3
|
||||
# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.3
|
||||
# k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.3
|
||||
# k8s.io/endpointslice => k8s.io/endpointslice v0.31.3
|
||||
# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.3
|
||||
# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.3
|
||||
# k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.3
|
||||
# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.3
|
||||
# k8s.io/kubectl => k8s.io/kubectl v0.31.3
|
||||
# k8s.io/kubelet => k8s.io/kubelet v0.31.3
|
||||
# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.3
|
||||
# k8s.io/metrics => k8s.io/metrics v0.31.3
|
||||
# k8s.io/mount-utils => k8s.io/mount-utils v0.29.3
|
||||
# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.1
|
||||
# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.1
|
||||
# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.3
|
||||
# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.3
|
||||
# layeh.com/radius => github.com/layeh/radius v0.0.0-20190322222518-890bc1058917
|
||||
|
||||
Loading…
Reference in New Issue
Block a user