mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-26 08:10:20 +00:00
rebase: bump k8s.io/kubernetes from 1.23.1 to 1.23.2
Bumps [k8s.io/kubernetes](https://github.com/kubernetes/kubernetes) from 1.23.1 to 1.23.2. - [Release notes](https://github.com/kubernetes/kubernetes/releases) - [Commits](https://github.com/kubernetes/kubernetes/compare/v1.23.1...v1.23.2) --- updated-dependencies: - dependency-name: k8s.io/kubernetes dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
dependabot[bot]
mergify[bot]
parent
3a445cfc36
commit
901a1368ab
70
go.mod
70
go.mod
@ -26,16 +26,16 @@ require (
|
|||||||
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9
|
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9
|
||||||
google.golang.org/grpc v1.43.0
|
google.golang.org/grpc v1.43.0
|
||||||
google.golang.org/protobuf v1.27.1
|
google.golang.org/protobuf v1.27.1
|
||||||
k8s.io/api v0.23.0
|
k8s.io/api v0.23.2
|
||||||
k8s.io/apimachinery v0.23.0
|
k8s.io/apimachinery v0.23.2
|
||||||
k8s.io/client-go v12.0.0+incompatible
|
k8s.io/client-go v12.0.0+incompatible
|
||||||
k8s.io/cloud-provider v0.23.0
|
k8s.io/cloud-provider v0.23.2
|
||||||
k8s.io/klog/v2 v2.40.1
|
k8s.io/klog/v2 v2.40.1
|
||||||
//
|
//
|
||||||
// when updating k8s.io/kubernetes, make sure to update the replace section too
|
// when updating k8s.io/kubernetes, make sure to update the replace section too
|
||||||
//
|
//
|
||||||
k8s.io/kubernetes v1.23.1
|
k8s.io/kubernetes v1.23.2
|
||||||
k8s.io/mount-utils v0.23.0
|
k8s.io/mount-utils v0.23.2
|
||||||
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
|
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
|
||||||
sigs.k8s.io/controller-runtime v0.11.0-beta.0.0.20211208212546-f236f0345ad2
|
sigs.k8s.io/controller-runtime v0.11.0-beta.0.0.20211208212546-f236f0345ad2
|
||||||
)
|
)
|
||||||
@ -139,15 +139,15 @@ require (
|
|||||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
|
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
|
||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
|
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
|
||||||
k8s.io/apiserver v0.23.0 // indirect
|
k8s.io/apiserver v0.23.2 // indirect
|
||||||
k8s.io/component-base v0.23.0 // indirect
|
k8s.io/component-base v0.23.2 // indirect
|
||||||
k8s.io/component-helpers v0.23.0 // indirect
|
k8s.io/component-helpers v0.23.2 // indirect
|
||||||
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
|
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
|
||||||
k8s.io/kubectl v0.0.0 // indirect
|
k8s.io/kubectl v0.0.0 // indirect
|
||||||
k8s.io/kubelet v0.0.0 // indirect
|
k8s.io/kubelet v0.0.0 // indirect
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25 // indirect
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
|
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
|
||||||
sigs.k8s.io/yaml v1.3.0 // indirect
|
sigs.k8s.io/yaml v1.3.0 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -160,31 +160,31 @@ replace (
|
|||||||
//
|
//
|
||||||
// k8s.io/kubernetes depends on these k8s.io packages, but unversioned
|
// k8s.io/kubernetes depends on these k8s.io packages, but unversioned
|
||||||
//
|
//
|
||||||
k8s.io/api => k8s.io/api v0.23.0
|
k8s.io/api => k8s.io/api v0.23.2
|
||||||
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.0
|
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.2
|
||||||
k8s.io/apimachinery => k8s.io/apimachinery v0.23.0
|
k8s.io/apimachinery => k8s.io/apimachinery v0.23.2
|
||||||
k8s.io/apiserver => k8s.io/apiserver v0.23.0
|
k8s.io/apiserver => k8s.io/apiserver v0.23.2
|
||||||
k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.0
|
k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.2
|
||||||
k8s.io/client-go => k8s.io/client-go v0.23.0
|
k8s.io/client-go => k8s.io/client-go v0.23.2
|
||||||
k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.0
|
k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.2
|
||||||
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.0
|
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.2
|
||||||
k8s.io/code-generator => k8s.io/code-generator v0.23.0
|
k8s.io/code-generator => k8s.io/code-generator v0.23.2
|
||||||
k8s.io/component-base => k8s.io/component-base v0.23.0
|
k8s.io/component-base => k8s.io/component-base v0.23.2
|
||||||
k8s.io/component-helpers => k8s.io/component-helpers v0.23.0
|
k8s.io/component-helpers => k8s.io/component-helpers v0.23.2
|
||||||
k8s.io/controller-manager => k8s.io/controller-manager v0.23.0
|
k8s.io/controller-manager => k8s.io/controller-manager v0.23.2
|
||||||
k8s.io/cri-api => k8s.io/cri-api v0.23.0
|
k8s.io/cri-api => k8s.io/cri-api v0.23.2
|
||||||
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.0
|
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.2
|
||||||
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.0
|
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.2
|
||||||
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.0
|
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.2
|
||||||
k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.0
|
k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.2
|
||||||
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.0
|
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.2
|
||||||
k8s.io/kubectl => k8s.io/kubectl v0.23.0
|
k8s.io/kubectl => k8s.io/kubectl v0.23.2
|
||||||
k8s.io/kubelet => k8s.io/kubelet v0.23.0
|
k8s.io/kubelet => k8s.io/kubelet v0.23.2
|
||||||
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.0
|
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.2
|
||||||
k8s.io/metrics => k8s.io/metrics v0.23.0
|
k8s.io/metrics => k8s.io/metrics v0.23.2
|
||||||
k8s.io/mount-utils => k8s.io/mount-utils v0.23.0
|
k8s.io/mount-utils => k8s.io/mount-utils v0.23.2
|
||||||
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.0
|
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.2
|
||||||
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.0
|
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.2
|
||||||
// layeh.com seems to be misbehaving
|
// layeh.com seems to be misbehaving
|
||||||
layeh.com/radius => github.com/layeh/radius v0.0.0-20190322222518-890bc1058917
|
layeh.com/radius => github.com/layeh/radius v0.0.0-20190322222518-890bc1058917
|
||||||
)
|
)
|
||||||
|
|||||||
85
go.sum
85
go.sum
@ -1615,7 +1615,6 @@ google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K
|
|||||||
google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
|
google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
|
||||||
google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM=
|
google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM=
|
||||||
google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
|
google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
|
||||||
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
|
|
||||||
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||||
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||||
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||||
@ -1685,28 +1684,28 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
|
|||||||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
||||||
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.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.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||||
k8s.io/api v0.23.0 h1:WrL1gb73VSC8obi8cuYETJGXEoFNEh3LU0Pt+Sokgro=
|
k8s.io/api v0.23.2 h1:62cpzreV3dCuj0hqPi8r4dyWh48ogMcyh+ga9jEGij4=
|
||||||
k8s.io/api v0.23.0/go.mod h1:8wmDdLBHBNxtOIytwLstXt5E9PddnZb0GaMcqsvDBpg=
|
k8s.io/api v0.23.2/go.mod h1:sYuDb3flCtRPI8ghn6qFrcK5ZBu2mhbElxRE95qpwlI=
|
||||||
k8s.io/apiextensions-apiserver v0.23.0 h1:uii8BYmHYiT2ZTAJxmvc3X8UhNYMxl2A0z0Xq3Pm+WY=
|
k8s.io/apiextensions-apiserver v0.23.2 h1:N6CIVAhmF0ahgFKUMDdV/AUyckhUb4nIyVPohPtdUPk=
|
||||||
k8s.io/apiextensions-apiserver v0.23.0/go.mod h1:xIFAEEDlAZgpVBl/1VSjGDmLoXAWRG40+GsWhKhAxY4=
|
k8s.io/apiextensions-apiserver v0.23.2/go.mod h1:9cs7avT6+GfzbB0pambTvH11wcaR85QQg4ovl9s15UU=
|
||||||
k8s.io/apimachinery v0.23.0 h1:mIfWRMjBuMdolAWJ3Fd+aPTMv3X9z+waiARMpvvb0HQ=
|
k8s.io/apimachinery v0.23.2 h1:dBmjCOeYBdg2ibcQxMuUq+OopZ9fjfLIR5taP/XKeTs=
|
||||||
k8s.io/apimachinery v0.23.0/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc=
|
k8s.io/apimachinery v0.23.2/go.mod h1:zDqeV0AK62LbCI0CI7KbWCAYdLg+E+8UXJ0rIz5gmS8=
|
||||||
k8s.io/apiserver v0.23.0 h1:Ds/QveXWi9aJ8ISB0CJa4zBNc5njxAs5u3rmMIexqCY=
|
k8s.io/apiserver v0.23.2 h1:vGFCojjwSLyunapA7FWuzyekml/s0nAsoh4iBpzWzOs=
|
||||||
k8s.io/apiserver v0.23.0/go.mod h1:Cec35u/9zAepDPPFyT+UMrgqOCjgJ5qtfVJDxjZYmt4=
|
k8s.io/apiserver v0.23.2/go.mod h1:Kdt8gafkPev9Gfh+H6lCPbmRu42f7BfhOfHKKa3dtyU=
|
||||||
k8s.io/cli-runtime v0.23.0/go.mod h1:B5N3YH0KP1iKr6gEuJ/RRmGjO0mJQ/f/JrsmEiPQAlU=
|
k8s.io/cli-runtime v0.23.2/go.mod h1:Ag70akCDvwux4HxY+nH2J3UqE2e6iwSSdG1HE6p1VTU=
|
||||||
k8s.io/client-go v0.23.0 h1:vcsOqyPq7XV3QmQRCBH/t9BICJM9Q1M18qahjv+rebY=
|
k8s.io/client-go v0.23.2 h1:BNbOcxa99jxHH8mM1cPKGIrrKRnCSAfAtyonYGsbFtE=
|
||||||
k8s.io/client-go v0.23.0/go.mod h1:hrDnpnK1mSr65lHHcUuIZIXDgEbzc7/683c6hyG4jTA=
|
k8s.io/client-go v0.23.2/go.mod h1:k3YbsWg6GWdHF1THHTQP88X9RhB1DWPo3Dq7KfU/D1c=
|
||||||
k8s.io/cloud-provider v0.23.0 h1:9LATZJu57XanN7po4Xfj6jTLp44uhKiu5Xa3+3Cutz0=
|
k8s.io/cloud-provider v0.23.2 h1:bXZWXLjtzz2EMaPWIOwqS18XHYTMZSTDYHR48Ibrxz8=
|
||||||
k8s.io/cloud-provider v0.23.0/go.mod h1:vY9zulPUCjwCg9TBMh5Qi42JUZUNecQNF7FojNELWws=
|
k8s.io/cloud-provider v0.23.2/go.mod h1:ZJO37TsfHzOz+uQqxnnaR4S94ac9chjar8uHP+kUu2w=
|
||||||
k8s.io/cluster-bootstrap v0.23.0/go.mod h1:VltEnKWfrRTiKgOXp3ts3vh7yqNlH6KFKFflo9GtCBg=
|
k8s.io/cluster-bootstrap v0.23.2/go.mod h1:KSwHnKiP0O5VSkhXLpdNTiTga9/Yyb2/w7g1V1ZcXUk=
|
||||||
k8s.io/code-generator v0.23.0/go.mod h1:vQvOhDXhuzqiVfM/YHp+dmg10WDZCchJVObc9MvowsE=
|
k8s.io/code-generator v0.23.2/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk=
|
||||||
k8s.io/component-base v0.23.0 h1:UAnyzjvVZ2ZR1lF35YwtNY6VMN94WtOnArcXBu34es8=
|
k8s.io/component-base v0.23.2 h1:dAYmUhWIBWO762etTjBEEKtYYHi5CoQInSLtK6LM1Zs=
|
||||||
k8s.io/component-base v0.23.0/go.mod h1:DHH5uiFvLC1edCpvcTDV++NKULdYYU6pR9Tt3HIKMKI=
|
k8s.io/component-base v0.23.2/go.mod h1:wS9Z03MO3oJ0RU8bB/dbXTiluGju+SC/F5i660gxB8c=
|
||||||
k8s.io/component-helpers v0.23.0 h1:qNbqN10QTefiWcCOPkHL/0nn81sdKVv6ZgEXcSyot/U=
|
k8s.io/component-helpers v0.23.2 h1:R1PaugmLBCMpc7+srxGL8DsH1NEo/KUSJPY62LVH8CU=
|
||||||
k8s.io/component-helpers v0.23.0/go.mod h1:liXMh6FZS4qamKtMJQ7uLHnFe3tlC86RX5mJEk/aerg=
|
k8s.io/component-helpers v0.23.2/go.mod h1:J6CMwiaf0izLoNwiLl2OymB4+rGTsTpWp6PL/AqOM4U=
|
||||||
k8s.io/controller-manager v0.23.0/go.mod h1:6/IKItSv6p9FY3mSbHgsOYmt4y+HDxiC5hEFg9rJVc8=
|
k8s.io/controller-manager v0.23.2/go.mod h1:l4+ZujXlzNpY1E9TkwaCB6BncYKyq2jD8OW6m8x35B0=
|
||||||
k8s.io/cri-api v0.23.0/go.mod h1:2edENu3/mkyW3c6fVPPPaVGEFbLRacJizBbSp7ZOLOo=
|
k8s.io/cri-api v0.23.2/go.mod h1:REJE3PSU0h/LOV1APBrupxrEJqnoxZC8KWzkBUHwrK4=
|
||||||
k8s.io/csi-translation-lib v0.23.0/go.mod h1:ho0ljka+BEcdlvFrG08L8FpYi6QJeSGgQLWeVOAeeM8=
|
k8s.io/csi-translation-lib v0.23.2/go.mod h1:n3igp3ZXcg5XLwPjK03QTSWBIoksKo6oTKMdtRbVvx8=
|
||||||
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
||||||
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
|
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
|
||||||
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
|
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
|
||||||
@ -1719,26 +1718,26 @@ k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
|
|||||||
k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/klog/v2 v2.40.1 h1:P4RRucWk/lFOlDdkAr3mc7iWFkgKrZY9qZMAgek06S4=
|
k8s.io/klog/v2 v2.40.1 h1:P4RRucWk/lFOlDdkAr3mc7iWFkgKrZY9qZMAgek06S4=
|
||||||
k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-aggregator v0.23.0/go.mod h1:b1vpoaTWKZjCzvbe1KXFw3vPbISrghJsg7/RI8oZUME=
|
k8s.io/kube-aggregator v0.23.2/go.mod h1:hoxP4rZREnjCJmrb0pHFPqm7+pkxoFjh8IpXL7OBWRA=
|
||||||
k8s.io/kube-controller-manager v0.23.0/go.mod h1:iHapRJJBe+fWu6hG3ye43YMFEeZcnIlRxDUS72bwJoE=
|
k8s.io/kube-controller-manager v0.23.2/go.mod h1:vlHhiAlUMI4OMyu/qsmEKb+hklNOjj/ffh5dYufqfHk=
|
||||||
k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
|
k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
|
||||||
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
|
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
|
||||||
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4=
|
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4=
|
||||||
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk=
|
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk=
|
||||||
k8s.io/kube-proxy v0.23.0/go.mod h1:AFPfNIiOeDhHVtfN7ZfE1Wd8aP5qYov3khPu4VFeBb4=
|
k8s.io/kube-proxy v0.23.2/go.mod h1:doKBcqhM+EgvOo145oP02zP1Hk11jOSKK+FiAS5zdlo=
|
||||||
k8s.io/kube-scheduler v0.23.0/go.mod h1:BXDjbJEXtr9PU5/XzLtWMNG6Mid4GYBSGVWzP72UxKk=
|
k8s.io/kube-scheduler v0.23.2/go.mod h1:K70jKh9XukwUJNxXA6k+WJUAW9zZkGR3CGdUApZg0dc=
|
||||||
k8s.io/kubectl v0.23.0 h1:WABWfj+Z4tC3SfKBCtZr5sIVHsFtkU9Azii4DR9IT6Y=
|
k8s.io/kubectl v0.23.2 h1:YakGzFN1csIOW/Us5VsLxjcu5Q6Vh5rqcvukcNuBwFk=
|
||||||
k8s.io/kubectl v0.23.0/go.mod h1:TfcGEs3u4dkmoC2eku1GYymdGaMtPMcaLLFrX/RB2kI=
|
k8s.io/kubectl v0.23.2/go.mod h1:zWm5wt8PdRmHiVhE9a7q7XYW4WFX9StkZGnC18+1v3M=
|
||||||
k8s.io/kubelet v0.23.0 h1:hHdHe/Hp3R2HzxnYI8/f173gDUOTRYERd7S7+to9MZw=
|
k8s.io/kubelet v0.23.2 h1:hrixnMsh1yv7P/UZ/2QCBp7x6G4y3Fr5FiavF3a0MIw=
|
||||||
k8s.io/kubelet v0.23.0/go.mod h1:A4DxfIt5Ka+rz54HAFhs1bgiFjJT6lcaAYUcACZl1/k=
|
k8s.io/kubelet v0.23.2/go.mod h1:/Huumr8/3hz46AuMI64UBwns2t/dcogiR5XWF6yrHo0=
|
||||||
k8s.io/kubernetes v1.23.1 h1:iJfubd03CDap4m69Ue+u2I6quNUYiYlC8+TakEHATjc=
|
k8s.io/kubernetes v1.23.2 h1:Kp3cpKrv6VRQbaZoD6tVDjpKPIfNb5P34DLv7qQzf7U=
|
||||||
k8s.io/kubernetes v1.23.1/go.mod h1:baMGbPpwwP0kT/+eAPtdqoWNRoXyyTJ2Zf+fw/Y8t04=
|
k8s.io/kubernetes v1.23.2/go.mod h1:UNnyc4mwldo0ipufrTkGbL06VQRtN9w9mLLTZLh56+w=
|
||||||
k8s.io/legacy-cloud-providers v0.23.0/go.mod h1:tM5owPlhLyEYJC2FLHgcGu1jks5ANvH2JlY03mnUYU4=
|
k8s.io/legacy-cloud-providers v0.23.2/go.mod h1:b4r2DrP+PT0D4kxenynayJ7kJQLwzoVHh1Lqw3cozwE=
|
||||||
k8s.io/metrics v0.23.0/go.mod h1:NDiZTwppEtAuKJ1Rxt3S4dhyRzdp6yUcJf0vo023dPo=
|
k8s.io/metrics v0.23.2/go.mod h1:idJHc+lLK5teHUC6Z2+d6qTKA12d5FLDxmC/DHiUYKc=
|
||||||
k8s.io/mount-utils v0.23.0 h1:8sGMlbbQOA268SidZVoL7wOgEcbByoa6+bvFZCywhbg=
|
k8s.io/mount-utils v0.23.2 h1:f6jSJ8Z/tKTLOEzBzpxd+QKP6swdH9/Z0DTfMxlKnR0=
|
||||||
k8s.io/mount-utils v0.23.0/go.mod h1:9pFhzVjxle1osJUo++9MFDat9HPkQUOoHCn+eExZ3Ew=
|
k8s.io/mount-utils v0.23.2/go.mod h1:9pFhzVjxle1osJUo++9MFDat9HPkQUOoHCn+eExZ3Ew=
|
||||||
k8s.io/pod-security-admission v0.23.0/go.mod h1:vGExA081PHZFK9Yma4kuPtfWwy5zxbEUhniiUDKFicM=
|
k8s.io/pod-security-admission v0.23.2/go.mod h1:qbwG5XF7vHgTTk8XemjkR1GXAmyNHQQAo5bHWAJSskE=
|
||||||
k8s.io/sample-apiserver v0.23.0/go.mod h1:o0U/1hkfndbnLg1OfVHQiG08lmDkYJq7qljCuwjoTrI=
|
k8s.io/sample-apiserver v0.23.2/go.mod h1:E6yG+7Y6Y9ElyFOXUQb3CyO63FW20U0ut5fR4I8c70Y=
|
||||||
k8s.io/system-validators v1.6.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q=
|
k8s.io/system-validators v1.6.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q=
|
||||||
k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
|
k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
|
||||||
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
|
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
|
||||||
@ -1754,8 +1753,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
|
|||||||
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
|
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
|
||||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
||||||
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
|
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25 h1:DEQ12ZRxJjsglk5JIi5bLgpKaHihGervKmg5uryaEHw=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27 h1:KQOkVzXrLNb0EP6W0FD6u3CCPAwgXFYwZitbj7K0P0Y=
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27/go.mod h1:tq2nT0Kx7W+/f2JVE+zxYtUhdjuELJkVpNz+x/QN5R4=
|
||||||
sigs.k8s.io/controller-runtime v0.2.2/go.mod h1:9dyohw3ZtoXQuV1e766PHUn+cmrRCIcBh6XIMFNMZ+I=
|
sigs.k8s.io/controller-runtime v0.2.2/go.mod h1:9dyohw3ZtoXQuV1e766PHUn+cmrRCIcBh6XIMFNMZ+I=
|
||||||
sigs.k8s.io/controller-runtime v0.11.0-beta.0.0.20211208212546-f236f0345ad2 h1:+ReKrjTrd57mtAU19BJkxSAaWRIQkFlaWcO6dGFVP1g=
|
sigs.k8s.io/controller-runtime v0.11.0-beta.0.0.20211208212546-f236f0345ad2 h1:+ReKrjTrd57mtAU19BJkxSAaWRIQkFlaWcO6dGFVP1g=
|
||||||
sigs.k8s.io/controller-runtime v0.11.0-beta.0.0.20211208212546-f236f0345ad2/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA=
|
sigs.k8s.io/controller-runtime v0.11.0-beta.0.0.20211208212546-f236f0345ad2/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA=
|
||||||
@ -1766,9 +1765,9 @@ sigs.k8s.io/kustomize/cmd/config v0.10.2/go.mod h1:K2aW7nXJ0AaT+VA/eO0/dzFLxmpFc
|
|||||||
sigs.k8s.io/kustomize/kustomize/v4 v4.4.1/go.mod h1:qOKJMMz2mBP+vcS7vK+mNz4HBLjaQSWRY22EF6Tb7Io=
|
sigs.k8s.io/kustomize/kustomize/v4 v4.4.1/go.mod h1:qOKJMMz2mBP+vcS7vK+mNz4HBLjaQSWRY22EF6Tb7Io=
|
||||||
sigs.k8s.io/kustomize/kyaml v0.13.0/go.mod h1:FTJxEZ86ScK184NpGSAQcfEqee0nul8oLCK30D47m4E=
|
sigs.k8s.io/kustomize/kyaml v0.13.0/go.mod h1:FTJxEZ86ScK184NpGSAQcfEqee0nul8oLCK30D47m4E=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
|
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
|
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 h1:kDvPBbnPk+qYmkHmSo8vKGp438IASWofnbbUKDE/bv0=
|
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.0/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.0/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
|
||||||
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y=
|
||||||
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
|
||||||
sigs.k8s.io/testing_frameworks v0.1.1/go.mod h1:VVBKrHmJ6Ekkfz284YKhQePcdycOzNH9qL6ht1zEr/U=
|
sigs.k8s.io/testing_frameworks v0.1.1/go.mod h1:VVBKrHmJ6Ekkfz284YKhQePcdycOzNH9qL6ht1zEr/U=
|
||||||
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
|
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
|
||||||
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
||||||
|
|||||||
2
vendor/k8s.io/api/autoscaling/v2beta1/types.go
generated
vendored
2
vendor/k8s.io/api/autoscaling/v2beta1/types.go
generated
vendored
@ -449,7 +449,7 @@ type ExternalMetricStatus struct {
|
|||||||
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
||||||
// +k8s:prerelease-lifecycle-gen:introduced=1.8
|
// +k8s:prerelease-lifecycle-gen:introduced=1.8
|
||||||
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
|
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
|
||||||
// +k8s:prerelease-lifecycle-gen:replacement=autoscaling,v2beta2,HorizontalPodAutoscaler
|
// +k8s:prerelease-lifecycle-gen:replacement=autoscaling,v2,HorizontalPodAutoscaler
|
||||||
|
|
||||||
// HorizontalPodAutoscaler is the configuration for a horizontal pod
|
// HorizontalPodAutoscaler is the configuration for a horizontal pod
|
||||||
// autoscaler, which automatically manages the replica count of any resource
|
// autoscaler, which automatically manages the replica count of any resource
|
||||||
|
|||||||
2
vendor/k8s.io/api/autoscaling/v2beta1/zz_generated.prerelease-lifecycle.go
generated
vendored
2
vendor/k8s.io/api/autoscaling/v2beta1/zz_generated.prerelease-lifecycle.go
generated
vendored
@ -40,7 +40,7 @@ func (in *HorizontalPodAutoscaler) APILifecycleDeprecated() (major, minor int) {
|
|||||||
// APILifecycleReplacement is an autogenerated function, returning the group, version, and kind that should be used instead of this deprecated type.
|
// APILifecycleReplacement is an autogenerated function, returning the group, version, and kind that should be used instead of this deprecated type.
|
||||||
// It is controlled by "k8s:prerelease-lifecycle-gen:replacement=<group>,<version>,<kind>" tags in types.go.
|
// It is controlled by "k8s:prerelease-lifecycle-gen:replacement=<group>,<version>,<kind>" tags in types.go.
|
||||||
func (in *HorizontalPodAutoscaler) APILifecycleReplacement() schema.GroupVersionKind {
|
func (in *HorizontalPodAutoscaler) APILifecycleReplacement() schema.GroupVersionKind {
|
||||||
return schema.GroupVersionKind{Group: "autoscaling", Version: "v2beta2", Kind: "HorizontalPodAutoscaler"}
|
return schema.GroupVersionKind{Group: "autoscaling", Version: "v2", Kind: "HorizontalPodAutoscaler"}
|
||||||
}
|
}
|
||||||
|
|
||||||
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
||||||
|
|||||||
1
vendor/k8s.io/api/autoscaling/v2beta2/types.go
generated
vendored
1
vendor/k8s.io/api/autoscaling/v2beta2/types.go
generated
vendored
@ -28,6 +28,7 @@ import (
|
|||||||
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
||||||
// +k8s:prerelease-lifecycle-gen:introduced=1.12
|
// +k8s:prerelease-lifecycle-gen:introduced=1.12
|
||||||
// +k8s:prerelease-lifecycle-gen:deprecated=1.23
|
// +k8s:prerelease-lifecycle-gen:deprecated=1.23
|
||||||
|
// +k8s:prerelease-lifecycle-gen:replacement=autoscaling,v2,HorizontalPodAutoscaler
|
||||||
|
|
||||||
// HorizontalPodAutoscaler is the configuration for a horizontal pod
|
// HorizontalPodAutoscaler is the configuration for a horizontal pod
|
||||||
// autoscaler, which automatically manages the replica count of any resource
|
// autoscaler, which automatically manages the replica count of any resource
|
||||||
|
|||||||
10
vendor/k8s.io/api/autoscaling/v2beta2/zz_generated.prerelease-lifecycle.go
generated
vendored
10
vendor/k8s.io/api/autoscaling/v2beta2/zz_generated.prerelease-lifecycle.go
generated
vendored
@ -21,6 +21,10 @@ limitations under the License.
|
|||||||
|
|
||||||
package v2beta2
|
package v2beta2
|
||||||
|
|
||||||
|
import (
|
||||||
|
schema "k8s.io/apimachinery/pkg/runtime/schema"
|
||||||
|
)
|
||||||
|
|
||||||
// APILifecycleIntroduced is an autogenerated function, returning the release in which the API struct was introduced as int versions of major and minor for comparison.
|
// APILifecycleIntroduced is an autogenerated function, returning the release in which the API struct was introduced as int versions of major and minor for comparison.
|
||||||
// It is controlled by "k8s:prerelease-lifecycle-gen:introduced" tags in types.go.
|
// It is controlled by "k8s:prerelease-lifecycle-gen:introduced" tags in types.go.
|
||||||
func (in *HorizontalPodAutoscaler) APILifecycleIntroduced() (major, minor int) {
|
func (in *HorizontalPodAutoscaler) APILifecycleIntroduced() (major, minor int) {
|
||||||
@ -33,6 +37,12 @@ func (in *HorizontalPodAutoscaler) APILifecycleDeprecated() (major, minor int) {
|
|||||||
return 1, 23
|
return 1, 23
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// APILifecycleReplacement is an autogenerated function, returning the group, version, and kind that should be used instead of this deprecated type.
|
||||||
|
// It is controlled by "k8s:prerelease-lifecycle-gen:replacement=<group>,<version>,<kind>" tags in types.go.
|
||||||
|
func (in *HorizontalPodAutoscaler) APILifecycleReplacement() schema.GroupVersionKind {
|
||||||
|
return schema.GroupVersionKind{Group: "autoscaling", Version: "v2", Kind: "HorizontalPodAutoscaler"}
|
||||||
|
}
|
||||||
|
|
||||||
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
||||||
// It is controlled by "k8s:prerelease-lifecycle-gen:removed" tags in types.go or "k8s:prerelease-lifecycle-gen:deprecated" plus three minor.
|
// It is controlled by "k8s:prerelease-lifecycle-gen:removed" tags in types.go or "k8s:prerelease-lifecycle-gen:deprecated" plus three minor.
|
||||||
func (in *HorizontalPodAutoscaler) APILifecycleRemoved() (major, minor int) {
|
func (in *HorizontalPodAutoscaler) APILifecycleRemoved() (major, minor int) {
|
||||||
|
|||||||
8
vendor/k8s.io/api/flowcontrol/v1alpha1/types.go
generated
vendored
8
vendor/k8s.io/api/flowcontrol/v1alpha1/types.go
generated
vendored
@ -63,7 +63,7 @@ const (
|
|||||||
// +k8s:prerelease-lifecycle-gen:introduced=1.18
|
// +k8s:prerelease-lifecycle-gen:introduced=1.18
|
||||||
// +k8s:prerelease-lifecycle-gen:deprecated=1.20
|
// +k8s:prerelease-lifecycle-gen:deprecated=1.20
|
||||||
// +k8s:prerelease-lifecycle-gen:removed=1.21
|
// +k8s:prerelease-lifecycle-gen:removed=1.21
|
||||||
// +k8s:prerelease-lifecycle-gen:replacement=flowcontrol.apiserver.k8s.io,v1beta1,FlowSchema
|
// +k8s:prerelease-lifecycle-gen:replacement=flowcontrol.apiserver.k8s.io,v1beta2,FlowSchema
|
||||||
|
|
||||||
// FlowSchema defines the schema of a group of flows. Note that a flow is made up of a set of inbound API requests with
|
// FlowSchema defines the schema of a group of flows. Note that a flow is made up of a set of inbound API requests with
|
||||||
// similar attributes and is identified by a pair of strings: the name of the FlowSchema and a "flow distinguisher".
|
// similar attributes and is identified by a pair of strings: the name of the FlowSchema and a "flow distinguisher".
|
||||||
@ -87,7 +87,7 @@ type FlowSchema struct {
|
|||||||
// +k8s:prerelease-lifecycle-gen:introduced=1.18
|
// +k8s:prerelease-lifecycle-gen:introduced=1.18
|
||||||
// +k8s:prerelease-lifecycle-gen:deprecated=1.20
|
// +k8s:prerelease-lifecycle-gen:deprecated=1.20
|
||||||
// +k8s:prerelease-lifecycle-gen:removed=1.21
|
// +k8s:prerelease-lifecycle-gen:removed=1.21
|
||||||
// +k8s:prerelease-lifecycle-gen:replacement=flowcontrol.apiserver.k8s.io,v1beta1,FlowSchemaList
|
// +k8s:prerelease-lifecycle-gen:replacement=flowcontrol.apiserver.k8s.io,v1beta2,FlowSchemaList
|
||||||
|
|
||||||
// FlowSchemaList is a list of FlowSchema objects.
|
// FlowSchemaList is a list of FlowSchema objects.
|
||||||
type FlowSchemaList struct {
|
type FlowSchemaList struct {
|
||||||
@ -344,7 +344,7 @@ type FlowSchemaConditionType string
|
|||||||
// +k8s:prerelease-lifecycle-gen:introduced=1.18
|
// +k8s:prerelease-lifecycle-gen:introduced=1.18
|
||||||
// +k8s:prerelease-lifecycle-gen:deprecated=1.20
|
// +k8s:prerelease-lifecycle-gen:deprecated=1.20
|
||||||
// +k8s:prerelease-lifecycle-gen:removed=1.21
|
// +k8s:prerelease-lifecycle-gen:removed=1.21
|
||||||
// +k8s:prerelease-lifecycle-gen:replacement=flowcontrol.apiserver.k8s.io,v1beta1,PriorityLevelConfiguration
|
// +k8s:prerelease-lifecycle-gen:replacement=flowcontrol.apiserver.k8s.io,v1beta2,PriorityLevelConfiguration
|
||||||
|
|
||||||
// PriorityLevelConfiguration represents the configuration of a priority level.
|
// PriorityLevelConfiguration represents the configuration of a priority level.
|
||||||
type PriorityLevelConfiguration struct {
|
type PriorityLevelConfiguration struct {
|
||||||
@ -367,7 +367,7 @@ type PriorityLevelConfiguration struct {
|
|||||||
// +k8s:prerelease-lifecycle-gen:introduced=1.18
|
// +k8s:prerelease-lifecycle-gen:introduced=1.18
|
||||||
// +k8s:prerelease-lifecycle-gen:deprecated=1.20
|
// +k8s:prerelease-lifecycle-gen:deprecated=1.20
|
||||||
// +k8s:prerelease-lifecycle-gen:removed=1.21
|
// +k8s:prerelease-lifecycle-gen:removed=1.21
|
||||||
// +k8s:prerelease-lifecycle-gen:replacement=flowcontrol.apiserver.k8s.io,v1beta1,PriorityLevelConfigurationList
|
// +k8s:prerelease-lifecycle-gen:replacement=flowcontrol.apiserver.k8s.io,v1beta2,PriorityLevelConfigurationList
|
||||||
|
|
||||||
// PriorityLevelConfigurationList is a list of PriorityLevelConfiguration objects.
|
// PriorityLevelConfigurationList is a list of PriorityLevelConfiguration objects.
|
||||||
type PriorityLevelConfigurationList struct {
|
type PriorityLevelConfigurationList struct {
|
||||||
|
|||||||
8
vendor/k8s.io/api/flowcontrol/v1alpha1/zz_generated.prerelease-lifecycle.go
generated
vendored
8
vendor/k8s.io/api/flowcontrol/v1alpha1/zz_generated.prerelease-lifecycle.go
generated
vendored
@ -40,7 +40,7 @@ func (in *FlowSchema) APILifecycleDeprecated() (major, minor int) {
|
|||||||
// APILifecycleReplacement is an autogenerated function, returning the group, version, and kind that should be used instead of this deprecated type.
|
// APILifecycleReplacement is an autogenerated function, returning the group, version, and kind that should be used instead of this deprecated type.
|
||||||
// It is controlled by "k8s:prerelease-lifecycle-gen:replacement=<group>,<version>,<kind>" tags in types.go.
|
// It is controlled by "k8s:prerelease-lifecycle-gen:replacement=<group>,<version>,<kind>" tags in types.go.
|
||||||
func (in *FlowSchema) APILifecycleReplacement() schema.GroupVersionKind {
|
func (in *FlowSchema) APILifecycleReplacement() schema.GroupVersionKind {
|
||||||
return schema.GroupVersionKind{Group: "flowcontrol.apiserver.k8s.io", Version: "v1beta1", Kind: "FlowSchema"}
|
return schema.GroupVersionKind{Group: "flowcontrol.apiserver.k8s.io", Version: "v1beta2", Kind: "FlowSchema"}
|
||||||
}
|
}
|
||||||
|
|
||||||
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
||||||
@ -64,7 +64,7 @@ func (in *FlowSchemaList) APILifecycleDeprecated() (major, minor int) {
|
|||||||
// APILifecycleReplacement is an autogenerated function, returning the group, version, and kind that should be used instead of this deprecated type.
|
// APILifecycleReplacement is an autogenerated function, returning the group, version, and kind that should be used instead of this deprecated type.
|
||||||
// It is controlled by "k8s:prerelease-lifecycle-gen:replacement=<group>,<version>,<kind>" tags in types.go.
|
// It is controlled by "k8s:prerelease-lifecycle-gen:replacement=<group>,<version>,<kind>" tags in types.go.
|
||||||
func (in *FlowSchemaList) APILifecycleReplacement() schema.GroupVersionKind {
|
func (in *FlowSchemaList) APILifecycleReplacement() schema.GroupVersionKind {
|
||||||
return schema.GroupVersionKind{Group: "flowcontrol.apiserver.k8s.io", Version: "v1beta1", Kind: "FlowSchemaList"}
|
return schema.GroupVersionKind{Group: "flowcontrol.apiserver.k8s.io", Version: "v1beta2", Kind: "FlowSchemaList"}
|
||||||
}
|
}
|
||||||
|
|
||||||
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
||||||
@ -88,7 +88,7 @@ func (in *PriorityLevelConfiguration) APILifecycleDeprecated() (major, minor int
|
|||||||
// APILifecycleReplacement is an autogenerated function, returning the group, version, and kind that should be used instead of this deprecated type.
|
// APILifecycleReplacement is an autogenerated function, returning the group, version, and kind that should be used instead of this deprecated type.
|
||||||
// It is controlled by "k8s:prerelease-lifecycle-gen:replacement=<group>,<version>,<kind>" tags in types.go.
|
// It is controlled by "k8s:prerelease-lifecycle-gen:replacement=<group>,<version>,<kind>" tags in types.go.
|
||||||
func (in *PriorityLevelConfiguration) APILifecycleReplacement() schema.GroupVersionKind {
|
func (in *PriorityLevelConfiguration) APILifecycleReplacement() schema.GroupVersionKind {
|
||||||
return schema.GroupVersionKind{Group: "flowcontrol.apiserver.k8s.io", Version: "v1beta1", Kind: "PriorityLevelConfiguration"}
|
return schema.GroupVersionKind{Group: "flowcontrol.apiserver.k8s.io", Version: "v1beta2", Kind: "PriorityLevelConfiguration"}
|
||||||
}
|
}
|
||||||
|
|
||||||
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
||||||
@ -112,7 +112,7 @@ func (in *PriorityLevelConfigurationList) APILifecycleDeprecated() (major, minor
|
|||||||
// APILifecycleReplacement is an autogenerated function, returning the group, version, and kind that should be used instead of this deprecated type.
|
// APILifecycleReplacement is an autogenerated function, returning the group, version, and kind that should be used instead of this deprecated type.
|
||||||
// It is controlled by "k8s:prerelease-lifecycle-gen:replacement=<group>,<version>,<kind>" tags in types.go.
|
// It is controlled by "k8s:prerelease-lifecycle-gen:replacement=<group>,<version>,<kind>" tags in types.go.
|
||||||
func (in *PriorityLevelConfigurationList) APILifecycleReplacement() schema.GroupVersionKind {
|
func (in *PriorityLevelConfigurationList) APILifecycleReplacement() schema.GroupVersionKind {
|
||||||
return schema.GroupVersionKind{Group: "flowcontrol.apiserver.k8s.io", Version: "v1beta1", Kind: "PriorityLevelConfigurationList"}
|
return schema.GroupVersionKind{Group: "flowcontrol.apiserver.k8s.io", Version: "v1beta2", Kind: "PriorityLevelConfigurationList"}
|
||||||
}
|
}
|
||||||
|
|
||||||
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
||||||
|
|||||||
4
vendor/k8s.io/api/flowcontrol/v1beta1/types.go
generated
vendored
4
vendor/k8s.io/api/flowcontrol/v1beta1/types.go
generated
vendored
@ -105,6 +105,7 @@ const (
|
|||||||
// +genclient:nonNamespaced
|
// +genclient:nonNamespaced
|
||||||
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
||||||
// +k8s:prerelease-lifecycle-gen:introduced=1.20
|
// +k8s:prerelease-lifecycle-gen:introduced=1.20
|
||||||
|
// +k8s:prerelease-lifecycle-gen:replacement=flowcontrol.apiserver.k8s.io,v1beta2,FlowSchema
|
||||||
|
|
||||||
// FlowSchema defines the schema of a group of flows. Note that a flow is made up of a set of inbound API requests with
|
// FlowSchema defines the schema of a group of flows. Note that a flow is made up of a set of inbound API requests with
|
||||||
// similar attributes and is identified by a pair of strings: the name of the FlowSchema and a "flow distinguisher".
|
// similar attributes and is identified by a pair of strings: the name of the FlowSchema and a "flow distinguisher".
|
||||||
@ -126,6 +127,7 @@ type FlowSchema struct {
|
|||||||
|
|
||||||
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
||||||
// +k8s:prerelease-lifecycle-gen:introduced=1.20
|
// +k8s:prerelease-lifecycle-gen:introduced=1.20
|
||||||
|
// +k8s:prerelease-lifecycle-gen:replacement=flowcontrol.apiserver.k8s.io,v1beta2,FlowSchemaList
|
||||||
|
|
||||||
// FlowSchemaList is a list of FlowSchema objects.
|
// FlowSchemaList is a list of FlowSchema objects.
|
||||||
type FlowSchemaList struct {
|
type FlowSchemaList struct {
|
||||||
@ -380,6 +382,7 @@ type FlowSchemaConditionType string
|
|||||||
// +genclient:nonNamespaced
|
// +genclient:nonNamespaced
|
||||||
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
||||||
// +k8s:prerelease-lifecycle-gen:introduced=1.20
|
// +k8s:prerelease-lifecycle-gen:introduced=1.20
|
||||||
|
// +k8s:prerelease-lifecycle-gen:replacement=flowcontrol.apiserver.k8s.io,v1beta2,PriorityLevelConfiguration
|
||||||
|
|
||||||
// PriorityLevelConfiguration represents the configuration of a priority level.
|
// PriorityLevelConfiguration represents the configuration of a priority level.
|
||||||
type PriorityLevelConfiguration struct {
|
type PriorityLevelConfiguration struct {
|
||||||
@ -400,6 +403,7 @@ type PriorityLevelConfiguration struct {
|
|||||||
|
|
||||||
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
||||||
// +k8s:prerelease-lifecycle-gen:introduced=1.20
|
// +k8s:prerelease-lifecycle-gen:introduced=1.20
|
||||||
|
// +k8s:prerelease-lifecycle-gen:replacement=flowcontrol.apiserver.k8s.io,v1beta2,PriorityLevelConfigurationList
|
||||||
|
|
||||||
// PriorityLevelConfigurationList is a list of PriorityLevelConfiguration objects.
|
// PriorityLevelConfigurationList is a list of PriorityLevelConfiguration objects.
|
||||||
type PriorityLevelConfigurationList struct {
|
type PriorityLevelConfigurationList struct {
|
||||||
|
|||||||
28
vendor/k8s.io/api/flowcontrol/v1beta1/zz_generated.prerelease-lifecycle.go
generated
vendored
28
vendor/k8s.io/api/flowcontrol/v1beta1/zz_generated.prerelease-lifecycle.go
generated
vendored
@ -21,6 +21,10 @@ limitations under the License.
|
|||||||
|
|
||||||
package v1beta1
|
package v1beta1
|
||||||
|
|
||||||
|
import (
|
||||||
|
schema "k8s.io/apimachinery/pkg/runtime/schema"
|
||||||
|
)
|
||||||
|
|
||||||
// APILifecycleIntroduced is an autogenerated function, returning the release in which the API struct was introduced as int versions of major and minor for comparison.
|
// APILifecycleIntroduced is an autogenerated function, returning the release in which the API struct was introduced as int versions of major and minor for comparison.
|
||||||
// It is controlled by "k8s:prerelease-lifecycle-gen:introduced" tags in types.go.
|
// It is controlled by "k8s:prerelease-lifecycle-gen:introduced" tags in types.go.
|
||||||
func (in *FlowSchema) APILifecycleIntroduced() (major, minor int) {
|
func (in *FlowSchema) APILifecycleIntroduced() (major, minor int) {
|
||||||
@ -33,6 +37,12 @@ func (in *FlowSchema) APILifecycleDeprecated() (major, minor int) {
|
|||||||
return 1, 23
|
return 1, 23
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// APILifecycleReplacement is an autogenerated function, returning the group, version, and kind that should be used instead of this deprecated type.
|
||||||
|
// It is controlled by "k8s:prerelease-lifecycle-gen:replacement=<group>,<version>,<kind>" tags in types.go.
|
||||||
|
func (in *FlowSchema) APILifecycleReplacement() schema.GroupVersionKind {
|
||||||
|
return schema.GroupVersionKind{Group: "flowcontrol.apiserver.k8s.io", Version: "v1beta2", Kind: "FlowSchema"}
|
||||||
|
}
|
||||||
|
|
||||||
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
||||||
// It is controlled by "k8s:prerelease-lifecycle-gen:removed" tags in types.go or "k8s:prerelease-lifecycle-gen:deprecated" plus three minor.
|
// It is controlled by "k8s:prerelease-lifecycle-gen:removed" tags in types.go or "k8s:prerelease-lifecycle-gen:deprecated" plus three minor.
|
||||||
func (in *FlowSchema) APILifecycleRemoved() (major, minor int) {
|
func (in *FlowSchema) APILifecycleRemoved() (major, minor int) {
|
||||||
@ -51,6 +61,12 @@ func (in *FlowSchemaList) APILifecycleDeprecated() (major, minor int) {
|
|||||||
return 1, 23
|
return 1, 23
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// APILifecycleReplacement is an autogenerated function, returning the group, version, and kind that should be used instead of this deprecated type.
|
||||||
|
// It is controlled by "k8s:prerelease-lifecycle-gen:replacement=<group>,<version>,<kind>" tags in types.go.
|
||||||
|
func (in *FlowSchemaList) APILifecycleReplacement() schema.GroupVersionKind {
|
||||||
|
return schema.GroupVersionKind{Group: "flowcontrol.apiserver.k8s.io", Version: "v1beta2", Kind: "FlowSchemaList"}
|
||||||
|
}
|
||||||
|
|
||||||
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
||||||
// It is controlled by "k8s:prerelease-lifecycle-gen:removed" tags in types.go or "k8s:prerelease-lifecycle-gen:deprecated" plus three minor.
|
// It is controlled by "k8s:prerelease-lifecycle-gen:removed" tags in types.go or "k8s:prerelease-lifecycle-gen:deprecated" plus three minor.
|
||||||
func (in *FlowSchemaList) APILifecycleRemoved() (major, minor int) {
|
func (in *FlowSchemaList) APILifecycleRemoved() (major, minor int) {
|
||||||
@ -69,6 +85,12 @@ func (in *PriorityLevelConfiguration) APILifecycleDeprecated() (major, minor int
|
|||||||
return 1, 23
|
return 1, 23
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// APILifecycleReplacement is an autogenerated function, returning the group, version, and kind that should be used instead of this deprecated type.
|
||||||
|
// It is controlled by "k8s:prerelease-lifecycle-gen:replacement=<group>,<version>,<kind>" tags in types.go.
|
||||||
|
func (in *PriorityLevelConfiguration) APILifecycleReplacement() schema.GroupVersionKind {
|
||||||
|
return schema.GroupVersionKind{Group: "flowcontrol.apiserver.k8s.io", Version: "v1beta2", Kind: "PriorityLevelConfiguration"}
|
||||||
|
}
|
||||||
|
|
||||||
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
||||||
// It is controlled by "k8s:prerelease-lifecycle-gen:removed" tags in types.go or "k8s:prerelease-lifecycle-gen:deprecated" plus three minor.
|
// It is controlled by "k8s:prerelease-lifecycle-gen:removed" tags in types.go or "k8s:prerelease-lifecycle-gen:deprecated" plus three minor.
|
||||||
func (in *PriorityLevelConfiguration) APILifecycleRemoved() (major, minor int) {
|
func (in *PriorityLevelConfiguration) APILifecycleRemoved() (major, minor int) {
|
||||||
@ -87,6 +109,12 @@ func (in *PriorityLevelConfigurationList) APILifecycleDeprecated() (major, minor
|
|||||||
return 1, 23
|
return 1, 23
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// APILifecycleReplacement is an autogenerated function, returning the group, version, and kind that should be used instead of this deprecated type.
|
||||||
|
// It is controlled by "k8s:prerelease-lifecycle-gen:replacement=<group>,<version>,<kind>" tags in types.go.
|
||||||
|
func (in *PriorityLevelConfigurationList) APILifecycleReplacement() schema.GroupVersionKind {
|
||||||
|
return schema.GroupVersionKind{Group: "flowcontrol.apiserver.k8s.io", Version: "v1beta2", Kind: "PriorityLevelConfigurationList"}
|
||||||
|
}
|
||||||
|
|
||||||
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
|
||||||
// It is controlled by "k8s:prerelease-lifecycle-gen:removed" tags in types.go or "k8s:prerelease-lifecycle-gen:deprecated" plus three minor.
|
// It is controlled by "k8s:prerelease-lifecycle-gen:removed" tags in types.go or "k8s:prerelease-lifecycle-gen:deprecated" plus three minor.
|
||||||
func (in *PriorityLevelConfigurationList) APILifecycleRemoved() (major, minor int) {
|
func (in *PriorityLevelConfigurationList) APILifecycleRemoved() (major, minor int) {
|
||||||
|
|||||||
5
vendor/k8s.io/client-go/tools/pager/pager.go
generated
vendored
5
vendor/k8s.io/client-go/tools/pager/pager.go
generated
vendored
@ -78,6 +78,7 @@ func (p *ListPager) List(ctx context.Context, options metav1.ListOptions) (runti
|
|||||||
options.Limit = p.PageSize
|
options.Limit = p.PageSize
|
||||||
}
|
}
|
||||||
requestedResourceVersion := options.ResourceVersion
|
requestedResourceVersion := options.ResourceVersion
|
||||||
|
requestedResourceVersionMatch := options.ResourceVersionMatch
|
||||||
var list *metainternalversion.List
|
var list *metainternalversion.List
|
||||||
paginatedResult := false
|
paginatedResult := false
|
||||||
|
|
||||||
@ -102,6 +103,7 @@ func (p *ListPager) List(ctx context.Context, options metav1.ListOptions) (runti
|
|||||||
options.Limit = 0
|
options.Limit = 0
|
||||||
options.Continue = ""
|
options.Continue = ""
|
||||||
options.ResourceVersion = requestedResourceVersion
|
options.ResourceVersion = requestedResourceVersion
|
||||||
|
options.ResourceVersionMatch = requestedResourceVersionMatch
|
||||||
result, err := p.PageFn(ctx, options)
|
result, err := p.PageFn(ctx, options)
|
||||||
return result, paginatedResult, err
|
return result, paginatedResult, err
|
||||||
}
|
}
|
||||||
@ -135,10 +137,11 @@ func (p *ListPager) List(ctx context.Context, options metav1.ListOptions) (runti
|
|||||||
|
|
||||||
// set the next loop up
|
// set the next loop up
|
||||||
options.Continue = m.GetContinue()
|
options.Continue = m.GetContinue()
|
||||||
// Clear the ResourceVersion on the subsequent List calls to avoid the
|
// Clear the ResourceVersion(Match) on the subsequent List calls to avoid the
|
||||||
// `specifying resource version is not allowed when using continue` error.
|
// `specifying resource version is not allowed when using continue` error.
|
||||||
// See https://github.com/kubernetes/kubernetes/issues/85221#issuecomment-553748143.
|
// See https://github.com/kubernetes/kubernetes/issues/85221#issuecomment-553748143.
|
||||||
options.ResourceVersion = ""
|
options.ResourceVersion = ""
|
||||||
|
options.ResourceVersionMatch = ""
|
||||||
// At this point, result is already paginated.
|
// At this point, result is already paginated.
|
||||||
paginatedResult = true
|
paginatedResult = true
|
||||||
}
|
}
|
||||||
|
|||||||
14
vendor/k8s.io/mount-utils/mount_helper_common.go
generated
vendored
14
vendor/k8s.io/mount-utils/mount_helper_common.go
generated
vendored
@ -135,17 +135,3 @@ func removePathIfNotMountPoint(mountPath string, mounter Interface, extensiveMou
|
|||||||
}
|
}
|
||||||
return notMnt, nil
|
return notMnt, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// PathExists returns true if the specified path exists.
|
|
||||||
// TODO: clean this up to use pkg/util/file/FileExists
|
|
||||||
func PathExists(path string) (bool, error) {
|
|
||||||
_, err := os.Stat(path)
|
|
||||||
if err == nil {
|
|
||||||
return true, nil
|
|
||||||
} else if os.IsNotExist(err) {
|
|
||||||
return false, nil
|
|
||||||
} else if IsCorruptedMnt(err) {
|
|
||||||
return true, err
|
|
||||||
}
|
|
||||||
return false, err
|
|
||||||
}
|
|
||||||
|
|||||||
28
vendor/k8s.io/mount-utils/mount_helper_unix.go
generated
vendored
28
vendor/k8s.io/mount-utils/mount_helper_unix.go
generated
vendored
@ -20,12 +20,15 @@ limitations under the License.
|
|||||||
package mount
|
package mount
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io/fs"
|
||||||
"os"
|
"os"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
|
"k8s.io/klog/v2"
|
||||||
utilio "k8s.io/utils/io"
|
utilio "k8s.io/utils/io"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -51,6 +54,8 @@ func IsCorruptedMnt(err error) bool {
|
|||||||
underlyingError = pe.Err
|
underlyingError = pe.Err
|
||||||
case *os.SyscallError:
|
case *os.SyscallError:
|
||||||
underlyingError = pe.Err
|
underlyingError = pe.Err
|
||||||
|
case syscall.Errno:
|
||||||
|
underlyingError = err
|
||||||
}
|
}
|
||||||
|
|
||||||
return underlyingError == syscall.ENOTCONN || underlyingError == syscall.ESTALE || underlyingError == syscall.EIO || underlyingError == syscall.EACCES || underlyingError == syscall.EHOSTDOWN
|
return underlyingError == syscall.ENOTCONN || underlyingError == syscall.ESTALE || underlyingError == syscall.EIO || underlyingError == syscall.EACCES || underlyingError == syscall.EHOSTDOWN
|
||||||
@ -157,3 +162,26 @@ func isMountPointMatch(mp MountPoint, dir string) bool {
|
|||||||
deletedDir := fmt.Sprintf("%s\\040(deleted)", dir)
|
deletedDir := fmt.Sprintf("%s\\040(deleted)", dir)
|
||||||
return ((mp.Path == dir) || (mp.Path == deletedDir))
|
return ((mp.Path == dir) || (mp.Path == deletedDir))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// PathExists returns true if the specified path exists.
|
||||||
|
// TODO: clean this up to use pkg/util/file/FileExists
|
||||||
|
func PathExists(path string) (bool, error) {
|
||||||
|
_, err := os.Stat(path)
|
||||||
|
if err == nil {
|
||||||
|
return true, nil
|
||||||
|
} else if errors.Is(err, fs.ErrNotExist) {
|
||||||
|
err = syscall.Access(path, syscall.F_OK)
|
||||||
|
if err == nil {
|
||||||
|
// The access syscall says the file exists, the stat syscall says it
|
||||||
|
// doesn't. This was observed on CIFS when the path was removed at
|
||||||
|
// the server somehow. POSIX calls this a stale file handle, let's fake
|
||||||
|
// that error and treat the path as existing but corrupted.
|
||||||
|
klog.Warningf("Potential stale file handle detected: %s", path)
|
||||||
|
return true, syscall.ESTALE
|
||||||
|
}
|
||||||
|
return false, nil
|
||||||
|
} else if IsCorruptedMnt(err) {
|
||||||
|
return true, err
|
||||||
|
}
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|||||||
14
vendor/k8s.io/mount-utils/mount_helper_windows.go
generated
vendored
14
vendor/k8s.io/mount-utils/mount_helper_windows.go
generated
vendored
@ -95,3 +95,17 @@ func ValidateDiskNumber(disk string) error {
|
|||||||
func isMountPointMatch(mp MountPoint, dir string) bool {
|
func isMountPointMatch(mp MountPoint, dir string) bool {
|
||||||
return mp.Path == dir
|
return mp.Path == dir
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// PathExists returns true if the specified path exists.
|
||||||
|
// TODO: clean this up to use pkg/util/file/FileExists
|
||||||
|
func PathExists(path string) (bool, error) {
|
||||||
|
_, err := os.Stat(path)
|
||||||
|
if err == nil {
|
||||||
|
return true, nil
|
||||||
|
} else if os.IsNotExist(err) {
|
||||||
|
return false, nil
|
||||||
|
} else if IsCorruptedMnt(err) {
|
||||||
|
return true, err
|
||||||
|
}
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|||||||
76
vendor/modules.txt
vendored
76
vendor/modules.txt
vendored
@ -695,7 +695,7 @@ gopkg.in/yaml.v2
|
|||||||
# gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
|
# gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
|
||||||
## explicit
|
## explicit
|
||||||
gopkg.in/yaml.v3
|
gopkg.in/yaml.v3
|
||||||
# k8s.io/api v0.23.0 => k8s.io/api v0.23.0
|
# k8s.io/api v0.23.2 => k8s.io/api v0.23.2
|
||||||
## explicit; go 1.16
|
## explicit; go 1.16
|
||||||
k8s.io/api/admission/v1
|
k8s.io/api/admission/v1
|
||||||
k8s.io/api/admission/v1beta1
|
k8s.io/api/admission/v1beta1
|
||||||
@ -744,7 +744,7 @@ k8s.io/api/scheduling/v1beta1
|
|||||||
k8s.io/api/storage/v1
|
k8s.io/api/storage/v1
|
||||||
k8s.io/api/storage/v1alpha1
|
k8s.io/api/storage/v1alpha1
|
||||||
k8s.io/api/storage/v1beta1
|
k8s.io/api/storage/v1beta1
|
||||||
# k8s.io/apimachinery v0.23.0 => k8s.io/apimachinery v0.23.0
|
# k8s.io/apimachinery v0.23.2 => k8s.io/apimachinery v0.23.2
|
||||||
## explicit; go 1.16
|
## explicit; go 1.16
|
||||||
k8s.io/apimachinery/pkg/api/equality
|
k8s.io/apimachinery/pkg/api/equality
|
||||||
k8s.io/apimachinery/pkg/api/errors
|
k8s.io/apimachinery/pkg/api/errors
|
||||||
@ -800,7 +800,7 @@ k8s.io/apimachinery/pkg/watch
|
|||||||
k8s.io/apimachinery/third_party/forked/golang/json
|
k8s.io/apimachinery/third_party/forked/golang/json
|
||||||
k8s.io/apimachinery/third_party/forked/golang/netutil
|
k8s.io/apimachinery/third_party/forked/golang/netutil
|
||||||
k8s.io/apimachinery/third_party/forked/golang/reflect
|
k8s.io/apimachinery/third_party/forked/golang/reflect
|
||||||
# k8s.io/apiserver v0.23.0 => k8s.io/apiserver v0.23.0
|
# k8s.io/apiserver v0.23.2 => k8s.io/apiserver v0.23.2
|
||||||
## explicit; go 1.16
|
## explicit; go 1.16
|
||||||
k8s.io/apiserver/pkg/admission
|
k8s.io/apiserver/pkg/admission
|
||||||
k8s.io/apiserver/pkg/admission/configuration
|
k8s.io/apiserver/pkg/admission/configuration
|
||||||
@ -841,7 +841,7 @@ k8s.io/apiserver/pkg/util/feature
|
|||||||
k8s.io/apiserver/pkg/util/webhook
|
k8s.io/apiserver/pkg/util/webhook
|
||||||
k8s.io/apiserver/pkg/util/x509metrics
|
k8s.io/apiserver/pkg/util/x509metrics
|
||||||
k8s.io/apiserver/pkg/warning
|
k8s.io/apiserver/pkg/warning
|
||||||
# k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.23.0
|
# k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.23.2
|
||||||
## explicit; go 1.16
|
## explicit; go 1.16
|
||||||
k8s.io/client-go/applyconfigurations/admissionregistration/v1
|
k8s.io/client-go/applyconfigurations/admissionregistration/v1
|
||||||
k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1
|
k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1
|
||||||
@ -1084,12 +1084,12 @@ k8s.io/client-go/util/homedir
|
|||||||
k8s.io/client-go/util/keyutil
|
k8s.io/client-go/util/keyutil
|
||||||
k8s.io/client-go/util/retry
|
k8s.io/client-go/util/retry
|
||||||
k8s.io/client-go/util/workqueue
|
k8s.io/client-go/util/workqueue
|
||||||
# k8s.io/cloud-provider v0.23.0 => k8s.io/cloud-provider v0.23.0
|
# k8s.io/cloud-provider v0.23.2 => k8s.io/cloud-provider v0.23.2
|
||||||
## explicit; go 1.16
|
## explicit; go 1.16
|
||||||
k8s.io/cloud-provider
|
k8s.io/cloud-provider
|
||||||
k8s.io/cloud-provider/volume
|
k8s.io/cloud-provider/volume
|
||||||
k8s.io/cloud-provider/volume/helpers
|
k8s.io/cloud-provider/volume/helpers
|
||||||
# k8s.io/component-base v0.23.0 => k8s.io/component-base v0.23.0
|
# k8s.io/component-base v0.23.2 => k8s.io/component-base v0.23.2
|
||||||
## explicit; go 1.16
|
## explicit; go 1.16
|
||||||
k8s.io/component-base/cli/flag
|
k8s.io/component-base/cli/flag
|
||||||
k8s.io/component-base/config
|
k8s.io/component-base/config
|
||||||
@ -1100,7 +1100,7 @@ k8s.io/component-base/metrics/legacyregistry
|
|||||||
k8s.io/component-base/metrics/testutil
|
k8s.io/component-base/metrics/testutil
|
||||||
k8s.io/component-base/traces
|
k8s.io/component-base/traces
|
||||||
k8s.io/component-base/version
|
k8s.io/component-base/version
|
||||||
# k8s.io/component-helpers v0.23.0 => k8s.io/component-helpers v0.23.0
|
# k8s.io/component-helpers v0.23.2 => k8s.io/component-helpers v0.23.2
|
||||||
## explicit; go 1.16
|
## explicit; go 1.16
|
||||||
k8s.io/component-helpers/node/util/sysctl
|
k8s.io/component-helpers/node/util/sysctl
|
||||||
k8s.io/component-helpers/scheduling/corev1
|
k8s.io/component-helpers/scheduling/corev1
|
||||||
@ -1112,14 +1112,14 @@ k8s.io/klog/v2
|
|||||||
## explicit; go 1.16
|
## explicit; go 1.16
|
||||||
k8s.io/kube-openapi/pkg/schemaconv
|
k8s.io/kube-openapi/pkg/schemaconv
|
||||||
k8s.io/kube-openapi/pkg/util/proto
|
k8s.io/kube-openapi/pkg/util/proto
|
||||||
# k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.23.0
|
# k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.23.2
|
||||||
## explicit; go 1.16
|
## explicit; go 1.16
|
||||||
k8s.io/kubectl/pkg/scale
|
k8s.io/kubectl/pkg/scale
|
||||||
k8s.io/kubectl/pkg/util/podutils
|
k8s.io/kubectl/pkg/util/podutils
|
||||||
# k8s.io/kubelet v0.0.0 => k8s.io/kubelet v0.23.0
|
# k8s.io/kubelet v0.0.0 => k8s.io/kubelet v0.23.2
|
||||||
## explicit; go 1.16
|
## explicit; go 1.16
|
||||||
k8s.io/kubelet/pkg/apis/stats/v1alpha1
|
k8s.io/kubelet/pkg/apis/stats/v1alpha1
|
||||||
# k8s.io/kubernetes v1.23.1
|
# k8s.io/kubernetes v1.23.2
|
||||||
## explicit; go 1.16
|
## explicit; go 1.16
|
||||||
k8s.io/kubernetes/pkg/api/legacyscheme
|
k8s.io/kubernetes/pkg/api/legacyscheme
|
||||||
k8s.io/kubernetes/pkg/api/service
|
k8s.io/kubernetes/pkg/api/service
|
||||||
@ -1182,7 +1182,7 @@ k8s.io/kubernetes/test/e2e/storage/podlogs
|
|||||||
k8s.io/kubernetes/test/e2e/storage/utils
|
k8s.io/kubernetes/test/e2e/storage/utils
|
||||||
k8s.io/kubernetes/test/utils
|
k8s.io/kubernetes/test/utils
|
||||||
k8s.io/kubernetes/test/utils/image
|
k8s.io/kubernetes/test/utils/image
|
||||||
# k8s.io/mount-utils v0.23.0 => k8s.io/mount-utils v0.23.0
|
# k8s.io/mount-utils v0.23.2 => k8s.io/mount-utils v0.23.2
|
||||||
## explicit; go 1.16
|
## explicit; go 1.16
|
||||||
k8s.io/mount-utils
|
k8s.io/mount-utils
|
||||||
# k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
|
# k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
|
||||||
@ -1202,7 +1202,7 @@ k8s.io/utils/nsenter
|
|||||||
k8s.io/utils/path
|
k8s.io/utils/path
|
||||||
k8s.io/utils/pointer
|
k8s.io/utils/pointer
|
||||||
k8s.io/utils/trace
|
k8s.io/utils/trace
|
||||||
# sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25
|
# sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27
|
||||||
## explicit; go 1.17
|
## explicit; go 1.17
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client
|
||||||
@ -1247,7 +1247,7 @@ sigs.k8s.io/controller-runtime/pkg/webhook/internal/metrics
|
|||||||
## explicit; go 1.16
|
## explicit; go 1.16
|
||||||
sigs.k8s.io/json
|
sigs.k8s.io/json
|
||||||
sigs.k8s.io/json/internal/golang/encoding/json
|
sigs.k8s.io/json/internal/golang/encoding/json
|
||||||
# sigs.k8s.io/structured-merge-diff/v4 v4.2.0
|
# sigs.k8s.io/structured-merge-diff/v4 v4.2.1
|
||||||
## explicit; go 1.13
|
## explicit; go 1.13
|
||||||
sigs.k8s.io/structured-merge-diff/v4/fieldpath
|
sigs.k8s.io/structured-merge-diff/v4/fieldpath
|
||||||
sigs.k8s.io/structured-merge-diff/v4/schema
|
sigs.k8s.io/structured-merge-diff/v4/schema
|
||||||
@ -1261,29 +1261,29 @@ sigs.k8s.io/yaml
|
|||||||
# github.com/golang/protobuf => github.com/golang/protobuf v1.4.3
|
# github.com/golang/protobuf => github.com/golang/protobuf v1.4.3
|
||||||
# github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3
|
# 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
|
# gomodules.xyz/jsonpatch/v2 => github.com/gomodules/jsonpatch/v2 v2.2.0
|
||||||
# k8s.io/api => k8s.io/api v0.23.0
|
# k8s.io/api => k8s.io/api v0.23.2
|
||||||
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.0
|
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.2
|
||||||
# k8s.io/apimachinery => k8s.io/apimachinery v0.23.0
|
# k8s.io/apimachinery => k8s.io/apimachinery v0.23.2
|
||||||
# k8s.io/apiserver => k8s.io/apiserver v0.23.0
|
# k8s.io/apiserver => k8s.io/apiserver v0.23.2
|
||||||
# k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.0
|
# k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.2
|
||||||
# k8s.io/client-go => k8s.io/client-go v0.23.0
|
# k8s.io/client-go => k8s.io/client-go v0.23.2
|
||||||
# k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.0
|
# k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.2
|
||||||
# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.0
|
# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.2
|
||||||
# k8s.io/code-generator => k8s.io/code-generator v0.23.0
|
# k8s.io/code-generator => k8s.io/code-generator v0.23.2
|
||||||
# k8s.io/component-base => k8s.io/component-base v0.23.0
|
# k8s.io/component-base => k8s.io/component-base v0.23.2
|
||||||
# k8s.io/component-helpers => k8s.io/component-helpers v0.23.0
|
# k8s.io/component-helpers => k8s.io/component-helpers v0.23.2
|
||||||
# k8s.io/controller-manager => k8s.io/controller-manager v0.23.0
|
# k8s.io/controller-manager => k8s.io/controller-manager v0.23.2
|
||||||
# k8s.io/cri-api => k8s.io/cri-api v0.23.0
|
# k8s.io/cri-api => k8s.io/cri-api v0.23.2
|
||||||
# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.0
|
# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.2
|
||||||
# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.0
|
# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.2
|
||||||
# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.0
|
# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.2
|
||||||
# k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.0
|
# k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.2
|
||||||
# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.0
|
# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.2
|
||||||
# k8s.io/kubectl => k8s.io/kubectl v0.23.0
|
# k8s.io/kubectl => k8s.io/kubectl v0.23.2
|
||||||
# k8s.io/kubelet => k8s.io/kubelet v0.23.0
|
# k8s.io/kubelet => k8s.io/kubelet v0.23.2
|
||||||
# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.0
|
# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.2
|
||||||
# k8s.io/metrics => k8s.io/metrics v0.23.0
|
# k8s.io/metrics => k8s.io/metrics v0.23.2
|
||||||
# k8s.io/mount-utils => k8s.io/mount-utils v0.23.0
|
# k8s.io/mount-utils => k8s.io/mount-utils v0.23.2
|
||||||
# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.0
|
# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.2
|
||||||
# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.0
|
# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.2
|
||||||
# layeh.com/radius => github.com/layeh/radius v0.0.0-20190322222518-890bc1058917
|
# layeh.com/radius => github.com/layeh/radius v0.0.0-20190322222518-890bc1058917
|
||||||
|
|||||||
3
vendor/sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client/client.go
generated
vendored
3
vendor/sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client/client.go
generated
vendored
@ -114,7 +114,8 @@ func (t *grpcTunnel) serve(c clientConn) {
|
|||||||
t.pendingDialLock.RUnlock()
|
t.pendingDialLock.RUnlock()
|
||||||
|
|
||||||
if !ok {
|
if !ok {
|
||||||
klog.V(1).Infoln("DialResp not recognized; dropped")
|
klog.V(1).InfoS("DialResp not recognized; dropped", "connectionID", resp.ConnectID, "dialID", resp.Random)
|
||||||
|
return
|
||||||
} else {
|
} else {
|
||||||
result := dialResult{
|
result := dialResult{
|
||||||
err: resp.Error,
|
err: resp.Error,
|
||||||
|
|||||||
180
vendor/sigs.k8s.io/structured-merge-diff/v4/typed/merge.go
generated
vendored
180
vendor/sigs.k8s.io/structured-merge-diff/v4/typed/merge.go
generated
vendored
@ -17,8 +17,6 @@ limitations under the License.
|
|||||||
package typed
|
package typed
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"math"
|
|
||||||
|
|
||||||
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
|
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
|
||||||
"sigs.k8s.io/structured-merge-diff/v4/schema"
|
"sigs.k8s.io/structured-merge-diff/v4/schema"
|
||||||
"sigs.k8s.io/structured-merge-diff/v4/value"
|
"sigs.k8s.io/structured-merge-diff/v4/value"
|
||||||
@ -170,74 +168,94 @@ func (w *mergingWalker) visitListItems(t *schema.List, lhs, rhs value.List) (err
|
|||||||
if lhs != nil {
|
if lhs != nil {
|
||||||
lLen = lhs.Length()
|
lLen = lhs.Length()
|
||||||
}
|
}
|
||||||
out := make([]interface{}, 0, int(math.Max(float64(rLen), float64(lLen))))
|
outLen := lLen
|
||||||
|
if outLen < rLen {
|
||||||
lhsOrder := make([]fieldpath.PathElement, 0, lLen)
|
outLen = rLen
|
||||||
|
|
||||||
// First, collect all LHS children.
|
|
||||||
observedLHS := fieldpath.MakePathElementValueMap(lLen)
|
|
||||||
if lhs != nil {
|
|
||||||
for i := 0; i < lhs.Length(); i++ {
|
|
||||||
child := lhs.At(i)
|
|
||||||
pe, err := listItemToPathElement(w.allocator, w.schema, t, i, child)
|
|
||||||
if err != nil {
|
|
||||||
errs = append(errs, errorf("lhs: element %v: %v", i, err.Error())...)
|
|
||||||
// If we can't construct the path element, we can't
|
|
||||||
// even report errors deeper in the schema, so bail on
|
|
||||||
// this element.
|
|
||||||
continue
|
|
||||||
}
|
}
|
||||||
if _, ok := observedLHS.Get(pe); ok {
|
out := make([]interface{}, 0, outLen)
|
||||||
errs = append(errs, errorf("lhs: duplicate entries for key %v", pe.String())...)
|
|
||||||
}
|
rhsOrder, observedRHS, rhsErrs := w.indexListPathElements(t, rhs)
|
||||||
observedLHS.Insert(pe, child)
|
errs = append(errs, rhsErrs...)
|
||||||
lhsOrder = append(lhsOrder, pe)
|
lhsOrder, observedLHS, lhsErrs := w.indexListPathElements(t, lhs)
|
||||||
|
errs = append(errs, lhsErrs...)
|
||||||
|
|
||||||
|
sharedOrder := make([]*fieldpath.PathElement, 0, rLen)
|
||||||
|
for i := range rhsOrder {
|
||||||
|
pe := &rhsOrder[i]
|
||||||
|
if _, ok := observedLHS.Get(*pe); ok {
|
||||||
|
sharedOrder = append(sharedOrder, pe)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Then merge with RHS children.
|
var nextShared *fieldpath.PathElement
|
||||||
observedRHS := fieldpath.MakePathElementSet(rLen)
|
if len(sharedOrder) > 0 {
|
||||||
if rhs != nil {
|
nextShared = sharedOrder[0]
|
||||||
for i := 0; i < rhs.Length(); i++ {
|
sharedOrder = sharedOrder[1:]
|
||||||
child := rhs.At(i)
|
|
||||||
pe, err := listItemToPathElement(w.allocator, w.schema, t, i, child)
|
|
||||||
if err != nil {
|
|
||||||
errs = append(errs, errorf("rhs: element %v: %v", i, err.Error())...)
|
|
||||||
// If we can't construct the path element, we can't
|
|
||||||
// even report errors deeper in the schema, so bail on
|
|
||||||
// this element.
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if observedRHS.Has(pe) {
|
|
||||||
errs = append(errs, errorf("rhs: duplicate entries for key %v", pe.String())...)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
observedRHS.Insert(pe)
|
|
||||||
w2 := w.prepareDescent(pe, t.ElementType)
|
|
||||||
w2.rhs = child
|
|
||||||
if lchild, ok := observedLHS.Get(pe); ok {
|
|
||||||
w2.lhs = lchild
|
|
||||||
}
|
|
||||||
errs = append(errs, w2.merge(pe.String)...)
|
|
||||||
if w2.out != nil {
|
|
||||||
out = append(out, *w2.out)
|
|
||||||
}
|
|
||||||
w.finishDescent(w2)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, pe := range lhsOrder {
|
lLen, rLen = len(lhsOrder), len(rhsOrder)
|
||||||
if observedRHS.Has(pe) {
|
for lI, rI := 0, 0; lI < lLen || rI < rLen; {
|
||||||
|
if lI < lLen && rI < rLen {
|
||||||
|
pe := lhsOrder[lI]
|
||||||
|
if pe.Equals(rhsOrder[rI]) {
|
||||||
|
// merge LHS & RHS items
|
||||||
|
lChild, _ := observedLHS.Get(pe)
|
||||||
|
rChild, _ := observedRHS.Get(pe)
|
||||||
|
mergeOut, errs := w.mergeListItem(t, pe, lChild, rChild)
|
||||||
|
errs = append(errs, errs...)
|
||||||
|
if mergeOut != nil {
|
||||||
|
out = append(out, *mergeOut)
|
||||||
|
}
|
||||||
|
lI++
|
||||||
|
rI++
|
||||||
|
|
||||||
|
nextShared = nil
|
||||||
|
if len(sharedOrder) > 0 {
|
||||||
|
nextShared = sharedOrder[0]
|
||||||
|
sharedOrder = sharedOrder[1:]
|
||||||
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
value, _ := observedLHS.Get(pe)
|
if _, ok := observedRHS.Get(pe); ok && nextShared != nil && !nextShared.Equals(lhsOrder[lI]) {
|
||||||
w2 := w.prepareDescent(pe, t.ElementType)
|
// shared item, but not the one we want in this round
|
||||||
w2.lhs = value
|
lI++
|
||||||
errs = append(errs, w2.merge(pe.String)...)
|
continue
|
||||||
if w2.out != nil {
|
}
|
||||||
out = append(out, *w2.out)
|
}
|
||||||
|
if lI < lLen {
|
||||||
|
pe := lhsOrder[lI]
|
||||||
|
if _, ok := observedRHS.Get(pe); !ok {
|
||||||
|
// take LHS item
|
||||||
|
lChild, _ := observedLHS.Get(pe)
|
||||||
|
mergeOut, errs := w.mergeListItem(t, pe, lChild, nil)
|
||||||
|
errs = append(errs, errs...)
|
||||||
|
if mergeOut != nil {
|
||||||
|
out = append(out, *mergeOut)
|
||||||
|
}
|
||||||
|
lI++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if rI < rLen {
|
||||||
|
// Take the RHS item, merge with matching LHS item if possible
|
||||||
|
pe := rhsOrder[rI]
|
||||||
|
lChild, _ := observedLHS.Get(pe) // may be nil
|
||||||
|
rChild, _ := observedRHS.Get(pe)
|
||||||
|
mergeOut, errs := w.mergeListItem(t, pe, lChild, rChild)
|
||||||
|
errs = append(errs, errs...)
|
||||||
|
if mergeOut != nil {
|
||||||
|
out = append(out, *mergeOut)
|
||||||
|
}
|
||||||
|
rI++
|
||||||
|
// Advance nextShared, if we are merging nextShared.
|
||||||
|
if nextShared != nil && nextShared.Equals(pe) {
|
||||||
|
nextShared = nil
|
||||||
|
if len(sharedOrder) > 0 {
|
||||||
|
nextShared = sharedOrder[0]
|
||||||
|
sharedOrder = sharedOrder[1:]
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
w.finishDescent(w2)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(out) > 0 {
|
if len(out) > 0 {
|
||||||
@ -248,6 +266,46 @@ func (w *mergingWalker) visitListItems(t *schema.List, lhs, rhs value.List) (err
|
|||||||
return errs
|
return errs
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (w *mergingWalker) indexListPathElements(t *schema.List, list value.List) ([]fieldpath.PathElement, fieldpath.PathElementValueMap, ValidationErrors) {
|
||||||
|
var errs ValidationErrors
|
||||||
|
length := 0
|
||||||
|
if list != nil {
|
||||||
|
length = list.Length()
|
||||||
|
}
|
||||||
|
observed := fieldpath.MakePathElementValueMap(length)
|
||||||
|
pes := make([]fieldpath.PathElement, 0, length)
|
||||||
|
for i := 0; i < length; i++ {
|
||||||
|
child := list.At(i)
|
||||||
|
pe, err := listItemToPathElement(w.allocator, w.schema, t, i, child)
|
||||||
|
if err != nil {
|
||||||
|
errs = append(errs, errorf("element %v: %v", i, err.Error())...)
|
||||||
|
// If we can't construct the path element, we can't
|
||||||
|
// even report errors deeper in the schema, so bail on
|
||||||
|
// this element.
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, found := observed.Get(pe); found {
|
||||||
|
errs = append(errs, errorf("duplicate entries for key %v", pe.String())...)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
observed.Insert(pe, child)
|
||||||
|
pes = append(pes, pe)
|
||||||
|
}
|
||||||
|
return pes, observed, errs
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *mergingWalker) mergeListItem(t *schema.List, pe fieldpath.PathElement, lChild, rChild value.Value) (out *interface{}, errs ValidationErrors) {
|
||||||
|
w2 := w.prepareDescent(pe, t.ElementType)
|
||||||
|
w2.lhs = lChild
|
||||||
|
w2.rhs = rChild
|
||||||
|
errs = append(errs, w2.merge(pe.String)...)
|
||||||
|
if w2.out != nil {
|
||||||
|
out = w2.out
|
||||||
|
}
|
||||||
|
w.finishDescent(w2)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
func (w *mergingWalker) derefList(prefix string, v value.Value) (value.List, ValidationErrors) {
|
func (w *mergingWalker) derefList(prefix string, v value.Value) (value.List, ValidationErrors) {
|
||||||
if v == nil {
|
if v == nil {
|
||||||
return nil, nil
|
return nil, nil
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user