kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #95836 from nodo/yaml-unmarshal-number 

Add yaml util to unmarshal numbers into int/float

Kubernetes-commit: 2e1d903b13edab9a446ab0e13bef3e8d3700e856
This commit is contained in:
Kubernetes Publisher 2020-10-26 10:25:27 -07:00
parent edaf00d2d0 b4becfdb04
commit a4c432c998
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@ -680,7 +680,7 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "554eef9dbf66"
"Rev": "3c73e5f9e724"
},
{
"ImportPath": "k8s.io/client-go",

4
go.mod
View File

@ -42,7 +42,7 @@ require (
gopkg.in/square/go-jose.v2 v2.2.2
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20201023125151-ccbd11b5dd0a
k8s.io/apimachinery v0.0.0-20201020200440-554eef9dbf66
k8s.io/apimachinery v0.0.0-20201026202000-3c73e5f9e724
k8s.io/client-go v0.0.0-20201020200834-d1a4fe5f2d96
k8s.io/component-base v0.0.0-20201020201314-b8c7ac1518d8
k8s.io/klog/v2 v2.2.0
@ -55,7 +55,7 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20201023125151-ccbd11b5dd0a
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201020200440-554eef9dbf66
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201026202000-3c73e5f9e724
k8s.io/client-go => k8s.io/client-go v0.0.0-20201020200834-d1a4fe5f2d96
k8s.io/component-base => k8s.io/component-base v0.0.0-20201020201314-b8c7ac1518d8
)

2
go.sum
View File

@ -517,7 +517,7 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
k8s.io/api v0.0.0-20201023125151-ccbd11b5dd0a/go.mod h1:ZstqwXfkQ55HZmXltK0DHYZaNJbMq4U/mnlyigw1pH0=
k8s.io/apimachinery v0.0.0-20201020200440-554eef9dbf66/go.mod h1:6s3VNb000AUbBIxR7q3WHlbBwfpEGqIJsCG5gIX+0LI=
k8s.io/apimachinery v0.0.0-20201026202000-3c73e5f9e724/go.mod h1:6s3VNb000AUbBIxR7q3WHlbBwfpEGqIJsCG5gIX+0LI=
k8s.io/client-go v0.0.0-20201020200834-d1a4fe5f2d96/go.mod h1:MEvNyY+iZEFaAPeMVco7LyFmysN3O9jX9QSKcacQ0O8=
k8s.io/component-base v0.0.0-20201020201314-b8c7ac1518d8/go.mod h1:/qyqddjukzwbk9MFz10nyuHMur+ykWBpJ1oweb8IDNE=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=

2
pkg/endpoints/handlers/patch.go
View File

@ -38,6 +38,7 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/apimachinery/pkg/util/yaml"
"k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/audit"
"k8s.io/apiserver/pkg/authorization/authorizer"
@ -49,7 +50,6 @@ import (
"k8s.io/apiserver/pkg/util/dryrun"
utilfeature "k8s.io/apiserver/pkg/util/feature"
utiltrace "k8s.io/utils/trace"
"sigs.k8s.io/yaml"
)
const (