diff --git a/go.mod b/go.mod index 94dbc41937..60d8968487 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( k8s.io/component-base v0.30.2 k8s.io/klog/v2 v2.130.1 k8s.io/kube-aggregator v0.30.2 - k8s.io/kube-openapi v0.0.0-20240620174524-b456828f718b + k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2 k8s.io/metrics v0.30.2 k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 kmodules.xyz/client-go v0.30.9 @@ -40,7 +40,7 @@ require ( kmodules.xyz/custom-resources v0.30.0 kmodules.xyz/monitoring-agent-api v0.29.0 kmodules.xyz/objectstore-api v0.29.1 - kmodules.xyz/offshoot-api v0.29.5-0.20240705043904-bb118b293ce9 + kmodules.xyz/offshoot-api v0.30.0 kmodules.xyz/resource-metadata v0.18.10 kmodules.xyz/webhook-runtime v0.29.1 kubeops.dev/petset v0.0.6 diff --git a/go.sum b/go.sum index bda2635ea8..0307230452 100644 --- a/go.sum +++ b/go.sum @@ -632,8 +632,8 @@ k8s.io/kms v0.30.2 h1:VSZILO/tkzrz5Tu2j+yFQZ2Dc5JerQZX2GqhFJbQrfw= k8s.io/kms v0.30.2/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4= k8s.io/kube-aggregator v0.30.2 h1:0+yk/ED6foCprY8VmkDPUhngjaAPKsNTXB/UrtvbIz0= k8s.io/kube-aggregator v0.30.2/go.mod h1:EhqCfDdxysNWXk1wRL9SEHAdo1DKl6EULQagztkBcXE= -k8s.io/kube-openapi v0.0.0-20240620174524-b456828f718b h1:Q9xmGWBvOGd8UJyccgpYlLosk/JlfP3xQLNkQlHJeXw= -k8s.io/kube-openapi v0.0.0-20240620174524-b456828f718b/go.mod h1:UxDHUPsUwTOOxSU+oXURfFBcAS6JwiRXTYqYwfuGowc= +k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2 h1:T5TEV4a+pEjc+j9Xui3MGGeoDLIN6uzZrx8NYotFMgQ= +k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2/go.mod h1:UxDHUPsUwTOOxSU+oXURfFBcAS6JwiRXTYqYwfuGowc= k8s.io/metrics v0.30.2 h1:zj4kIPTCfEbY0RHEogpA7QtlItU7xaO11+Gz1zVDxlc= k8s.io/metrics v0.30.2/go.mod h1:GpoO5XTy/g8CclVLtgA5WTrr2Cy5vCsqr5Xa/0ETWIk= k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak= @@ -652,8 +652,8 @@ kmodules.xyz/monitoring-agent-api v0.29.0 h1:gpFl6OZrlMLb/ySMHdREI9EwGtnJ91oZBn9 kmodules.xyz/monitoring-agent-api v0.29.0/go.mod h1:iNbvaMTgVFOI5q2LJtGK91j4Dmjv4ZRiRdasGmWLKQI= kmodules.xyz/objectstore-api v0.29.1 h1:uUsjf8KU0w4LYowSEOnl0AbHT3hsHIu1wNLHqGe1o6s= kmodules.xyz/objectstore-api v0.29.1/go.mod h1:xG+5awH1SXYKxwN/+k1FEQvzixd5tgNqEN/1LEiB2FE= -kmodules.xyz/offshoot-api v0.29.5-0.20240705043904-bb118b293ce9 h1:untyw2D2PwFO6HpTCE2SU3ji48ZbU/u/I8ApTDRxumM= -kmodules.xyz/offshoot-api v0.29.5-0.20240705043904-bb118b293ce9/go.mod h1:e+NQ0s4gW/YTPWBWEfdISZcmk+tlTq8IjvP5SLdqvko= +kmodules.xyz/offshoot-api v0.30.0 h1:dq9F93pu4Q8rL9oTcCk+vGGy8vpS7RNt0GSwx7Bvhec= +kmodules.xyz/offshoot-api v0.30.0/go.mod h1:o9VoA3ImZMDBp3lpLb8+kc2d/KBxioRwCpaKDfLIyDw= kmodules.xyz/prober v0.29.0 h1:Ex7m4F9rH7uWNNJlLgP63ROOM+nUATJkC2L5OQ7nwMg= kmodules.xyz/prober v0.29.0/go.mod h1:UtK+HKyI1lFLEKX+HFLyOCVju6TO93zv3kwGpzqmKOo= kmodules.xyz/resource-metadata v0.18.10 h1:B0DAMsJJBuSOGCKzptZvB8AWcbxzDdUm+3CIE7g9ftE= diff --git a/vendor/k8s.io/kube-openapi/pkg/builder3/openapi.go b/vendor/k8s.io/kube-openapi/pkg/builder3/openapi.go index 081dae306f..0ce85af9f1 100644 --- a/vendor/k8s.io/kube-openapi/pkg/builder3/openapi.go +++ b/vendor/k8s.io/kube-openapi/pkg/builder3/openapi.go @@ -285,7 +285,10 @@ func (o *openAPI) buildOpenAPISpec(webServices []common.RouteContainer) error { sortParameters(pathItem.Parameters) for _, route := range routes { - op, _ := o.buildOperations(route, inPathCommonParamsMap) + op, err := o.buildOperations(route, inPathCommonParamsMap) + if err != nil { + return err + } sortParameters(op.Parameters) switch strings.ToUpper(route.Method()) { diff --git a/vendor/kmodules.xyz/offshoot-api/util/container.go b/vendor/kmodules.xyz/offshoot-api/util/container.go index abe4023ad0..3ac763ce74 100644 --- a/vendor/kmodules.xyz/offshoot-api/util/container.go +++ b/vendor/kmodules.xyz/offshoot-api/util/container.go @@ -1,3 +1,19 @@ +/* +Copyright AppsCode Inc. and Contributors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + package util import ( diff --git a/vendor/modules.txt b/vendor/modules.txt index c8c1fb2409..dfb53bdef6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1607,7 +1607,7 @@ k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1 k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1 -# k8s.io/kube-openapi v0.0.0-20240620174524-b456828f718b +# k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2 ## explicit; go 1.20 k8s.io/kube-openapi/pkg/builder k8s.io/kube-openapi/pkg/builder3 @@ -1705,7 +1705,7 @@ kmodules.xyz/monitoring-agent-api/api/v1 # kmodules.xyz/objectstore-api v0.29.1 ## explicit; go 1.21 kmodules.xyz/objectstore-api/api/v1 -# kmodules.xyz/offshoot-api v0.29.5-0.20240705043904-bb118b293ce9 +# kmodules.xyz/offshoot-api v0.30.0 ## explicit; go 1.22.0 kmodules.xyz/offshoot-api/api/v1 kmodules.xyz/offshoot-api/api/v1/conversion