Skip to content

Commit

Permalink
Merge pull request #249 from kubeservice-stack/update-k8s-version
Browse files Browse the repository at this point in the history
chores: update k8s package verison
  • Loading branch information
peter-wangxu authored Dec 18, 2023
2 parents 7951134 + c8007ef commit 833c992
Show file tree
Hide file tree
Showing 7 changed files with 134 additions and 116 deletions.
70 changes: 35 additions & 35 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down Expand Up @@ -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
Expand All @@ -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
)
72 changes: 36 additions & 36 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand All @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion hack/update-codegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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})/../../../.." \
Expand Down
10 changes: 10 additions & 0 deletions vendor/k8s.io/api/core/v1/types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/k8s.io/apimachinery/pkg/runtime/converter.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 14 additions & 6 deletions vendor/k8s.io/mount-utils/mount_windows.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 833c992

Please sign in to comment.