diff --git a/go.mod b/go.mod index 0c0a8500cd..9a7d847e0c 100644 --- a/go.mod +++ b/go.mod @@ -45,13 +45,13 @@ require ( k8s.io/api v0.27.2 k8s.io/apiextensions-apiserver v0.27.2 k8s.io/apimachinery v0.27.2 - k8s.io/apiserver v0.26.7 + k8s.io/apiserver v0.26.10 k8s.io/client-go v12.0.0+incompatible - k8s.io/cluster-bootstrap v0.26.7 - k8s.io/code-generator v0.26.7 - k8s.io/component-helpers v0.26.7 + k8s.io/cluster-bootstrap v0.26.10 + k8s.io/code-generator v0.26.10 + k8s.io/component-helpers v0.26.10 k8s.io/klog/v2 v2.100.1 - k8s.io/kube-aggregator v0.26.7 + k8s.io/kube-aggregator v0.26.10 k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515 k8s.io/utils v0.0.0-20230711102312-30195339c3c7 kubevirt.io/containerized-data-importer-api v0.0.0 @@ -165,34 +165,34 @@ replace ( github.com/openshift/library-go => github.com/mhenriks/library-go v0.0.0-20230310153733-63d38b55bd5a github.com/operator-framework/operator-lifecycle-manager => github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190128024246-5eb7ae5bdb7a - k8s.io/api => k8s.io/api v0.26.7 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.7 - k8s.io/apimachinery => k8s.io/apimachinery v0.26.7 - k8s.io/apiserver => k8s.io/apiserver v0.26.7 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.7 - k8s.io/client-go => k8s.io/client-go v0.26.7 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.7 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.7 - k8s.io/code-generator => k8s.io/code-generator v0.26.7 - k8s.io/component-base => k8s.io/component-base v0.26.7 - k8s.io/component-helpers => k8s.io/component-helpers v0.26.7 - k8s.io/controller-manager => k8s.io/controller-manager v0.26.7 - k8s.io/cri-api => k8s.io/cri-api v0.26.7 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.7 - k8s.io/dynamic-resource-allocation => dynamic-resource-allocation v0.26.7 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.7 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.7 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.7 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.7 - k8s.io/kubectl => k8s.io/kubectl v0.26.7 - k8s.io/kubelet => k8s.io/kubelet v0.26.7 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.7 - k8s.io/metrics => k8s.io/metrics v0.26.7 - k8s.io/mount-utils => k8s.io/mount-utils v0.26.7 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.7 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.7 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.7 - k8s.io/sample-controller => k8s.io/sample-controller v0.26.7 + k8s.io/api => k8s.io/api v0.26.10 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.10 + k8s.io/apimachinery => k8s.io/apimachinery v0.26.10 + k8s.io/apiserver => k8s.io/apiserver v0.26.10 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.10 + k8s.io/client-go => k8s.io/client-go v0.26.10 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.10 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.10 + k8s.io/code-generator => k8s.io/code-generator v0.26.10 + k8s.io/component-base => k8s.io/component-base v0.26.10 + k8s.io/component-helpers => k8s.io/component-helpers v0.26.10 + k8s.io/controller-manager => k8s.io/controller-manager v0.26.10 + k8s.io/cri-api => k8s.io/cri-api v0.26.10 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.10 + k8s.io/dynamic-resource-allocation => dynamic-resource-allocation v0.26.10 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.10 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.10 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.10 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.10 + k8s.io/kubectl => k8s.io/kubectl v0.26.10 + k8s.io/kubelet => k8s.io/kubelet v0.26.10 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.10 + k8s.io/metrics => k8s.io/metrics v0.26.10 + k8s.io/mount-utils => k8s.io/mount-utils v0.26.10 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.10 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.10 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.10 + k8s.io/sample-controller => k8s.io/sample-controller v0.26.10 kubevirt.io/containerized-data-importer-api => ./staging/src/kubevirt.io/containerized-data-importer-api kubevirt.io/controller-lifecycle-operator-sdk/api => kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90 diff --git a/go.sum b/go.sum index b963add3a7..c6ad50be8e 100644 --- a/go.sum +++ b/go.sum @@ -328,7 +328,7 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/cel-go v0.12.6/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw= +github.com/google/cel-go v0.12.7/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0= github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E= @@ -791,7 +791,7 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0/go.mod h1:9NiG9I2aHTKkcxqCILhjtyNA1QEiCjdBACv4IvrFQ+c= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1/go.mod h1:9NiG9I2aHTKkcxqCILhjtyNA1QEiCjdBACv4IvrFQ+c= go.opentelemetry.io/otel v1.0.1/go.mod h1:OPEOD4jIT2SlZPMmwT6FqZz2C0ZNdQqiWcoK6M0SNFU= go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= @@ -953,7 +953,6 @@ golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= @@ -1083,7 +1082,6 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1092,7 +1090,6 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= @@ -1108,7 +1105,6 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= @@ -1407,24 +1403,24 @@ 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.26.7 h1:Lf4iEBEJb5OFNmawtBfSZV/UNi9riSJ0t1qdhyZqI40= -k8s.io/api v0.26.7/go.mod h1:Vk9bMadzA49UHPmHB//lX7VRCQSXGoVwfLd3Sc1SSXI= -k8s.io/apiextensions-apiserver v0.26.7 h1:L7ImW831auK1ZQBtNJPaG5qyrFxeISEBlgfZJfnaIPk= -k8s.io/apiextensions-apiserver v0.26.7/go.mod h1:3DbZBfS3kO7/Jaj7qqzcBtPcKP0/KcklyAnk8zc+fs4= -k8s.io/apimachinery v0.26.7 h1:590jSBwaSHCAFCqltaEogY/zybFlhGsnLteLpuF2wig= -k8s.io/apimachinery v0.26.7/go.mod h1:qYzLkrQ9lhrZRh0jNKo2cfvf/R1/kQONnSiyB7NUJU0= -k8s.io/apiserver v0.26.7 h1:NX/zBZZn4R+Cq6shwyn8Pn8REd0yJJ16dbtv9WkEVEU= -k8s.io/apiserver v0.26.7/go.mod h1:r0wDRWHI7VL/KlQLTkJJBVGZ3KeNfv+VetlyRtr86xs= -k8s.io/client-go v0.26.7 h1:hyU9aKHlwVOykgyxzGYkrDSLCc4+mimZVyUJjPyUn1E= -k8s.io/client-go v0.26.7/go.mod h1:okYjy0jtq6sdeztALDvCh24tg4opOQS1XNvsJlERDAo= -k8s.io/cluster-bootstrap v0.26.7 h1:dABsfwfa6MzaAVjSbKBghzafwYMIU04xrxX7AVGMXNw= -k8s.io/cluster-bootstrap v0.26.7/go.mod h1:6niekEJNTZNfOvqLrJCqrhTdsjmEMMjAjsQBoEDWlZQ= -k8s.io/code-generator v0.26.7 h1:bZkIAVLFfhYOfMXb2nRb0xKFmBTI6o2phX/4Q0ay87g= -k8s.io/code-generator v0.26.7/go.mod h1:seNkA/wYpeG1GT1REW1xHk4MCjQcVbx6FFAXKwCgdlE= -k8s.io/component-base v0.26.7 h1:uqsOyZh0Zqoaup8tmHa491D/CvgFdGUs+X2H/inNUKM= -k8s.io/component-base v0.26.7/go.mod h1:CZe1HTmX/DQdeBrb9XYOXzs96jXth8ZbFvhLMsoJLUg= -k8s.io/component-helpers v0.26.7 h1:WWdNnJfRQcsxP1NCcMhGMpi9vdlOKPFzZzx48wREvzE= -k8s.io/component-helpers v0.26.7/go.mod h1:r98dtcDwYAv+awPp9hIS6Y35q+jX4YvpX1egBO0u8hw= +k8s.io/api v0.26.10 h1:skTnrDR0r8dg4MMLf6YZIzugxNM0BjFsWKPkNc5kOvk= +k8s.io/api v0.26.10/go.mod h1:ou/H3yviqrHtP/DSPVTfsc7qNfmU06OhajytJfYXkXw= +k8s.io/apiextensions-apiserver v0.26.10 h1:wAriTUc6l7gUqJKOxhmXnYo/VNJzk4oh4QLCUR4Uq+k= +k8s.io/apiextensions-apiserver v0.26.10/go.mod h1:N2qhlxkhJLSoC4f0M1/1lNG627b45SYqnOPEVFoQXw4= +k8s.io/apimachinery v0.26.10 h1:aE+J2KIbjctFqPp3Y0q4Wh2PD+l1p2g3Zp4UYjSvtGU= +k8s.io/apimachinery v0.26.10/go.mod h1:iT1ZP4JBP34wwM+ZQ8ByPEQ81u043iqAcsJYftX9amM= +k8s.io/apiserver v0.26.10 h1:gradpIHygzZN87yK+o6V3gpbCSF78HZ0hejLZQQwdDs= +k8s.io/apiserver v0.26.10/go.mod h1:TGrQKQWUfQcotK3P4TtoVZxXOWklFF36QZlA5wufLs4= +k8s.io/client-go v0.26.10 h1:4mDzl+1IrfRxh4Ro0s65JRGJp14w77gSMUTjACYWVRo= +k8s.io/client-go v0.26.10/go.mod h1:sh74ig838gCckU4ElYclWb24lTesPdEDPnlyg5vcbkA= +k8s.io/cluster-bootstrap v0.26.10 h1:NnzYDoT93W6Gq0Sd89tjyohAx4RvwgUZA6n5OFGLyQ4= +k8s.io/cluster-bootstrap v0.26.10/go.mod h1:vs5FhFkMwS2/uwxdG1xX9YG+CKD3W1fbyb4lOohhLqw= +k8s.io/code-generator v0.26.10 h1:YHyiMDqabyW+S4s6WglcfsUJMl5GlpNPoFEwrS7/tIY= +k8s.io/code-generator v0.26.10/go.mod h1:+IHzChHYqL6v5M5KVRglocWMzdSzH3I2jRXZK05yZ9I= +k8s.io/component-base v0.26.10 h1:vl3Gfe5aC09mNxfnQtTng7u3rnBVrShOK3MAkqEleb0= +k8s.io/component-base v0.26.10/go.mod h1:/IDdENUHG5uGxqcofZajovYXE9KSPzJ4yQbkYQt7oN0= +k8s.io/component-helpers v0.26.10 h1:KEwLNxzTE65R2kNz4UZ26h1G9O8xd6+iXVz7jkLgEYc= +k8s.io/component-helpers v0.26.10/go.mod h1:HYtL0UXL9zrYuuAmweYvHX/iQ0d0MURnvTOL3emC/r0= k8s.io/gengo v0.0.0-20181113154421-fd15ee9cc2f7/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= @@ -1440,9 +1436,9 @@ k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kms v0.26.7/go.mod h1:AYuV9ZebRhr6cb1eT9L6kZVxvgIUxmE1Fe6kPhqYvuc= -k8s.io/kube-aggregator v0.26.7 h1:ZEWNZARJjFnBtceoM+prHhSttN2nBZEu70T7o8hmbyk= -k8s.io/kube-aggregator v0.26.7/go.mod h1:qFjJii4RJzXFJTw41vGb6OZ+3YMUj7qbS4DAvfMF4/k= +k8s.io/kms v0.26.10/go.mod h1:3ZF23khJJAVfmT2K2kyiQN/kbqKpu2+ogecg9zY7Efk= +k8s.io/kube-aggregator v0.26.10 h1:ENztDiN6Vft9GQJDCfIcKjbRYKnkOvX7R3Jgsp8Az64= +k8s.io/kube-aggregator v0.26.10/go.mod h1:h6S7+JydG25zdghS1BwiQg07eVd0JJJyH7T+k32/tcM= k8s.io/kube-openapi v0.0.0-20181031203759-72693cb1fadd/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= diff --git a/vendor/k8s.io/api/apidiscovery/v2beta1/generated.proto b/vendor/k8s.io/api/apidiscovery/v2beta1/generated.proto index aa08b4978c..a09af750ba 100644 --- a/vendor/k8s.io/api/apidiscovery/v2beta1/generated.proto +++ b/vendor/k8s.io/api/apidiscovery/v2beta1/generated.proto @@ -71,7 +71,7 @@ message APIResourceDiscovery { // responseKind describes the group, version, and kind of the serialization schema for the object type this endpoint typically returns. // APIs may return other objects types at their discretion, such as error conditions, requests for alternate representations, or other operation specific behavior. - // This value will be null if an APIService reports subresources but supports no operations on the parent resource + // This value will be null or empty if an APIService reports subresources but supports no operations on the parent resource optional k8s.io.apimachinery.pkg.apis.meta.v1.GroupVersionKind responseKind = 2; // scope indicates the scope of a resource, either Cluster or Namespaced @@ -111,7 +111,7 @@ message APISubresourceDiscovery { optional string subresource = 1; // responseKind describes the group, version, and kind of the serialization schema for the object type this endpoint typically returns. - // Some subresources do not return normal resources, these will have null return types. + // Some subresources do not return normal resources, these will have null or empty return types. optional k8s.io.apimachinery.pkg.apis.meta.v1.GroupVersionKind responseKind = 2; // acceptedTypes describes the kinds that this endpoint accepts. diff --git a/vendor/k8s.io/api/apidiscovery/v2beta1/types.go b/vendor/k8s.io/api/apidiscovery/v2beta1/types.go index 1aff3e3702..8342937730 100644 --- a/vendor/k8s.io/api/apidiscovery/v2beta1/types.go +++ b/vendor/k8s.io/api/apidiscovery/v2beta1/types.go @@ -92,7 +92,7 @@ type APIResourceDiscovery struct { Resource string `json:"resource" protobuf:"bytes,1,opt,name=resource"` // responseKind describes the group, version, and kind of the serialization schema for the object type this endpoint typically returns. // APIs may return other objects types at their discretion, such as error conditions, requests for alternate representations, or other operation specific behavior. - // This value will be null if an APIService reports subresources but supports no operations on the parent resource + // This value will be null or empty if an APIService reports subresources but supports no operations on the parent resource ResponseKind *v1.GroupVersionKind `json:"responseKind,omitempty" protobuf:"bytes,2,opt,name=responseKind"` // scope indicates the scope of a resource, either Cluster or Namespaced Scope ResourceScope `json:"scope" protobuf:"bytes,3,opt,name=scope"` @@ -141,7 +141,7 @@ type APISubresourceDiscovery struct { // for this resource across all versions. Subresource string `json:"subresource" protobuf:"bytes,1,opt,name=subresource"` // responseKind describes the group, version, and kind of the serialization schema for the object type this endpoint typically returns. - // Some subresources do not return normal resources, these will have null return types. + // Some subresources do not return normal resources, these will have null or empty return types. ResponseKind *v1.GroupVersionKind `json:"responseKind,omitempty" protobuf:"bytes,2,opt,name=responseKind"` // acceptedTypes describes the kinds that this endpoint accepts. // Subresources may accept the standard content types or define diff --git a/vendor/k8s.io/api/batch/v1/generated.proto b/vendor/k8s.io/api/batch/v1/generated.proto index 09144d5867..5e8159731b 100644 --- a/vendor/k8s.io/api/batch/v1/generated.proto +++ b/vendor/k8s.io/api/batch/v1/generated.proto @@ -464,6 +464,7 @@ message PodFailurePolicyRule { // as a list of pod condition patterns. The requirement is satisfied if at // least one pattern matches an actual pod condition. At most 20 elements are allowed. // +listType=atomic + // +optional repeated PodFailurePolicyOnPodConditionsPattern onPodConditions = 3; } diff --git a/vendor/k8s.io/api/batch/v1/types.go b/vendor/k8s.io/api/batch/v1/types.go index f6361391b7..d298a02f25 100644 --- a/vendor/k8s.io/api/batch/v1/types.go +++ b/vendor/k8s.io/api/batch/v1/types.go @@ -190,6 +190,7 @@ type PodFailurePolicyRule struct { // as a list of pod condition patterns. The requirement is satisfied if at // least one pattern matches an actual pod condition. At most 20 elements are allowed. // +listType=atomic + // +optional OnPodConditions []PodFailurePolicyOnPodConditionsPattern `json:"onPodConditions" protobuf:"bytes,3,opt,name=onPodConditions"` } diff --git a/vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go b/vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go index d738725caf..3674914f70 100644 --- a/vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go +++ b/vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go @@ -126,14 +126,17 @@ type rudimentaryErrorBackoff struct { // OnError will block if it is called more often than the embedded period time. // This will prevent overly tight hot error loops. func (r *rudimentaryErrorBackoff) OnError(error) { + now := time.Now() // start the timer before acquiring the lock r.lastErrorTimeLock.Lock() - defer r.lastErrorTimeLock.Unlock() - d := time.Since(r.lastErrorTime) - if d < r.minPeriod { - // If the time moves backwards for any reason, do nothing - time.Sleep(r.minPeriod - d) - } + d := now.Sub(r.lastErrorTime) r.lastErrorTime = time.Now() + r.lastErrorTimeLock.Unlock() + + // Do not sleep with the lock held because that causes all callers of HandleError to block. + // We only want the current goroutine to block. + // A negative or zero duration causes time.Sleep to return immediately. + // If the time moves backwards for any reason, do nothing. + time.Sleep(r.minPeriod - d) } // GetCaller returns the caller of the function that calls it. diff --git a/vendor/k8s.io/client-go/discovery/aggregated_discovery.go b/vendor/k8s.io/client-go/discovery/aggregated_discovery.go index 7470259dc8..f72c42051b 100644 --- a/vendor/k8s.io/client-go/discovery/aggregated_discovery.go +++ b/vendor/k8s.io/client-go/discovery/aggregated_discovery.go @@ -111,6 +111,8 @@ func convertAPIGroup(g apidiscovery.APIGroupDiscovery) ( return group, gvResources, failedGVs } +var emptyKind = metav1.GroupVersionKind{} + // convertAPIResource tranforms a APIResourceDiscovery to an APIResource. We are // resilient to missing GVK, since this resource might be the parent resource // for a subresource. If the parent is missing a GVK, it is not returned in @@ -125,7 +127,7 @@ func convertAPIResource(in apidiscovery.APIResourceDiscovery) (metav1.APIResourc Categories: in.Categories, } var err error - if in.ResponseKind != nil { + if in.ResponseKind != nil && (*in.ResponseKind) != emptyKind { result.Group = in.ResponseKind.Group result.Version = in.ResponseKind.Version result.Kind = in.ResponseKind.Kind @@ -140,7 +142,7 @@ func convertAPIResource(in apidiscovery.APIResourceDiscovery) (metav1.APIResourc // convertAPISubresource tranforms a APISubresourceDiscovery to an APIResource. func convertAPISubresource(parent metav1.APIResource, in apidiscovery.APISubresourceDiscovery) (metav1.APIResource, error) { result := metav1.APIResource{} - if in.ResponseKind == nil { + if in.ResponseKind == nil || (*in.ResponseKind) == emptyKind { return result, fmt.Errorf("subresource %s/%s missing GVK", parent.Name, in.Subresource) } result.Name = fmt.Sprintf("%s/%s", parent.Name, in.Subresource) diff --git a/vendor/k8s.io/client-go/tools/record/event.go b/vendor/k8s.io/client-go/tools/record/event.go index 998bf8dfb6..926605975f 100644 --- a/vendor/k8s.io/client-go/tools/record/event.go +++ b/vendor/k8s.io/client-go/tools/record/event.go @@ -344,6 +344,9 @@ func (recorder *recorderImpl) generateEvent(object runtime.Object, annotations m event := recorder.makeEvent(ref, annotations, eventtype, reason, message) event.Source = recorder.source + event.ReportingInstance = recorder.source.Host + event.ReportingController = recorder.source.Component + // NOTE: events should be a non-blocking operation, but we also need to not // put this in a goroutine, otherwise we'll race to write to a closed channel // when we go to shut down this broadcaster. Just drop events if we get overloaded, diff --git a/vendor/k8s.io/client-go/util/cert/cert.go b/vendor/k8s.io/client-go/util/cert/cert.go index 43374a2f75..4ef02f09fe 100644 --- a/vendor/k8s.io/client-go/util/cert/cert.go +++ b/vendor/k8s.io/client-go/util/cert/cert.go @@ -45,6 +45,7 @@ type Config struct { Organization []string AltNames AltNames Usages []x509.ExtKeyUsage + NotBefore time.Time } // AltNames contains the domain names and IP addresses that will be added @@ -64,6 +65,10 @@ func NewSelfSignedCACert(cfg Config, key crypto.Signer) (*x509.Certificate, erro return nil, err } serial = new(big.Int).Add(serial, big.NewInt(1)) + notBefore := now.UTC() + if !cfg.NotBefore.IsZero() { + notBefore = cfg.NotBefore.UTC() + } tmpl := x509.Certificate{ SerialNumber: serial, Subject: pkix.Name{ @@ -71,7 +76,7 @@ func NewSelfSignedCACert(cfg Config, key crypto.Signer) (*x509.Certificate, erro Organization: cfg.Organization, }, DNSNames: []string{cfg.CommonName}, - NotBefore: now.UTC(), + NotBefore: notBefore, NotAfter: now.Add(duration365d * 10).UTC(), KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign, BasicConstraintsValid: true, diff --git a/vendor/modules.txt b/vendor/modules.txt index a23033b5a2..343c456c42 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -902,7 +902,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.27.2 => k8s.io/api v0.26.7 +# k8s.io/api v0.27.2 => k8s.io/api v0.26.10 ## explicit; go 1.19 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -958,7 +958,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apiextensions-apiserver v0.27.2 => k8s.io/apiextensions-apiserver v0.26.7 +# k8s.io/apiextensions-apiserver v0.27.2 => k8s.io/apiextensions-apiserver v0.26.10 ## explicit; go 1.19 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1 @@ -967,7 +967,7 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1 k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1 -# k8s.io/apimachinery v0.27.2 => k8s.io/apimachinery v0.26.7 +# k8s.io/apimachinery v0.27.2 => k8s.io/apimachinery v0.26.10 ## explicit; go 1.19 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1020,10 +1020,10 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.26.7 => k8s.io/apiserver v0.26.7 +# k8s.io/apiserver v0.26.10 => k8s.io/apiserver v0.26.10 ## explicit; go 1.19 k8s.io/apiserver/pkg/authentication/user -# k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.26.7 +# k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.26.10 ## explicit; go 1.19 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -1328,10 +1328,10 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cluster-bootstrap v0.26.7 => k8s.io/cluster-bootstrap v0.26.7 +# k8s.io/cluster-bootstrap v0.26.10 => k8s.io/cluster-bootstrap v0.26.10 ## explicit; go 1.19 k8s.io/cluster-bootstrap/token/api -# k8s.io/code-generator v0.26.7 => k8s.io/code-generator v0.26.7 +# k8s.io/code-generator v0.26.10 => k8s.io/code-generator v0.26.10 ## explicit; go 1.19 k8s.io/code-generator k8s.io/code-generator/cmd/client-gen @@ -1366,7 +1366,7 @@ k8s.io/code-generator/cmd/set-gen k8s.io/code-generator/pkg/namer k8s.io/code-generator/pkg/util k8s.io/code-generator/third_party/forked/golang/reflect -# k8s.io/component-base v0.26.10 => k8s.io/component-base v0.26.7 +# k8s.io/component-base v0.26.10 => k8s.io/component-base v0.26.10 ## explicit; go 1.19 k8s.io/component-base/config k8s.io/component-base/config/v1alpha1 @@ -1374,7 +1374,7 @@ k8s.io/component-base/metrics k8s.io/component-base/metrics/legacyregistry k8s.io/component-base/metrics/prometheusextension k8s.io/component-base/version -# k8s.io/component-helpers v0.26.7 => k8s.io/component-helpers v0.26.7 +# k8s.io/component-helpers v0.26.10 => k8s.io/component-helpers v0.26.10 ## explicit; go 1.19 k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity @@ -1399,7 +1399,7 @@ k8s.io/klog/v2/internal/clock k8s.io/klog/v2/internal/dbg k8s.io/klog/v2/internal/serialize k8s.io/klog/v2/internal/severity -# k8s.io/kube-aggregator v0.26.7 => k8s.io/kube-aggregator v0.26.7 +# k8s.io/kube-aggregator v0.26.10 => k8s.io/kube-aggregator v0.26.10 ## explicit; go 1.19 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/v1 @@ -1534,34 +1534,34 @@ sigs.k8s.io/yaml # github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20230324103026-3f1513df25e0 # github.com/openshift/library-go => github.com/mhenriks/library-go v0.0.0-20230310153733-63d38b55bd5a # github.com/operator-framework/operator-lifecycle-manager => github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190128024246-5eb7ae5bdb7a -# k8s.io/api => k8s.io/api v0.26.7 -# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.7 -# k8s.io/apimachinery => k8s.io/apimachinery v0.26.7 -# k8s.io/apiserver => k8s.io/apiserver v0.26.7 -# k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.7 -# k8s.io/client-go => k8s.io/client-go v0.26.7 -# k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.7 -# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.7 -# k8s.io/code-generator => k8s.io/code-generator v0.26.7 -# k8s.io/component-base => k8s.io/component-base v0.26.7 -# k8s.io/component-helpers => k8s.io/component-helpers v0.26.7 -# k8s.io/controller-manager => k8s.io/controller-manager v0.26.7 -# k8s.io/cri-api => k8s.io/cri-api v0.26.7 -# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.7 -# k8s.io/dynamic-resource-allocation => dynamic-resource-allocation v0.26.7 -# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.7 -# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.7 -# k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.7 -# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.7 -# k8s.io/kubectl => k8s.io/kubectl v0.26.7 -# k8s.io/kubelet => k8s.io/kubelet v0.26.7 -# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.7 -# k8s.io/metrics => k8s.io/metrics v0.26.7 -# k8s.io/mount-utils => k8s.io/mount-utils v0.26.7 -# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.7 -# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.7 -# k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.7 -# k8s.io/sample-controller => k8s.io/sample-controller v0.26.7 +# k8s.io/api => k8s.io/api v0.26.10 +# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.10 +# k8s.io/apimachinery => k8s.io/apimachinery v0.26.10 +# k8s.io/apiserver => k8s.io/apiserver v0.26.10 +# k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.10 +# k8s.io/client-go => k8s.io/client-go v0.26.10 +# k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.10 +# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.10 +# k8s.io/code-generator => k8s.io/code-generator v0.26.10 +# k8s.io/component-base => k8s.io/component-base v0.26.10 +# k8s.io/component-helpers => k8s.io/component-helpers v0.26.10 +# k8s.io/controller-manager => k8s.io/controller-manager v0.26.10 +# k8s.io/cri-api => k8s.io/cri-api v0.26.10 +# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.10 +# k8s.io/dynamic-resource-allocation => dynamic-resource-allocation v0.26.10 +# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.10 +# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.10 +# k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.10 +# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.10 +# k8s.io/kubectl => k8s.io/kubectl v0.26.10 +# k8s.io/kubelet => k8s.io/kubelet v0.26.10 +# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.10 +# k8s.io/metrics => k8s.io/metrics v0.26.10 +# k8s.io/mount-utils => k8s.io/mount-utils v0.26.10 +# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.10 +# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.10 +# k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.10 +# k8s.io/sample-controller => k8s.io/sample-controller v0.26.10 # kubevirt.io/containerized-data-importer-api => ./staging/src/kubevirt.io/containerized-data-importer-api # kubevirt.io/controller-lifecycle-operator-sdk/api => kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90 # sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.14.7