Merge pull request #110454 from ardaguclu/openapi-for-patch-evaluation

Use OpenAPI to determine patch type in kubectl apply patching

Kubernetes-commit: 799a06a0b36c00c9ae630ef2e981626fa512ec47
This commit is contained in:
Kubernetes Publisher 2022-08-23 16:04:48 -07:00
parent 89edfadfa3
commit f79d149237
2 changed files with 9 additions and 9 deletions

10
go.mod
View File

@ -29,10 +29,10 @@ require (
github.com/stretchr/testify v1.7.0
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20220807235320-860821164923
k8s.io/api v0.0.0-20220809235342-2e7b66171c20
k8s.io/apimachinery v0.0.0-20220805001719-117bd9b56ec3
k8s.io/cli-runtime v0.0.0-20220804203856-b48c51ece852
k8s.io/client-go v0.0.0-20220807235612-a890e7bc14d5
k8s.io/client-go v0.0.0-20220818223837-2e404084ad74
k8s.io/component-base v0.0.0-20220804202306-bd3841ae5bd6
k8s.io/component-helpers v0.0.0-20220804202405-ad3109323577
k8s.io/klog/v2 v2.70.1
@ -94,11 +94,11 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20220807235320-860821164923
k8s.io/api => k8s.io/api v0.0.0-20220809235342-2e7b66171c20
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220805001719-117bd9b56ec3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220804203856-b48c51ece852
k8s.io/client-go => k8s.io/client-go v0.0.0-20220807235612-a890e7bc14d5
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220804200942-97fa351e57d3
k8s.io/client-go => k8s.io/client-go v0.0.0-20220818223837-2e404084ad74
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220824022809-087714eb2255
k8s.io/component-base => k8s.io/component-base v0.0.0-20220804202306-bd3841ae5bd6
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220804202405-ad3109323577
k8s.io/metrics => k8s.io/metrics v0.0.0-20220804203745-0bf1725b4b86

8
go.sum
View File

@ -541,14 +541,14 @@ 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.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20220807235320-860821164923 h1:nDGbaAze/PQhS5Br0Q506rBEBVOlniVO7Mzjq1h9eOY=
k8s.io/api v0.0.0-20220807235320-860821164923/go.mod h1:cuE2+aKfcxEMeHx/NuUKIL3aRJhth7/K9wlCf+3Q3+s=
k8s.io/api v0.0.0-20220809235342-2e7b66171c20 h1:+1HZkTrpGkV9qYo5f80o5y+Jj7Czh6KcXW8ZjV4Did0=
k8s.io/api v0.0.0-20220809235342-2e7b66171c20/go.mod h1:cuE2+aKfcxEMeHx/NuUKIL3aRJhth7/K9wlCf+3Q3+s=
k8s.io/apimachinery v0.0.0-20220805001719-117bd9b56ec3 h1:Ru2oqar5qMV68dM0G6OEZs2C7qtydpReZ2dHsXpu/Kw=
k8s.io/apimachinery v0.0.0-20220805001719-117bd9b56ec3/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0=
k8s.io/cli-runtime v0.0.0-20220804203856-b48c51ece852 h1:jIB0rKV6fdXuN/fttQa5T0JCTHuOaT/1rWhiMccorL4=
k8s.io/cli-runtime v0.0.0-20220804203856-b48c51ece852/go.mod h1:Tvpth9pLpTuGtIJRXkHyiRV1aySWB4fkzO/eISsDbk4=
k8s.io/client-go v0.0.0-20220807235612-a890e7bc14d5 h1:BqsFtQcyMLlMSB4i+MKiQryECg6KwyLpNAoURVMbVe0=
k8s.io/client-go v0.0.0-20220807235612-a890e7bc14d5/go.mod h1:pPOa0mPr0yaIJIxznPOjENyC7fxgTWAR5VKGjQvNx70=
k8s.io/client-go v0.0.0-20220818223837-2e404084ad74 h1:bIC0qv76I3FV8kmjURUHhE7gHSV2KnH5gvadQ7utgag=
k8s.io/client-go v0.0.0-20220818223837-2e404084ad74/go.mod h1:2Rm3fcCGUvolAtl5MenH/hIpxsJu2HbofGvmGzIvE8w=
k8s.io/component-base v0.0.0-20220804202306-bd3841ae5bd6 h1:FHz479e22/WLD6+Tr3G+YWh5IVaJYocmPjizCb7chDU=
k8s.io/component-base v0.0.0-20220804202306-bd3841ae5bd6/go.mod h1:ij1d8OKrbGbeL3b7tnrEKOuN2itnGAl4CSinffjTRko=
k8s.io/component-helpers v0.0.0-20220804202405-ad3109323577 h1:r0ySqBj26jCSuvu55gA2r4RgtW16DteTm2AlKxA7+0M=