Skip to content

Commit b854558

Browse files
committed
bump kube-openapi to get validation fix
Signed-off-by: Evan <[email protected]>
1 parent 5cfa204 commit b854558

File tree

8 files changed

+41
-26
lines changed

8 files changed

+41
-26
lines changed

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ require (
4141
google.golang.org/grpc v1.30.0
4242
gopkg.in/yaml.v2 v2.4.0
4343
helm.sh/helm/v3 v3.1.0-rc.1.0.20201215141456-e71d38b414eb
44+
// can't update to 0.21 until https://github.com/kubernetes/apiserver/issues/65 is resolved
4445
k8s.io/api v0.20.6
4546
k8s.io/apiextensions-apiserver v0.20.6
4647
k8s.io/apimachinery v0.20.6
@@ -50,7 +51,7 @@ require (
5051
k8s.io/component-base v0.20.6
5152
k8s.io/klog v1.0.0
5253
k8s.io/kube-aggregator v0.20.4
53-
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
54+
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
5455
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009
5556
rsc.io/letsencrypt v0.0.3 // indirect
5657
sigs.k8s.io/controller-runtime v0.8.3

go.sum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1439,8 +1439,9 @@ k8s.io/kube-aggregator v0.20.4 h1:j/SUwPy1eO+ud3XOUGmH18gISPyerqhXOoNRZDbv3fs=
14391439
k8s.io/kube-aggregator v0.20.4/go.mod h1:0ixQ9De7KXyHteXizS6nVtrnKqGa4kiuxl9rEBsNccw=
14401440
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
14411441
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
1442-
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c=
14431442
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
1443+
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7BrMc/KQBBT/Jyee8XtLf4x0=
1444+
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
14441445
k8s.io/kubectl v0.18.0/go.mod h1:LOkWx9Z5DXMEg5KtOjHhRiC1fqJPLyCr3KtQgEolCkU=
14451446
k8s.io/kubectl v0.20.0 h1:q6HH6jILYi2lkzFqBhs63M4bKLxYlM0HpFJ///MgARA=
14461447
k8s.io/kubectl v0.20.0/go.mod h1:8x5GzQkgikz7M2eFGGuu6yOfrenwnw5g4RXOUgbjR1M=

pkg/controller/operators/catalog/operator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1600,7 +1600,7 @@ func validateExistingCRs(dynamicClient dynamic.Interface, gvr schema.GroupVersio
16001600
}
16011601
err = validation.ValidateCustomResource(field.NewPath(""), cr.UnstructuredContent(), validator).ToAggregate()
16021602
if err != nil {
1603-
return fmt.Errorf("error validating custom resource against new schema: %v", err)
1603+
return fmt.Errorf("error validating custom resource against new schema for %s %s/%s: %v", newCRD.Spec.Names.Kind, cr.GetNamespace(), cr.GetName(), err)
16041604
}
16051605
}
16061606
return nil

pkg/controller/operators/catalog/operator_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1338,7 +1338,7 @@ func TestValidateExistingCRs(t *testing.T) {
13381338
Resource: "machinepools",
13391339
},
13401340
newCRD: unversionedCRDForV1beta1File("testdata/hivebug/crd.yaml"),
1341-
want: fmt.Errorf("error validating custom resource against new schema: [[].spec.clusterDeploymentRef: Invalid value: \"null\": spec.clusterDeploymentRef in body must be of type object: \"null\", [].spec.name: Required value, [].spec.platform: Required value]"),
1341+
want: fmt.Errorf("error validating custom resource against new schema for MachinePool /test: [[].spec.clusterDeploymentRef: Invalid value: \"null\": spec.clusterDeploymentRef in body must be of type object: \"null\", [].spec.name: Required value, [].spec.platform: Required value]"),
13421342
},
13431343
}
13441344
for _, tt := range tests {

vendor/k8s.io/kube-openapi/pkg/schemaconv/smd.go

Lines changed: 28 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kube-openapi/pkg/util/util.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kube-openapi/pkg/validation/validate/type.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1463,7 +1463,7 @@ k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1b
14631463
k8s.io/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces
14641464
k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1
14651465
k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1beta1
1466-
# k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
1466+
# k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
14671467
## explicit
14681468
k8s.io/kube-openapi/cmd/openapi-gen
14691469
k8s.io/kube-openapi/cmd/openapi-gen/args

0 commit comments

Comments
 (0)