From c8007efff4a0774b8bcf7ba0b0fb00daf364b8ae Mon Sep 17 00:00:00 2001 From: dongjiang1989 Date: Fri, 15 Dec 2023 14:01:06 +0800 Subject: [PATCH] update k8s package verison Signed-off-by: dongjiang1989 --- go.mod | 70 +++++++++--------- go.sum | 72 +++++++++---------- hack/update-codegen.sh | 2 +- vendor/k8s.io/api/core/v1/types.go | 10 +++ .../apimachinery/pkg/runtime/converter.go | 4 +- vendor/k8s.io/mount-utils/mount_windows.go | 20 ++++-- vendor/modules.txt | 72 +++++++++---------- 7 files changed, 134 insertions(+), 116 deletions(-) diff --git a/go.mod b/go.mod index ef4f1196..25e78c4e 100644 --- a/go.mod +++ b/go.mod @@ -26,15 +26,15 @@ require ( golang.org/x/sys v0.13.0 google.golang.org/grpc v1.47.0 google.golang.org/protobuf v1.31.0 - k8s.io/api v0.24.15 - k8s.io/apimachinery v0.24.15 - k8s.io/client-go v0.24.15 - k8s.io/code-generator v0.24.15 - k8s.io/component-base v0.24.15 + k8s.io/api v0.24.17 + k8s.io/apimachinery v0.24.17 + k8s.io/client-go v0.24.17 + k8s.io/code-generator v0.24.17 + k8s.io/component-base v0.24.17 k8s.io/klog/v2 v2.80.1 k8s.io/kube-scheduler v0.20.5 - k8s.io/kubernetes v1.24.15 - k8s.io/mount-utils v0.24.15 + k8s.io/kubernetes v1.24.17 + k8s.io/mount-utils v0.24.17 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.4 ) @@ -87,9 +87,9 @@ require ( gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiserver v0.24.15 // indirect - k8s.io/cloud-provider v0.24.15 // indirect - k8s.io/component-helpers v0.24.15 // indirect + k8s.io/apiserver v0.24.17 // indirect + k8s.io/cloud-provider v0.24.17 // indirect + k8s.io/component-helpers v0.24.17 // indirect k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect @@ -112,31 +112,31 @@ replace ( github.com/go-logr/logr => github.com/go-logr/logr v1.2.0 github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1 google.golang.org/grpc => google.golang.org/grpc v1.43.0 - k8s.io/api => k8s.io/api v0.24.15 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.15 - k8s.io/apimachinery => k8s.io/apimachinery v0.24.15 - k8s.io/apiserver => k8s.io/apiserver v0.24.15 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.15 - k8s.io/client-go => k8s.io/client-go v0.24.15 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.15 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.15 - k8s.io/code-generator => k8s.io/code-generator v0.24.15 - k8s.io/component-base => k8s.io/component-base v0.24.15 - k8s.io/component-helpers => k8s.io/component-helpers v0.24.15 - k8s.io/controller-manager => k8s.io/controller-manager v0.24.15 - k8s.io/cri-api => k8s.io/cri-api v0.24.15 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.15 + k8s.io/api => k8s.io/api v0.24.17 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.17 + k8s.io/apimachinery => k8s.io/apimachinery v0.24.17 + k8s.io/apiserver => k8s.io/apiserver v0.24.17 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.17 + k8s.io/client-go => k8s.io/client-go v0.24.17 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.17 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.17 + k8s.io/code-generator => k8s.io/code-generator v0.24.17 + k8s.io/component-base => k8s.io/component-base v0.24.17 + k8s.io/component-helpers => k8s.io/component-helpers v0.24.17 + k8s.io/controller-manager => k8s.io/controller-manager v0.24.17 + k8s.io/cri-api => k8s.io/cri-api v0.24.17 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.17 k8s.io/klog/v2 => k8s.io/klog/v2 v2.60.1 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.15 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.15 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.15 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.15 - k8s.io/kubectl => k8s.io/kubectl v0.24.15 - k8s.io/kubelet => k8s.io/kubelet v0.24.15 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.17 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.17 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.17 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.17 + k8s.io/kubectl => k8s.io/kubectl v0.24.17 + k8s.io/kubelet => k8s.io/kubelet v0.24.17 k8s.io/kubernetes => k8s.io/kubernetes v1.24.15 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.15 - k8s.io/metrics => k8s.io/metrics v0.24.15 - k8s.io/mount-utils => k8s.io/mount-utils v0.24.15 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.15 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.15 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.17 + k8s.io/metrics => k8s.io/metrics v0.24.17 + k8s.io/mount-utils => k8s.io/mount-utils v0.24.17 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.17 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.17 ) diff --git a/go.sum b/go.sum index 3d3d5f86..fbeb19c5 100644 --- a/go.sum +++ b/go.sum @@ -2425,29 +2425,29 @@ 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-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= -k8s.io/api v0.24.15 h1:5Zz9fnII9fR2Pouj8YMnsB2BEg9fzXRHo2Ed9Js62GU= -k8s.io/api v0.24.15/go.mod h1:lPoMB2MmzSUa3R8iGI4GapLCYnOcbFT2SHPBR4mPt6E= -k8s.io/apiextensions-apiserver v0.24.15/go.mod h1:zyMke4waTm2IX79y6qOehGZNYoaVtVtdyCkfa/nIzp8= -k8s.io/apimachinery v0.24.15 h1:yyPEqYqYNAZL+ybqyCo4pzfxQLYezRJITFiaTmEFr7M= -k8s.io/apimachinery v0.24.15/go.mod h1:kSzhCwldu9XB172NDdLffRN0sJ3x95RR7Bmyc4SHhs0= -k8s.io/apiserver v0.24.15 h1:ejo5nBFYXj4e9HHoa2CnkjL5DHcrkOw5reZzTEfCxGk= -k8s.io/apiserver v0.24.15/go.mod h1:Em6A8ake05gNti4mO06/3xNCK+WUYMXQ5Abvh5661Po= -k8s.io/cli-runtime v0.24.15/go.mod h1:eDJ6WBuppnPCoobl1N0nhtrsMrzFp5qh2eNLgYQmFtM= -k8s.io/client-go v0.24.15 h1:0gPvSAykRxvl8vD7kPA8JvAWQJuwrSEZkfgSNb1T7q8= -k8s.io/client-go v0.24.15/go.mod h1:200/+zvHmX6fL97NBMa/ndRbJzc3Kwh5um0U2KgCiTA= -k8s.io/cloud-provider v0.24.15 h1:df1oGEueADR2H4T4+vzsihzNufvkTIKJb8xBig5NqT0= -k8s.io/cloud-provider v0.24.15/go.mod h1:qybXQRPoszAxCA7P5Q8mpUKKs8FekeAXS9DdsGIdoPE= -k8s.io/cluster-bootstrap v0.24.15/go.mod h1:NJiCLBvofF7AvwnLHs6AL7DXNQ2ReRRfJI9K4+oMe88= -k8s.io/code-generator v0.24.15 h1:I8iyUiIXFKDhVoxMRgdpqSk4NfDQrA1Aiqumr41X2vE= -k8s.io/code-generator v0.24.15/go.mod h1:nQvp6VgOfRkKiLyMz+/JTNXNS6Q4bGWOVtB5rKd2TV0= -k8s.io/component-base v0.24.15 h1:HcZCS3OLuKPYa41BfEVr1g04bparNoGm9ClSJEV3yHc= -k8s.io/component-base v0.24.15/go.mod h1:ENK7pDtlgREVx2mtiLxVRFO9Liqq3ftVLi22gDp69xk= -k8s.io/component-helpers v0.24.15 h1:Zjsqs3uGRjIGvZLES/Kz+zk2qJPY+fZUZp1EUCb/JlM= -k8s.io/component-helpers v0.24.15/go.mod h1:hdd7lSzD8iOQTewRQz0YzEEW7uDkYzF1eEGXPNZawIo= -k8s.io/controller-manager v0.24.15/go.mod h1:hiYfD3OTtGeRPkuzvwY21iifftE76oLN7iTuGBmUXCo= -k8s.io/cri-api v0.24.15/go.mod h1:/KjYFI3BwY8/ytCQa0+Hla8FyGpDps88N45g4jet5I4= -k8s.io/csi-translation-lib v0.24.15 h1:M9XaLwSqK/YqSopjlCq42DOQRquORJXtjzeYqupWDDo= -k8s.io/csi-translation-lib v0.24.15/go.mod h1:+9VQt/SYAAscI+faj/bSniKyr9frhceI2MD/3/ESuAg= +k8s.io/api v0.24.17 h1:ILPpMleNDZbMJwopUBOVWtmCq3xBAj/4gJEUicy6QGs= +k8s.io/api v0.24.17/go.mod h1:Ff5rnpz9qMj3/tXXA504wdk7Mf9zW3JSNWp5tf80VMQ= +k8s.io/apiextensions-apiserver v0.24.17/go.mod h1:pfP/opGI83rxfCajPW1oTeCrmu7dPqUDypMsQWVW5l4= +k8s.io/apimachinery v0.24.17 h1:mewWCeZ3Swr4EAfatVAhHXJHGzCHojphWA/5UJW4pPY= +k8s.io/apimachinery v0.24.17/go.mod h1:kSzhCwldu9XB172NDdLffRN0sJ3x95RR7Bmyc4SHhs0= +k8s.io/apiserver v0.24.17 h1:APbTxPHcOXkorGZXUtA8esA938W9choQA9z9NUDmqm4= +k8s.io/apiserver v0.24.17/go.mod h1:qr6HYxuodmqma+f4f2ck1lahy3bgJQ+8A17YPJKiJNg= +k8s.io/cli-runtime v0.24.17/go.mod h1:1+HmYYrLVUHH/3sKGFR3Te6dVlc02Mr1VYvSa1x8/lA= +k8s.io/client-go v0.24.17 h1:NqBXp0NNa6wYpg6VEeaeBc202OUdum6cd+R/OelhQCU= +k8s.io/client-go v0.24.17/go.mod h1:MPiIOfyXDQZXKHKZZh+MuY1huqJLNUAqARaJO6i4nwY= +k8s.io/cloud-provider v0.24.17 h1:GNCOb2NsbNDilDNJZOFFMlbIgd9UR4VjlNHPxkUYIT8= +k8s.io/cloud-provider v0.24.17/go.mod h1:/c8FpCIT8mJ7fszFDbV2Go9yC+Gquxu9ZX6EdIzSF6Q= +k8s.io/cluster-bootstrap v0.24.17/go.mod h1:UrOBPFdQlZPyWbrrLStSBSqm+6x1JrNbw3xaTsq+6YE= +k8s.io/code-generator v0.24.17 h1:arOfEzeIIHaq8gDtAiHmOUtZajubxUVtOUJeuOUFPAs= +k8s.io/code-generator v0.24.17/go.mod h1:nQvp6VgOfRkKiLyMz+/JTNXNS6Q4bGWOVtB5rKd2TV0= +k8s.io/component-base v0.24.17 h1:BY00bMItlHOeRydQDpE0txIbBqEjwBZ0mvPbY3IqJJc= +k8s.io/component-base v0.24.17/go.mod h1:75f8qsjuz9NxxI66S9NmHJwR2kMYUj4JtvrzC+7l3lo= +k8s.io/component-helpers v0.24.17 h1:rqYMHM170FulYKtienTmnkFzLIOkzUe7k8Ro/KTH83Y= +k8s.io/component-helpers v0.24.17/go.mod h1:J1jKEUypUVOIR7X6OvMK4nEzUgcD0Mx+jHt0I1TYz9Q= +k8s.io/controller-manager v0.24.17/go.mod h1:omLQjgRvJGNYbVk7YEuND4tmb4GGOTpO1tLEyzyopxU= +k8s.io/cri-api v0.24.17/go.mod h1:/KjYFI3BwY8/ytCQa0+Hla8FyGpDps88N45g4jet5I4= +k8s.io/csi-translation-lib v0.24.17 h1:HXgNffY1GcaRWyZbgUDyXv5UwwaxCqLhtEtxpcfiRIY= +k8s.io/csi-translation-lib v0.24.17/go.mod h1:1XyTSQCp/AEC26stnL7n+9yi3iG4W9HSS0m4e3jCkJw= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= @@ -2456,24 +2456,24 @@ k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAE k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-aggregator v0.24.15/go.mod h1:nXL5l4/YvRHuA5u8+S43hR/2waj5MPzoN5hiAGucGJ4= -k8s.io/kube-controller-manager v0.24.15/go.mod h1:ueERlQER5/eh8nFWaW85LLUcdmGpMfWZMHMaTCIZ/vU= +k8s.io/kube-aggregator v0.24.17/go.mod h1:ahofiS+bcn/8mdkLkdKA07+98uRlSMnRaQNos8WgmzQ= +k8s.io/kube-controller-manager v0.24.17/go.mod h1:jIGlwM5pOFRq/tEWymwHZ3hX5VgW13f0+/S7/rjuo3E= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/kube-proxy v0.24.15/go.mod h1:K6NqM4uC17E8TALRonDP/JoL7dfCQOX7NLS6lAKJ7qE= -k8s.io/kube-scheduler v0.24.15 h1:nDp4hkYQC28VS2eBHhTWQD1pzxVEH+yhZSrEwfZ+Ef0= -k8s.io/kube-scheduler v0.24.15/go.mod h1:q1o+4b4aA/Db6vK6wKSD2lPTjKNJ8hOEAEMuUpk81KM= -k8s.io/kubectl v0.24.15/go.mod h1:9yGQvq7RyIj11iVOTYaIsrSNXZrEfeX77EgykJ+gSUk= -k8s.io/kubelet v0.24.15/go.mod h1:ST1Ry8+xA0FajG3gPBXKiEK7JPCPqRJnefiua8NKjDc= +k8s.io/kube-proxy v0.24.17/go.mod h1:V7ZJrfCdd4+GdmFdOhORAfkEJt3eSYCvDu3jvjK/BIs= +k8s.io/kube-scheduler v0.24.17 h1:FW9PVsEKhedtnqCsqLTAcjWjP0wejbNTf3j4JuWNqk8= +k8s.io/kube-scheduler v0.24.17/go.mod h1:++hpW5iXo07cQbS/LG8qEZ3YrpcFhUhF9qpCNREbV7w= +k8s.io/kubectl v0.24.17/go.mod h1:bgeXUBOYEslf6vuCFkceB42v1cqVXdF1NA+OyZSq0oQ= +k8s.io/kubelet v0.24.17/go.mod h1:bbiL4dHOGB0SGLB+2rgx2WzmQB8awUkh/t35EWKc4OU= k8s.io/kubernetes v1.24.15 h1:FupxlSyYgbz22yjGVZ7dxH+azhuO0OU8MnACdydrBzQ= k8s.io/kubernetes v1.24.15/go.mod h1:MlcoxAWSYrfeOwlfRNne7zYyZsHmlT3dlw7v3xzDnDM= -k8s.io/legacy-cloud-providers v0.24.15/go.mod h1:sj/vZmVN9070GMNU9cuqSTupFI7ErHjT+bMXSc0rvac= -k8s.io/metrics v0.24.15/go.mod h1:0ZqaLxkIiopW4h1QfW5qaUZeajmLVxrwJJvWEljRYSM= -k8s.io/mount-utils v0.24.15 h1:q3sm4Gcp00iWXUInIEi5x8CqAmy2chmUTedIZdUxRkg= -k8s.io/mount-utils v0.24.15/go.mod h1:Xjtb0dquC5PG63kOD8shViqRczdkdQqW5Pc/rlmbsiU= -k8s.io/pod-security-admission v0.24.15/go.mod h1:P6OG7cc3DzmqN5Ydu7wx7+mJmNEZAulAgc5yATPY71U= -k8s.io/sample-apiserver v0.24.15/go.mod h1:ztKPKvVN/V1mHBZxe3rijzkggQ05nAJcXhtg2sDVv9c= +k8s.io/legacy-cloud-providers v0.24.17/go.mod h1:gpn4FHFlcBizCMl45BoQIPQpi9siR05ud0GSnb9pjlg= +k8s.io/metrics v0.24.17/go.mod h1:dSu9URQCTjBNfEKBD8hMXQZxGJP5sHbfflsHARcL71k= +k8s.io/mount-utils v0.24.17 h1:2d9RBp2lN8ayOvGcDYMuT9P4YMU4dGSgeVO9wNeo+Ok= +k8s.io/mount-utils v0.24.17/go.mod h1:Xjtb0dquC5PG63kOD8shViqRczdkdQqW5Pc/rlmbsiU= +k8s.io/pod-security-admission v0.24.17/go.mod h1:5BI5tmxPTDVETXjG20ozDRlGhzrbU/CXUep6gQOxilk= +k8s.io/sample-apiserver v0.24.17/go.mod h1:0TJRSfFu6UzS5N6EVtMIlJlPa3vkiO2QW8p9utpLAfk= k8s.io/system-validators v1.8.0/go.mod h1:gP1Ky+R9wtrSiFbrpEPwWMeYz9yqyy1S/KOh0Vci7WI= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 2f3144e7..c4c9dbbc 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -29,7 +29,7 @@ VERSION=v1alpha1 # --output-base because this script should also be able to run inside the vendor dir of # k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir # instead of the $GOPATH directly. For normal projects this can be dropped. -${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \ +source ${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \ ${CODE_REPO}/pkg/generated ${CODE_REPO}/pkg/apis \ ${GROUP}:${VERSION} \ --output-base "$(dirname ${BASH_SOURCE})/../../../.." \ diff --git a/vendor/k8s.io/api/core/v1/types.go b/vendor/k8s.io/api/core/v1/types.go index a139bec8..fcbebda5 100644 --- a/vendor/k8s.io/api/core/v1/types.go +++ b/vendor/k8s.io/api/core/v1/types.go @@ -4200,6 +4200,9 @@ const ( // LoadBalancerPortsError represents the condition of the requested ports // on the cloud load balancer instance. LoadBalancerPortsError = "LoadBalancerPortsError" + // LoadBalancerPortsErrorReason reason in ServiceStatus condition LoadBalancerPortsError + // means the LoadBalancer was not able to be configured correctly. + LoadBalancerPortsErrorReason = "LoadBalancerMixedProtocolNotSupported" ) // ServiceStatus represents the current status of a service. @@ -6546,6 +6549,13 @@ const ( PortForwardRequestIDHeader = "requestID" ) +const ( + // MixedProtocolNotSupported error in PortStatus means that the cloud provider + // can't publish the port on the load balancer because mixed values of protocols + // on the same LoadBalancer type of Service are not supported by the cloud provider. + MixedProtocolNotSupported = "MixedProtocolNotSupported" +) + // PortStatus represents the error condition of a service port type PortStatus struct { diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/converter.go b/vendor/k8s.io/apimachinery/pkg/runtime/converter.go index b640a9e7..6f8b66e2 100644 --- a/vendor/k8s.io/apimachinery/pkg/runtime/converter.go +++ b/vendor/k8s.io/apimachinery/pkg/runtime/converter.go @@ -231,7 +231,7 @@ func (c *fromUnstructuredContext) pushKey(key string) { } -// FromUnstructuredWIthValidation converts an object from map[string]interface{} representation into a concrete type. +// FromUnstructuredWithValidation converts an object from map[string]interface{} representation into a concrete type. // It uses encoding/json/Unmarshaler if object implements it or reflection if not. // It takes a validationDirective that indicates how to behave when it encounters unknown fields. func (c *unstructuredConverter) FromUnstructuredWithValidation(u map[string]interface{}, obj interface{}, returnUnknownFields bool) error { @@ -465,7 +465,7 @@ func sliceFromUnstructured(sv, dv reflect.Value, ctx *fromUnstructuredContext) e } dv.SetBytes(data) } else { - dv.Set(reflect.Zero(dt)) + dv.Set(reflect.MakeSlice(dt, 0, 0)) } return nil } diff --git a/vendor/k8s.io/mount-utils/mount_windows.go b/vendor/k8s.io/mount-utils/mount_windows.go index c7fcde5f..d96bf223 100644 --- a/vendor/k8s.io/mount-utils/mount_windows.go +++ b/vendor/k8s.io/mount-utils/mount_windows.go @@ -278,10 +278,16 @@ func (mounter *SafeFormatAndMount) formatAndMountSensitive(source string, target fstype = "NTFS" } - // format disk if it is unformatted(raw) - cmd := fmt.Sprintf("Get-Disk -Number %s | Where partitionstyle -eq 'raw' | Initialize-Disk -PartitionStyle GPT -PassThru"+ - " | New-Partition -UseMaximumSize | Format-Volume -FileSystem %s -Confirm:$false", source, fstype) - if output, err := mounter.Exec.Command("powershell", "/c", cmd).CombinedOutput(); err != nil { + cmdString := "Get-Disk -Number $env:source | Where partitionstyle -eq 'raw' | Initialize-Disk -PartitionStyle GPT -PassThru" + + " | New-Partition -UseMaximumSize | Format-Volume -FileSystem $env:fstype -Confirm:$false" + cmd := mounter.Exec.Command("powershell", "/c", cmdString) + env := append(os.Environ(), + fmt.Sprintf("source=%s", source), + fmt.Sprintf("fstype=%s", fstype), + ) + cmd.SetEnv(env) + klog.V(8).Infof("Executing command: %q", cmdString) + if output, err := cmd.CombinedOutput(); err != nil { return fmt.Errorf("diskMount: format disk failed, error: %v, output: %q", err, string(output)) } klog.V(4).Infof("diskMount: Disk successfully formatted, disk: %q, fstype: %q", source, fstype) @@ -303,8 +309,10 @@ func (mounter *SafeFormatAndMount) formatAndMountSensitive(source string, target // ListVolumesOnDisk - returns back list of volumes(volumeIDs) in the disk (requested in diskID). func listVolumesOnDisk(diskID string) (volumeIDs []string, err error) { - cmd := fmt.Sprintf("(Get-Disk -DeviceId %s | Get-Partition | Get-Volume).UniqueId", diskID) - output, err := exec.Command("powershell", "/c", cmd).CombinedOutput() + cmd := exec.Command("powershell", "/c", "(Get-Disk -DeviceId $env:diskID | Get-Partition | Get-Volume).UniqueId") + cmd.Env = append(os.Environ(), fmt.Sprintf("diskID=%s", diskID)) + klog.V(8).Infof("Executing command: %q", cmd.String()) + output, err := cmd.CombinedOutput() klog.V(4).Infof("listVolumesOnDisk id from %s: %s", diskID, string(output)) if err != nil { return []string{}, fmt.Errorf("error list volumes on disk. cmd: %s, output: %s, error: %v", cmd, string(output), err) diff --git a/vendor/modules.txt b/vendor/modules.txt index 39785edf..e5d52efc 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -427,7 +427,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.24.15 => k8s.io/api v0.24.15 +# k8s.io/api v0.24.17 => k8s.io/api v0.24.17 ## explicit; go 1.19 k8s.io/api/admissionregistration/v1 k8s.io/api/admissionregistration/v1beta1 @@ -474,7 +474,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apimachinery v0.24.15 => k8s.io/apimachinery v0.24.15 +# k8s.io/apimachinery v0.24.17 => k8s.io/apimachinery v0.24.17 ## explicit; go 1.19 k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta @@ -520,11 +520,11 @@ k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.24.15 => k8s.io/apiserver v0.24.15 +# k8s.io/apiserver v0.24.17 => k8s.io/apiserver v0.24.17 ## explicit; go 1.19 k8s.io/apiserver/pkg/features k8s.io/apiserver/pkg/util/feature -# k8s.io/client-go v0.24.15 => k8s.io/client-go v0.24.15 +# k8s.io/client-go v0.24.17 => k8s.io/client-go v0.24.17 ## explicit; go 1.19 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1 @@ -797,10 +797,10 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.24.15 => k8s.io/cloud-provider v0.24.15 +# k8s.io/cloud-provider v0.24.17 => k8s.io/cloud-provider v0.24.17 ## explicit; go 1.19 k8s.io/cloud-provider -# k8s.io/code-generator v0.24.15 => k8s.io/code-generator v0.24.15 +# k8s.io/code-generator v0.24.17 => k8s.io/code-generator v0.24.17 ## explicit; go 1.19 k8s.io/code-generator k8s.io/code-generator/cmd/client-gen @@ -835,7 +835,7 @@ k8s.io/code-generator/cmd/set-gen k8s.io/code-generator/pkg/namer k8s.io/code-generator/pkg/util k8s.io/code-generator/third_party/forked/golang/reflect -# k8s.io/component-base v0.24.15 => k8s.io/component-base v0.24.15 +# k8s.io/component-base v0.24.17 => k8s.io/component-base v0.24.17 ## explicit; go 1.19 k8s.io/component-base/cli/flag k8s.io/component-base/config @@ -846,7 +846,7 @@ k8s.io/component-base/logs/registry k8s.io/component-base/metrics k8s.io/component-base/metrics/legacyregistry k8s.io/component-base/version -# k8s.io/component-helpers v0.24.15 => k8s.io/component-helpers v0.24.15 +# k8s.io/component-helpers v0.24.17 => k8s.io/component-helpers v0.24.17 ## explicit; go 1.19 k8s.io/component-helpers/node/util/sysctl k8s.io/component-helpers/scheduling/corev1 @@ -886,10 +886,10 @@ k8s.io/kube-openapi/pkg/spec3 k8s.io/kube-openapi/pkg/util/proto k8s.io/kube-openapi/pkg/util/sets k8s.io/kube-openapi/pkg/validation/spec -# k8s.io/kube-scheduler v0.20.5 => k8s.io/kube-scheduler v0.24.15 +# k8s.io/kube-scheduler v0.20.5 => k8s.io/kube-scheduler v0.24.17 ## explicit; go 1.19 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubernetes v1.24.15 => k8s.io/kubernetes v1.24.15 +# k8s.io/kubernetes v1.24.17 => k8s.io/kubernetes v1.24.15 ## explicit; go 1.19 k8s.io/kubernetes/pkg/apis/core k8s.io/kubernetes/pkg/apis/core/helper @@ -914,7 +914,7 @@ k8s.io/kubernetes/pkg/volume/util/hostutil k8s.io/kubernetes/pkg/volume/util/recyclerclient k8s.io/kubernetes/pkg/volume/util/subpath k8s.io/kubernetes/pkg/volume/util/types -# k8s.io/mount-utils v0.24.15 => k8s.io/mount-utils v0.24.15 +# k8s.io/mount-utils v0.24.17 => k8s.io/mount-utils v0.24.17 ## explicit; go 1.19 k8s.io/mount-utils # k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 @@ -963,30 +963,30 @@ sigs.k8s.io/yaml # github.com/go-logr/logr => github.com/go-logr/logr v1.2.0 # github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1 # google.golang.org/grpc => google.golang.org/grpc v1.43.0 -# k8s.io/api => k8s.io/api v0.24.15 -# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.15 -# k8s.io/apimachinery => k8s.io/apimachinery v0.24.15 -# k8s.io/apiserver => k8s.io/apiserver v0.24.15 -# k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.15 -# k8s.io/client-go => k8s.io/client-go v0.24.15 -# k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.15 -# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.15 -# k8s.io/code-generator => k8s.io/code-generator v0.24.15 -# k8s.io/component-base => k8s.io/component-base v0.24.15 -# k8s.io/component-helpers => k8s.io/component-helpers v0.24.15 -# k8s.io/controller-manager => k8s.io/controller-manager v0.24.15 -# k8s.io/cri-api => k8s.io/cri-api v0.24.15 -# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.15 +# k8s.io/api => k8s.io/api v0.24.17 +# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.17 +# k8s.io/apimachinery => k8s.io/apimachinery v0.24.17 +# k8s.io/apiserver => k8s.io/apiserver v0.24.17 +# k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.17 +# k8s.io/client-go => k8s.io/client-go v0.24.17 +# k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.17 +# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.17 +# k8s.io/code-generator => k8s.io/code-generator v0.24.17 +# k8s.io/component-base => k8s.io/component-base v0.24.17 +# k8s.io/component-helpers => k8s.io/component-helpers v0.24.17 +# k8s.io/controller-manager => k8s.io/controller-manager v0.24.17 +# k8s.io/cri-api => k8s.io/cri-api v0.24.17 +# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.17 # k8s.io/klog/v2 => k8s.io/klog/v2 v2.60.1 -# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.15 -# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.15 -# k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.15 -# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.15 -# k8s.io/kubectl => k8s.io/kubectl v0.24.15 -# k8s.io/kubelet => k8s.io/kubelet v0.24.15 +# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.17 +# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.17 +# k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.17 +# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.17 +# k8s.io/kubectl => k8s.io/kubectl v0.24.17 +# k8s.io/kubelet => k8s.io/kubelet v0.24.17 # k8s.io/kubernetes => k8s.io/kubernetes v1.24.15 -# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.15 -# k8s.io/metrics => k8s.io/metrics v0.24.15 -# k8s.io/mount-utils => k8s.io/mount-utils v0.24.15 -# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.15 -# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.15 +# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.17 +# k8s.io/metrics => k8s.io/metrics v0.24.17 +# k8s.io/mount-utils => k8s.io/mount-utils v0.24.17 +# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.17 +# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.17