From 3757373c42575c2b4a83a163f530fd57b284e5cf Mon Sep 17 00:00:00 2001 From: Fabio Bertinatto Date: Mon, 24 Jan 2022 08:47:49 -0300 Subject: [PATCH] Bug 2040793: Fix ordering issues with snapshot e2e --- go.mod | 58 +++++----- go.sum | 101 ++++++++--------- vendor/k8s.io/cloud-provider/go.mod | 3 +- vendor/k8s.io/cloud-provider/go.sum | 7 +- vendor/k8s.io/csi-translation-lib/go.sum | 4 +- .../kubernetes/pkg/features/kube_features.go | 8 +- .../test/e2e/apimachinery/aggregator.go | 5 + .../test/e2e/storage/drivers/in_tree.go | 17 ++- .../e2e/storage/testsuites/snapshottable.go | 76 +++++++------ .../openstack/openstack.go | 19 +++- vendor/k8s.io/mount-utils/go.mod | 2 +- vendor/k8s.io/mount-utils/go.sum | 4 +- vendor/k8s.io/utils/clock/clock.go | 10 ++ .../k8s.io/utils/clock/testing/fake_clock.go | 6 +- vendor/k8s.io/utils/inotify/inotify_linux.go | 6 +- vendor/modules.txt | 104 +++++++++--------- 16 files changed, 243 insertions(+), 187 deletions(-) diff --git a/go.mod b/go.mod index 95b4a3d7746b..936d5bdc94c4 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,7 @@ require ( k8s.io/kubelet v0.23.0 k8s.io/kubernetes v1.23.0 k8s.io/legacy-cloud-providers v0.23.0 - k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b + k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 sigs.k8s.io/kustomize/kyaml v0.13.0 sigs.k8s.io/yaml v1.2.0 ) @@ -80,32 +80,32 @@ require ( replace ( github.com/google/cadvisor => github.com/google/cadvisor v0.43.0 github.com/onsi/ginkgo => github.com/openshift/onsi-ginkgo v4.7.0-origin.0+incompatible - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/kubernetes => github.com/openshift/kubernetes v1.22.2-0.20220114054557-60f5a1c6c03d - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20220112121240-50f645e1e0b1 - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20220112121240-50f645e1e0b1 + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20220122223210-06791f6ef855 + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20220122223210-06791f6ef855 + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20220122223210-06791f6ef855 + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20220122223210-06791f6ef855 + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20220122223210-06791f6ef855 + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20220122223210-06791f6ef855 + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20220122223210-06791f6ef855 + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20220122223210-06791f6ef855 + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20220122223210-06791f6ef855 + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20220122223210-06791f6ef855 + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20220122223210-06791f6ef855 + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20220122223210-06791f6ef855 + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20220122223210-06791f6ef855 + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20220122223210-06791f6ef855 + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20220122223210-06791f6ef855 + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20220122223210-06791f6ef855 + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20220122223210-06791f6ef855 + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20220122223210-06791f6ef855 + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20220122223210-06791f6ef855 + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20220122223210-06791f6ef855 + k8s.io/kubernetes => github.com/openshift/kubernetes v1.22.2-0.20220122223210-06791f6ef855 + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20220122223210-06791f6ef855 + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20220122223210-06791f6ef855 + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20220122223210-06791f6ef855 + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20220122223210-06791f6ef855 + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20220122223210-06791f6ef855 + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20220122223210-06791f6ef855 + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20220122223210-06791f6ef855 ) diff --git a/go.sum b/go.sum index 8ee2d58efa7e..6b868937d6da 100644 --- a/go.sum +++ b/go.sum @@ -677,55 +677,55 @@ github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3 h1:65 github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3 h1:SG1aqwleU6bGD0X4mhkTNupjVnByMYYuW4XbnCPavQU= github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3/go.mod h1:cwhyki5lqBmrT0m8Im+9I7PGFaraOzcYPtEz93RcsGY= -github.com/openshift/kubernetes v1.22.2-0.20220114054557-60f5a1c6c03d h1:tz25wWaq1PLkKzwkBUbcMRsH4dGcqRCdrn8X/wJMCeY= -github.com/openshift/kubernetes v1.22.2-0.20220114054557-60f5a1c6c03d/go.mod h1:9nUtihjOhsDH3Y+2WKU5wZGV++5F8EyoQtrRdDq/DJ8= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20220112121240-50f645e1e0b1 h1:zULJ3P9ispgIp5OtssZBh3y84vNQKzzHjmfyRK41lAw= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:qPx2Ct0udgi8Jr5qNVWayzUkyOdONn20k5aGWcuHFUw= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20220112121240-50f645e1e0b1 h1:bgM7rlGca9eQRCam7OpR3Ec7433qPZtmrMiFP5qntXY= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:/6MomG++tBRQKRbdhkIBPxByhZkAeW4ui9WNtyCSpr8= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20220112121240-50f645e1e0b1 h1:dcc7PbnPBdcNlLE0QhN3Cd5T5uNtzrZ12lahkz22wfM= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:dBZfKqzJ4/TmFXU5gbydgIlS9sQtiqC7rL0kPRC5MlQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20220112121240-50f645e1e0b1 h1:qiw++CRyvHS27JWwhI5/BeHAzYwubzhhrfF8kBho4Ts= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:jxooV1O3MPLGYlLY4aVVz24ZcKsaZSymnCZ4B907jTs= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20220112121240-50f645e1e0b1 h1:Og4zvqoxyOPnOekquJtFg0JLAgzsbaoYa9h2oqKAKuY= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:OykAuKPDvj9X0+VRIN13vPgKXajovxK5yKhsalvcU3c= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20220112121240-50f645e1e0b1 h1:C9Wqotm26OS6s1Jy3IToSQOsZ5aZDUCmiJIS+Awtors= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:PqC6wVnxfrXmHgz7nRHeEg54EHNGFC2c5QIQpz54a5o= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20220112121240-50f645e1e0b1 h1:EEw/UnjBFuLvIM8w6xeyyQPcvch1J8HgUvxFNfFmEnc= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:OmV7DwLryyaMKuaLUq1GR0wXQBnOyRqARbybvtDCvtk= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20220112121240-50f645e1e0b1 h1:2UPyBLxDK6YuvG89Dx5lNrr508jp3ETo6+l6+9uuNzI= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:cEGmFrDZKIcxPHfNHEXs78PycQFhKxPA3wAg4DDmpXU= -github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:W+BLx0It8rbMID9SuNzmEQ+96Edi/7TH6RhOrDe3aiA= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20220112121240-50f645e1e0b1 h1:6+UMJYouKL8AXku3+UYpJ/hq/i7WvWecraAtr7Nm43Q= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:4Q2xT7Verx2Mp3Ij4UmA9PNvt2h8v+Bl33ZUW2GwZ6k= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20220112121240-50f645e1e0b1 h1:AyasKMs97SK0uIUESmlJqjRJU6qRppp4BePQFMSslsU= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:tKVhi4DhL/mruHcaeAWdy64FZqFQKUp7CRSdOjkNJSQ= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:zW624gBc+LBVGvu1cX0OtDUb9TTkF6bcvbcCvCjx4QY= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20220112121240-50f645e1e0b1 h1:VJWMrLRsuIZsfNJEMFpwrZ00nTQgSpdqJjk9r+Ra7Ws= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:MdrV/MkTPRaJ+bG8XuRK2RR+x58/I1mbamKvWi/9aco= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20220112121240-50f645e1e0b1 h1:VA6BsETExDfytqigkdxmtGwFE6lPj108Aue2tCk69Hk= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:oaAPMqAqDbNjvI48ZexkOuxcUOqlFpUmb4ws3Gt5NyE= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20220112121240-50f645e1e0b1 h1:9g49d3YkZsns/pp0HQsqxLJb755Dj18DPBHjWNqRAtM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:kbsjd03lseQ/axUax1xcvXRNA9FW+CwlLD+sG+Wb/ag= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:RcLU53PSFlHoUahOOKcof1ARC5o2XQJygmRM430gQc4= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20220112121240-50f645e1e0b1 h1:WyIH1Mk9Kqt+Fs01yuynaLxsD1hdrBnTdhajSZxihrc= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:hRnzkpGom/+BRDxkP3jVV3H9T9NwQYDO+HHi09k4B80= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20220112121240-50f645e1e0b1 h1:Wx1pgTva37rGCKTiPWjN/vSR3M0Y+qQ4RU5aOYmnlrQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:5nQ8IkNcVhBmQCs00ns6+ndgvTZclF0LjiC/GU+owDk= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20220112121240-50f645e1e0b1 h1:DOLBQQKohYxaRlr9xhRNoE+3cOpFqQr6Xo5F/E6wFvY= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:H2GIqjdonZhI955Hb/DVFPOKoyEAPDUm/tq/T2VYEQo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20220112121240-50f645e1e0b1 h1:cmgwhQQLEe/8CQQaeVTEUIn5wra42IsgEHk67gaDtlw= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:EBYAeEgtR3dNfKsLSIiOY61Akn2D42TLjqBUPMotBy0= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20220112121240-50f645e1e0b1 h1:svEwgwNl4G0Eut5ScJLmlxkoGTtkImnVd/WV2tO07zs= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:6utfjd8cE2urUoyljGhjKWFqgRjeYEqmqwFLO3zvxiA= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20220112121240-50f645e1e0b1 h1:VTIcNCKg6SQxs3kcHacKta4e0vt6x98uaaXhh46AHTU= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:xAVwtgiVhNIxxc6v5lkP6eIpDKaoa+6y6GZRUeEOkiY= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20220112121240-50f645e1e0b1 h1:M/+px4PK2xk9c/sthLl6Ca/R3u67Qth+oemMrdQPWLg= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:FbJzLaBCgXxxrav6nLEomwadqLy+MoslwIUj010NoGA= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20220112121240-50f645e1e0b1 h1:mmYE07DJpSL32RcR3u20E8b7QG+YnyOqXSIJ9bxQu4I= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:UnD6PnsLPWngTacW+D9YrOWW36tNW4W2RnLXpqvI8bA= -github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20220112121240-50f645e1e0b1 h1:yNJjWjxTNGOpSAC6RLgX3Aviopm4SrEU4G0ragJZpvc= -github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20220112121240-50f645e1e0b1/go.mod h1:D91elnOp1XmRGLY5xtC4ouM8ODQ8oKQsYZ/JrXyHZ/Q= +github.com/openshift/kubernetes v1.22.2-0.20220122223210-06791f6ef855 h1:jQiRa0HNzWMUn94TCMkUDw2RX7EoEP36FNJO5d20ePI= +github.com/openshift/kubernetes v1.22.2-0.20220122223210-06791f6ef855/go.mod h1:PTZX29QqS0IjhBtrKgbK4eRkPXBX2C/E4rWsD59s+bs= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20220122223210-06791f6ef855 h1:5xJ73wVvF5YQYayt0Cl1C5VTxXWjDwA4lc8OilFJFDc= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20220122223210-06791f6ef855/go.mod h1:H/9b7ip6nGE6HD0RvmKI74wAk7zLVR3P534O1VZUfQ8= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20220122223210-06791f6ef855 h1:R/CaDswblNziy3+YYmnYh90E8kIWjusSN6jozjYpogQ= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20220122223210-06791f6ef855/go.mod h1:miXgjIaNyRZSnIFFCrdYrOV/wNxmMs5R9BZ+L57AEkY= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20220122223210-06791f6ef855 h1:GbELz0y6ORxqqM9bur6HvgkHNA4RvH5b2HoV8e33x6M= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20220122223210-06791f6ef855/go.mod h1:fq/W4bPzq9iQIql9phSmYEu4yxX6NVwNWsfDOf2zUVM= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20220122223210-06791f6ef855 h1:JaoK5M2vCPBEcLfSTuOHDXupUBxrlGCv/7TcX2U29z0= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20220122223210-06791f6ef855/go.mod h1:vi1FiG32JrzJYnadVynRrDMSZcwMdfnP4O8UvAqIg2Q= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20220122223210-06791f6ef855 h1:pIAvCO4obA3TCL+1WChHzKcRB1OHgvPq2r/BNKiNX08= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20220122223210-06791f6ef855/go.mod h1:NpW0nIoYBfi4gLZI4wJGgV9wstf0I2eKL3CihLssjws= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20220122223210-06791f6ef855 h1:KlbQjzzE7UITWxwItYxkoKXv/YbFryEEind/QP8kN0g= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20220122223210-06791f6ef855/go.mod h1:cLN7/QX6+j+a9IBpBsxT5rb56Fq3dhSIxWUa/p2HmyE= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20220122223210-06791f6ef855 h1:HYSZ5wQbJEwJfNjKfQfw7TJH4MJs+UviRkEd7fTnugc= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20220122223210-06791f6ef855/go.mod h1:eGv/+bRPT56nI9Egp/N+9S98YQVgUf1JSTT+h1NmhBQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20220122223210-06791f6ef855 h1:6cdIGHi4TTOcA7aA0XO32oziiSt9L80clUmbo/ADXUo= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20220122223210-06791f6ef855/go.mod h1:cEGmFrDZKIcxPHfNHEXs78PycQFhKxPA3wAg4DDmpXU= +github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20220122223210-06791f6ef855/go.mod h1:W+BLx0It8rbMID9SuNzmEQ+96Edi/7TH6RhOrDe3aiA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20220122223210-06791f6ef855 h1:V7RoqHcol+gldBR8/jeAy9nv8KsZaSxD83xoQ7BBsGA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20220122223210-06791f6ef855/go.mod h1:I61lEV0P7rifkn9RX9K+yUUh8WNY5TpJCKHj4URKKuA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20220122223210-06791f6ef855 h1:YBrnABqW1JQ4vYvZOMOfs4Q0p27EDEUWSdyrsHhj+xA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20220122223210-06791f6ef855/go.mod h1:nH1LfZS3JImglkjB9pcETzSBW2SwmuRAJ48j6XSZoHk= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20220122223210-06791f6ef855/go.mod h1:biIhdchHjUbnzB/fSlmsD9ZnRwq7+alU01QpudpA+hk= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20220122223210-06791f6ef855 h1:RrEtdLmIBA83bL2w0qwFqITAl9MCfmVx3LxKbbnTVfg= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20220122223210-06791f6ef855/go.mod h1:MdrV/MkTPRaJ+bG8XuRK2RR+x58/I1mbamKvWi/9aco= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20220122223210-06791f6ef855 h1:dq/9xV29d1D+tlTO8i1e3p062cWNUQWNObqmaf8hJQM= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20220122223210-06791f6ef855/go.mod h1:oaAPMqAqDbNjvI48ZexkOuxcUOqlFpUmb4ws3Gt5NyE= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20220122223210-06791f6ef855 h1:aGqnGifVHV3X4Gr3WyqxiT6rXTgrnkK+I31LIKLJo1Y= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20220122223210-06791f6ef855/go.mod h1:z3q5HTDkDRzwpPk2GMCYpLic+vnWEkUr3i/8d+t8u5s= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20220122223210-06791f6ef855/go.mod h1:RcLU53PSFlHoUahOOKcof1ARC5o2XQJygmRM430gQc4= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20220122223210-06791f6ef855 h1:oZayo9J8+QpLIZqqZFaVTD8lyl3+QasyTOoovyvDtM4= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20220122223210-06791f6ef855/go.mod h1:hRnzkpGom/+BRDxkP3jVV3H9T9NwQYDO+HHi09k4B80= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20220122223210-06791f6ef855 h1:rYjBY1nCmiO1Ru1WgFoIk8viMEwsqUp1LWbVRW9JSPg= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20220122223210-06791f6ef855/go.mod h1:5nQ8IkNcVhBmQCs00ns6+ndgvTZclF0LjiC/GU+owDk= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20220122223210-06791f6ef855 h1:/rHV9YihZm/skK3pzwsRDECqN5O5RZoKNnuxcKPUA7M= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20220122223210-06791f6ef855/go.mod h1:FLMqHIs4mdeFgXT94Tp8OrAMnFjBpdIinFH76BvgcmM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20220122223210-06791f6ef855 h1:6PmS2uBJsWun8Gxt4mqgostyQe0IRWwUPyjJfHSiXB0= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20220122223210-06791f6ef855/go.mod h1:EBYAeEgtR3dNfKsLSIiOY61Akn2D42TLjqBUPMotBy0= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20220122223210-06791f6ef855 h1:aWb3YaVgvIFWLDBgTWbCfxw15AIslydlzanyceHGCVo= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20220122223210-06791f6ef855/go.mod h1:khdYt6VAe9zCSAxDOcrXq1jc37kiEoGTwoElJwgDGmY= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20220122223210-06791f6ef855 h1:jw2t0dZdQ6vMp883/HKubmaf9pnHhMe9puzChzgVr0A= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20220122223210-06791f6ef855/go.mod h1:xAVwtgiVhNIxxc6v5lkP6eIpDKaoa+6y6GZRUeEOkiY= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20220122223210-06791f6ef855 h1:mNpzDfQiTHrbXiPkgk8dzKpd9mALhtOERh/qf6k9rmI= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20220122223210-06791f6ef855/go.mod h1:DG+CNoz+fy4fW5tDD5aRo/3W+UN2IYStBJKqrfMTE9g= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20220122223210-06791f6ef855 h1:iNsnIL2qzQUU+0BxlTTAL3Dk3kc/hsS+720m2Vk7QiQ= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20220122223210-06791f6ef855/go.mod h1:PF/yZGrrIZcvCes4pFEt2Cy+VMUtciftg0A0Fr5gVT8= +github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20220122223210-06791f6ef855 h1:81/hqiNA6wYal4RP7xJd2GwLuwBGGdT+gSbisovrY/4= +github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20220122223210-06791f6ef855/go.mod h1:GOiGjB4jymJr5ZUfZbII4CtU3uvYRIR4Vc+P1I43LIA= github.com/openshift/library-go v0.0.0-20211209153216-ed9bc958bd8a/go.mod h1:M/Gi/GUUrMdSS07nrYtTiK43J6/VUAyk/+IfN4ZqUY4= github.com/openshift/library-go v0.0.0-20220111125907-7f25b9c7ad22 h1:yi4NoYekLpqHqatGMwashmyxui0mI3AcoWMPozuCZfA= github.com/openshift/library-go v0.0.0-20220111125907-7f25b9c7ad22/go.mod h1:4UQ9snU1vg53fyTpHQw3vLPiAxI8ub5xrc+y8KPQQFs= @@ -1471,8 +1471,9 @@ k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lV k8s.io/system-validators v1.6.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b h1:wxEMGetGMur3J1xuGLQY7GEQYg9bZxKn3tKo5k/eYcs= k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 h1:ZKMMxTvduyf5WUtREOqg5LiXaN1KO/+0oOQPRFrClpo= +k8s.io/utils v0.0.0-20211208161948-7d6a63dca704/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= diff --git a/vendor/k8s.io/cloud-provider/go.mod b/vendor/k8s.io/cloud-provider/go.mod index 59e9491ce731..381f1998abe4 100644 --- a/vendor/k8s.io/cloud-provider/go.mod +++ b/vendor/k8s.io/cloud-provider/go.mod @@ -17,10 +17,11 @@ require ( k8s.io/component-helpers v0.0.0 k8s.io/controller-manager v0.0.0 k8s.io/klog/v2 v2.30.0 - k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b + k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 ) replace ( + github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.33.2-0.20220117214446-bb33a1245805 github.com/hashicorp/golang-lru => github.com/hashicorp/golang-lru v0.5.0 github.com/imdario/mergo => github.com/imdario/mergo v0.3.5 github.com/mattn/go-colorable => github.com/mattn/go-colorable v0.0.9 diff --git a/vendor/k8s.io/cloud-provider/go.sum b/vendor/k8s.io/cloud-provider/go.sum index f4dbbbe11149..1688a1d63ba1 100644 --- a/vendor/k8s.io/cloud-provider/go.sum +++ b/vendor/k8s.io/cloud-provider/go.sum @@ -299,7 +299,6 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/cadvisor v0.43.0/go.mod h1:+RdMSbc3FVr5NYCD2dOEJy/LI0jYJ/0xJXkzWXEyiFQ= github.com/google/cel-go v0.9.0/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w= github.com/google/cel-spec v0.6.0/go.mod h1:Nwjgxy5CbjlPrtCWjeDjUyKMl8w41YBYGjsyDdqk0xA= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -507,6 +506,7 @@ github.com/openshift/build-machinery-go v0.0.0-20210806203541-4ea9b6da3a37/go.mo github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3/go.mod h1:cwhyki5lqBmrT0m8Im+9I7PGFaraOzcYPtEz93RcsGY= github.com/openshift/ginkgo v4.7.0-origin.0+incompatible h1:2qD1n/RAnycWMPjYS6MEAUzRmVoF0ql7ozk1ANv8dcM= github.com/openshift/ginkgo v4.7.0-origin.0+incompatible/go.mod h1:8METQ1gDhl0KW+pGH4c0DIJYEN/ksVCL6hOuHPmXGnk= +github.com/openshift/google-cadvisor v0.33.2-0.20220117214446-bb33a1245805/go.mod h1:47c+5L5BDKnwggEQuhDguDv4YIFyV+pZ0L6H50nRXks= github.com/openshift/library-go v0.0.0-20211209153216-ed9bc958bd8a h1:MoAaYFrzB5QlYzO7phyjx/JBxghUrLitwb69RaulRAs= github.com/openshift/library-go v0.0.0-20211209153216-ed9bc958bd8a/go.mod h1:M/Gi/GUUrMdSS07nrYtTiK43J6/VUAyk/+IfN4ZqUY4= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= @@ -1191,10 +1191,11 @@ k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKb k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= k8s.io/kubernetes v1.23.0/go.mod h1:sgD3+Qzb8FHlRKlZnNCN+np3zZuHEAb/0PKLJkYyCUI= k8s.io/system-validators v1.6.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q= -k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b h1:wxEMGetGMur3J1xuGLQY7GEQYg9bZxKn3tKo5k/eYcs= k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 h1:ZKMMxTvduyf5WUtREOqg5LiXaN1KO/+0oOQPRFrClpo= +k8s.io/utils v0.0.0-20211208161948-7d6a63dca704/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= diff --git a/vendor/k8s.io/csi-translation-lib/go.sum b/vendor/k8s.io/csi-translation-lib/go.sum index b0220df29184..a707262ecec8 100644 --- a/vendor/k8s.io/csi-translation-lib/go.sum +++ b/vendor/k8s.io/csi-translation-lib/go.sum @@ -212,8 +212,8 @@ k8s.io/klog/v2 v2.30.0 h1:bUO6drIvCIsvZ/XFgfxoGFQU/a4Qkh0iAlvUR7vlHJw= k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b h1:wxEMGetGMur3J1xuGLQY7GEQYg9bZxKn3tKo5k/eYcs= -k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 h1:ZKMMxTvduyf5WUtREOqg5LiXaN1KO/+0oOQPRFrClpo= +k8s.io/utils v0.0.0-20211208161948-7d6a63dca704/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno= diff --git a/vendor/k8s.io/kubernetes/pkg/features/kube_features.go b/vendor/k8s.io/kubernetes/pkg/features/kube_features.go index a4916e987ec3..bcc80f8fd44d 100644 --- a/vendor/k8s.io/kubernetes/pkg/features/kube_features.go +++ b/vendor/k8s.io/kubernetes/pkg/features/kube_features.go @@ -882,17 +882,17 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS TopologyManager: {Default: true, PreRelease: featuregate.Beta}, StorageObjectInUseProtection: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.25 CSIMigration: {Default: true, PreRelease: featuregate.Beta}, - CSIMigrationGCE: {Default: false, PreRelease: featuregate.Beta}, // OCP(storage team): force off by default, requires explicit opt-in via FeatureGate CR. Please until it's GA. https://github.com/openshift/enhancements/pull/549 + CSIMigrationGCE: {Default: true, PreRelease: featuregate.Beta}, // On by default in 1.23 (requires GCE PD CSI Driver) InTreePluginGCEUnregister: {Default: false, PreRelease: featuregate.Alpha}, - CSIMigrationAWS: {Default: false, PreRelease: featuregate.Beta}, // OCP(storage team): force off by default, requires explicit opt-in via FeatureGate CR. Please until it's GA. https://github.com/openshift/enhancements/pull/549 + CSIMigrationAWS: {Default: true, PreRelease: featuregate.Beta}, InTreePluginAWSUnregister: {Default: false, PreRelease: featuregate.Alpha}, - CSIMigrationAzureDisk: {Default: false, PreRelease: featuregate.Beta}, // OCP(storage team): force off by default, requires explicit opt-in via FeatureGate CR. Please until it's GA. https://github.com/openshift/enhancements/pull/549 + CSIMigrationAzureDisk: {Default: true, PreRelease: featuregate.Beta}, // On by default in 1.23 (requires Azure Disk CSI driver) InTreePluginAzureDiskUnregister: {Default: false, PreRelease: featuregate.Alpha}, CSIMigrationAzureFile: {Default: false, PreRelease: featuregate.Beta}, // Off by default (requires Azure File CSI driver) InTreePluginAzureFileUnregister: {Default: false, PreRelease: featuregate.Alpha}, CSIMigrationvSphere: {Default: false, PreRelease: featuregate.Beta}, // Off by default (requires vSphere CSI driver) InTreePluginvSphereUnregister: {Default: false, PreRelease: featuregate.Alpha}, - CSIMigrationOpenStack: {Default: false, PreRelease: featuregate.Beta}, // OCP(storage team): force off by default, requires explicit opt-in via FeatureGate CR. Please until it's GA. https://github.com/openshift/enhancements/pull/549 + CSIMigrationOpenStack: {Default: true, PreRelease: featuregate.Beta}, InTreePluginOpenStackUnregister: {Default: false, PreRelease: featuregate.Alpha}, CSIMigrationRBD: {Default: false, PreRelease: featuregate.Alpha}, // Off by default (requires RBD CSI driver) InTreePluginRBDUnregister: {Default: false, PreRelease: featuregate.Alpha}, diff --git a/vendor/k8s.io/kubernetes/test/e2e/apimachinery/aggregator.go b/vendor/k8s.io/kubernetes/test/e2e/apimachinery/aggregator.go index 6616a45cd8d3..0c5be7417d00 100644 --- a/vendor/k8s.io/kubernetes/test/e2e/apimachinery/aggregator.go +++ b/vendor/k8s.io/kubernetes/test/e2e/apimachinery/aggregator.go @@ -107,6 +107,11 @@ func cleanTest(client clientset.Interface, aggrclient *aggregatorclient.Clientse // delete the APIService first to avoid causing discovery errors _ = aggrclient.ApiregistrationV1().APIServices().Delete(context.TODO(), "v1alpha1.wardle.example.com", metav1.DeleteOptions{}) + // this simple sleep makes sure that the sample api server was unregistered from all Kube APIs before tearing down the deployment (otherwise it could make the test to fail) + // a more expensive way of doing it would be checking if the sample server was unregistered from all deployed Kube API servers before tearing down the deployment. + framework.Logf("sleeping 45 seconds before deleting the sample-apiserver deployment, see %q for more", "https://bugzilla.redhat.com/show_bug.cgi?id=1933144") + time.Sleep(time.Second * 45) + _ = client.AppsV1().Deployments(namespace).Delete(context.TODO(), "sample-apiserver-deployment", metav1.DeleteOptions{}) _ = client.CoreV1().Secrets(namespace).Delete(context.TODO(), "sample-apiserver-secret", metav1.DeleteOptions{}) _ = client.CoreV1().Services(namespace).Delete(context.TODO(), "sample-api", metav1.DeleteOptions{}) diff --git a/vendor/k8s.io/kubernetes/test/e2e/storage/drivers/in_tree.go b/vendor/k8s.io/kubernetes/test/e2e/storage/drivers/in_tree.go index 554dbb5328e7..afb1487304df 100644 --- a/vendor/k8s.io/kubernetes/test/e2e/storage/drivers/in_tree.go +++ b/vendor/k8s.io/kubernetes/test/e2e/storage/drivers/in_tree.go @@ -1491,10 +1491,19 @@ func (v *vSphereDriver) GetDynamicProvisionStorageClass(config *storageframework func (v *vSphereDriver) PrepareTest(f *framework.Framework) (*storageframework.PerTestConfig, func()) { return &storageframework.PerTestConfig{ - Driver: v, - Prefix: "vsphere", - Framework: f, - }, func() {} + Driver: v, + Prefix: "vsphere", + Framework: f, + }, func() { + // Driver Cleanup function + // Logout each vSphere client connection to prevent session leakage + nodes := vspheretest.GetReadySchedulableNodeInfos() + for _, node := range nodes { + if node.VSphere.Client != nil { + node.VSphere.Client.Logout(context.TODO()) + } + } + } } func (v *vSphereDriver) CreateVolume(config *storageframework.PerTestConfig, volType storageframework.TestVolType) storageframework.TestVolume { diff --git a/vendor/k8s.io/kubernetes/test/e2e/storage/testsuites/snapshottable.go b/vendor/k8s.io/kubernetes/test/e2e/storage/testsuites/snapshottable.go index c797e3847c0d..0519b8d7af6d 100644 --- a/vendor/k8s.io/kubernetes/test/e2e/storage/testsuites/snapshottable.go +++ b/vendor/k8s.io/kubernetes/test/e2e/storage/testsuites/snapshottable.go @@ -142,14 +142,13 @@ func (s *snapshottableTestSuite) DefineTests(driver storageframework.TestDriver, ginkgo.By("[init] starting a pod to use the claim") originalMntTestData = fmt.Sprintf("hello from %s namespace", f.Namespace.Name) - command := fmt.Sprintf("echo '%s' > %s", originalMntTestData, datapath) + // After writing data to a file `sync` flushes the data from memory to disk. + // sync is available in the Linux and Windows versions of agnhost. + command := fmt.Sprintf("echo '%s' > %s; sync", originalMntTestData, datapath) pod = StartInPodWithVolumeSource(cs, *volumeResource.VolSource, f.Namespace.Name, "pvc-snapshottable-tester", command, config.ClientNodeSelection) - cleanupSteps = append(cleanupSteps, func() { - e2epod.DeletePodWithWait(cs, pod) - }) - // At this point a pod is running with a PVC. How to proceed depends on which test is running. + // At this point a pod is created with a PVC. How to proceed depends on which test is running. } cleanup := func() { @@ -178,6 +177,11 @@ func (s *snapshottableTestSuite) DefineTests(driver storageframework.TestDriver, } init() + // delete the pod at the end of the test + cleanupSteps = append(cleanupSteps, func() { + e2epod.DeletePodWithWait(cs, pod) + }) + // We can test snapshotting of generic // ephemeral volumes by creating the snapshot // while the pod is running (online). We cannot do it after pod deletion, @@ -308,36 +312,31 @@ func (s *snapshottableTestSuite) DefineTests(driver storageframework.TestDriver, } init() + pvc = volumeResource.Pvc + sc = volumeResource.Sc + + // The pod should be in the Success state. + ginkgo.By("[init] check pod success") + pod, err = cs.CoreV1().Pods(pod.Namespace).Get(context.TODO(), pod.Name, metav1.GetOptions{}) + framework.ExpectNoError(err, "Failed to fetch pod: %v", err) framework.ExpectNoError(e2epod.WaitForPodSuccessInNamespaceTimeout(cs, pod.Name, pod.Namespace, f.Timeouts.PodStartSlow)) + // Sync the pod to know additional fields. pod, err = cs.CoreV1().Pods(pod.Namespace).Get(context.TODO(), pod.Name, metav1.GetOptions{}) - framework.ExpectNoError(err, "check pod after it terminated") + framework.ExpectNoError(err, "Failed to fetch pod: %v", err) - // Get new copy of the claim ginkgo.By("[init] checking the claim") - pvcName := volumeResource.Pvc.Name - pvcNamespace := volumeResource.Pvc.Namespace - - parameters := map[string]string{} - sr := storageframework.CreateSnapshotResource(sDriver, config, pattern, pvcName, pvcNamespace, f.Timeouts, parameters) - cleanupSteps = append(cleanupSteps, func() { - framework.ExpectNoError(sr.CleanupResource(f.Timeouts)) - }) - vs := sr.Vs - vsc := sr.Vsclass - - err = e2epv.WaitForPersistentVolumeClaimPhase(v1.ClaimBound, cs, pvcNamespace, pvcName, framework.Poll, f.Timeouts.ClaimProvision) + err = e2epv.WaitForPersistentVolumeClaimPhase(v1.ClaimBound, cs, pvc.Namespace, pvc.Name, framework.Poll, f.Timeouts.ClaimProvision) + framework.ExpectNoError(err) + // Get new copy of the claim. + pvc, err = cs.CoreV1().PersistentVolumeClaims(pvc.Namespace).Get(context.TODO(), pvc.Name, metav1.GetOptions{}) framework.ExpectNoError(err) - pvc, err = cs.CoreV1().PersistentVolumeClaims(pvcNamespace).Get(context.TODO(), pvcName, metav1.GetOptions{}) - framework.ExpectNoError(err, "get PVC") - claimSize = pvc.Spec.Resources.Requests.Storage().String() - sc = volumeResource.Sc - - // Get the bound PV + // Get the bound PV. ginkgo.By("[init] checking the PV") pv, err := cs.CoreV1().PersistentVolumes().Get(context.TODO(), pvc.Spec.VolumeName, metav1.GetOptions{}) framework.ExpectNoError(err) + // Delete the pod to force NodeUnpublishVolume (unlike the ephemeral case where the pod is deleted at the end of the test). ginkgo.By("[init] deleting the pod") StopPod(cs, pod) @@ -386,6 +385,15 @@ func (s *snapshottableTestSuite) DefineTests(driver storageframework.TestDriver, framework.Failf("timed out waiting for node=%s to not use the volume=%s", nodeName, volumeName) } + // Take the snapshot. + parameters := map[string]string{} + sr := storageframework.CreateSnapshotResource(sDriver, config, pattern, pvc.Name, pvc.Namespace, f.Timeouts, parameters) + cleanupSteps = append(cleanupSteps, func() { + framework.ExpectNoError(sr.CleanupResource(f.Timeouts)) + }) + vs := sr.Vs + vsc := sr.Vsclass + // Get new copy of the snapshot ginkgo.By("checking the snapshot") vs, err = dc.Resource(storageutils.SnapshotGVR).Namespace(vs.GetNamespace()).Get(context.TODO(), vs.GetName(), metav1.GetOptions{}) @@ -400,9 +408,6 @@ func (s *snapshottableTestSuite) DefineTests(driver storageframework.TestDriver, snapshotContentSpec := vscontent.Object["spec"].(map[string]interface{}) volumeSnapshotRef := snapshotContentSpec["volumeSnapshotRef"].(map[string]interface{}) - var restoredPVC *v1.PersistentVolumeClaim - var restoredPod *v1.Pod - // Check SnapshotContent properties ginkgo.By("checking the SnapshotContent") // PreprovisionedCreatedSnapshot do not need to set volume snapshot class name @@ -413,14 +418,19 @@ func (s *snapshottableTestSuite) DefineTests(driver storageframework.TestDriver, framework.ExpectEqual(volumeSnapshotRef["namespace"], vs.GetNamespace()) ginkgo.By("Modifying source data test") + var restoredPVC *v1.PersistentVolumeClaim + var restoredPod *v1.Pod modifiedMntTestData := fmt.Sprintf("modified data from %s namespace", pvc.GetNamespace()) ginkgo.By("modifying the data in the source PVC") - command := fmt.Sprintf("echo '%s' > %s", modifiedMntTestData, datapath) + // After writing data to a file `sync` flushes the data from memory to disk. + // sync is available in the Linux and Windows versions of agnhost. + command := fmt.Sprintf("echo '%s' > %s; sync", modifiedMntTestData, datapath) RunInPodWithVolume(cs, f.Timeouts, pvc.Namespace, pvc.Name, "pvc-snapshottable-data-tester", command, config.ClientNodeSelection) ginkgo.By("creating a pvc from the snapshot") + claimSize = pvc.Spec.Resources.Requests.Storage().String() restoredPVC = e2epv.MakePersistentVolumeClaim(e2epv.PersistentVolumeClaimConfig{ ClaimSize: claimSize, StorageClassName: &(sc.Name), @@ -451,11 +461,9 @@ func (s *snapshottableTestSuite) DefineTests(driver storageframework.TestDriver, StopPod(cs, restoredPod) }) framework.ExpectNoError(e2epod.WaitTimeoutForPodRunningInNamespace(cs, restoredPod.Name, restoredPod.Namespace, f.Timeouts.PodStartSlow)) - if pattern.VolType != storageframework.GenericEphemeralVolume { - commands := e2evolume.GenerateReadFileCmd(datapath) - _, err = framework.LookForStringInPodExec(restoredPod.Namespace, restoredPod.Name, commands, originalMntTestData, time.Minute) - framework.ExpectNoError(err) - } + commands := e2evolume.GenerateReadFileCmd(datapath) + _, err = framework.LookForStringInPodExec(restoredPod.Namespace, restoredPod.Name, commands, originalMntTestData, time.Minute) + framework.ExpectNoError(err) ginkgo.By("should delete the VolumeSnapshotContent according to its deletion policy") diff --git a/vendor/k8s.io/legacy-cloud-providers/openstack/openstack.go b/vendor/k8s.io/legacy-cloud-providers/openstack/openstack.go index 7805bcd812ab..f479dca232e8 100644 --- a/vendor/k8s.io/legacy-cloud-providers/openstack/openstack.go +++ b/vendor/k8s.io/legacy-cloud-providers/openstack/openstack.go @@ -46,9 +46,11 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" netutil "k8s.io/apimachinery/pkg/util/net" + "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/informers" corelistersv1 "k8s.io/client-go/listers/core/v1" certutil "k8s.io/client-go/util/cert" + "k8s.io/client-go/util/retry" cloudprovider "k8s.io/cloud-provider" nodehelpers "k8s.io/cloud-provider/node/helpers" "k8s.io/klog/v2" @@ -280,7 +282,22 @@ func (os *OpenStack) setConfigFromSecret() error { return fmt.Errorf("secret lister is not initialized") } - secret, err := os.secretLister.Secrets(os.secretNamespace).Get(os.secretName) + var secret *v1.Secret + err := retry.OnError( + wait.Backoff{ + Duration: time.Second, + Factor: 1.5, + Jitter: 1, + Steps: 10, + }, + func(_ error) bool { + return true + }, + func() (err error) { + secret, err = os.secretLister.Secrets(os.secretNamespace).Get(os.secretName) + return err + }, + ) if err != nil { klog.Errorf("cannot get secret %s in namespace %s. error: %q", os.secretName, os.secretNamespace, err) return err diff --git a/vendor/k8s.io/mount-utils/go.mod b/vendor/k8s.io/mount-utils/go.mod index 26832a019556..5d5bf4f66783 100644 --- a/vendor/k8s.io/mount-utils/go.mod +++ b/vendor/k8s.io/mount-utils/go.mod @@ -11,7 +11,7 @@ require ( gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect k8s.io/klog/v2 v2.30.0 - k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b + k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 ) replace k8s.io/mount-utils => ../mount-utils diff --git a/vendor/k8s.io/mount-utils/go.sum b/vendor/k8s.io/mount-utils/go.sum index a0b89aa0f349..f678f6381c4d 100644 --- a/vendor/k8s.io/mount-utils/go.sum +++ b/vendor/k8s.io/mount-utils/go.sum @@ -28,5 +28,5 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.30.0 h1:bUO6drIvCIsvZ/XFgfxoGFQU/a4Qkh0iAlvUR7vlHJw= k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b h1:wxEMGetGMur3J1xuGLQY7GEQYg9bZxKn3tKo5k/eYcs= -k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 h1:ZKMMxTvduyf5WUtREOqg5LiXaN1KO/+0oOQPRFrClpo= +k8s.io/utils v0.0.0-20211208161948-7d6a63dca704/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= diff --git a/vendor/k8s.io/utils/clock/clock.go b/vendor/k8s.io/utils/clock/clock.go index dd181ce8d8b0..b8b6af5c817f 100644 --- a/vendor/k8s.io/utils/clock/clock.go +++ b/vendor/k8s.io/utils/clock/clock.go @@ -63,6 +63,16 @@ type WithDelayedExecution interface { AfterFunc(d time.Duration, f func()) Timer } +// WithTickerAndDelayedExecution allows for injecting fake or real clocks +// into code that needs Ticker and AfterFunc functionality +type WithTickerAndDelayedExecution interface { + WithTicker + // AfterFunc executes f in its own goroutine after waiting + // for d duration and returns a Timer whose channel can be + // closed by calling Stop() on the Timer. + AfterFunc(d time.Duration, f func()) Timer +} + // Ticker defines the Ticker interface. type Ticker interface { C() <-chan time.Time diff --git a/vendor/k8s.io/utils/clock/testing/fake_clock.go b/vendor/k8s.io/utils/clock/testing/fake_clock.go index fb493c4babaa..a2b42bbcf6d5 100644 --- a/vendor/k8s.io/utils/clock/testing/fake_clock.go +++ b/vendor/k8s.io/utils/clock/testing/fake_clock.go @@ -282,9 +282,9 @@ func (*IntervalClock) Tick(d time.Duration) <-chan time.Time { // NewTicker has no implementation yet and is omitted. // TODO: make interval clock use FakeClock so this can be implemented. -//func (*IntervalClock) NewTicker(d time.Duration) clock.Ticker { -// panic("IntervalClock doesn't implement NewTicker") -//} +func (*IntervalClock) NewTicker(d time.Duration) clock.Ticker { + panic("IntervalClock doesn't implement NewTicker") +} // Sleep is unimplemented, will panic. func (*IntervalClock) Sleep(d time.Duration) { diff --git a/vendor/k8s.io/utils/inotify/inotify_linux.go b/vendor/k8s.io/utils/inotify/inotify_linux.go index 6258277c9659..2963042e4745 100644 --- a/vendor/k8s.io/utils/inotify/inotify_linux.go +++ b/vendor/k8s.io/utils/inotify/inotify_linux.go @@ -120,7 +120,11 @@ func (w *Watcher) RemoveWatch(path string) error { } success, errno := syscall.InotifyRmWatch(w.fd, watch.wd) if success == -1 { - return os.NewSyscallError("inotify_rm_watch", errno) + // when file descriptor or watch descriptor not found, InotifyRmWatch syscall return EINVAL error + // if return error, it may lead this path remain in watches and paths map, and no other event can trigger remove action. + if errno != syscall.EINVAL { + return os.NewSyscallError("inotify_rm_watch", errno) + } } delete(w.watches, path) // Locking here to protect the read from paths in readEvents. diff --git a/vendor/modules.txt b/vendor/modules.txt index fe6b3fc18907..0e3514887c56 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1508,7 +1508,7 @@ gopkg.in/warnings.v0 gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b gopkg.in/yaml.v3 -# k8s.io/api v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/api v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20220122223210-06791f6ef855 ## explicit k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1558,7 +1558,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.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/apiextensions-apiserver v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20220122223210-06791f6ef855 ## explicit k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1605,7 +1605,7 @@ k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition k8s.io/apiextensions-apiserver/test/integration k8s.io/apiextensions-apiserver/test/integration/fixtures k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model -# k8s.io/apimachinery v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/apimachinery v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20220122223210-06791f6ef855 ## explicit k8s.io/apimachinery/pkg/api/apitesting k8s.io/apimachinery/pkg/api/equality @@ -1669,7 +1669,7 @@ 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.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/apiserver v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20220122223210-06791f6ef855 ## explicit k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1815,12 +1815,12 @@ k8s.io/apiserver/plugin/pkg/audit/webhook k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook -# k8s.io/cli-runtime v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/cli-runtime v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20220122223210-06791f6ef855 ## explicit k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/client-go v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20220122223210-06791f6ef855 ## explicit k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1 @@ -2124,7 +2124,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/cloud-provider v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20220122223210-06791f6ef855 k8s.io/cloud-provider k8s.io/cloud-provider/api k8s.io/cloud-provider/credentialconfig @@ -2133,12 +2133,12 @@ k8s.io/cloud-provider/service/helpers k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/errors k8s.io/cloud-provider/volume/helpers -# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20220122223210-06791f6ef855 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/component-base v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20220122223210-06791f6ef855 ## explicit k8s.io/component-base/cli/flag k8s.io/component-base/cli/globalflag @@ -2166,7 +2166,7 @@ k8s.io/component-base/term k8s.io/component-base/traces k8s.io/component-base/version k8s.io/component-base/version/verflag -# k8s.io/component-helpers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/component-helpers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20220122223210-06791f6ef855 ## explicit k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2179,17 +2179,17 @@ k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/ephemeral k8s.io/component-helpers/storage/volume -# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20220122223210-06791f6ef855 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/apis/runtime/v1alpha2 -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20220122223210-06791f6ef855 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins # k8s.io/klog/v2 v2.30.0 ## explicit k8s.io/klog/v2 -# k8s.io/kube-aggregator v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/kube-aggregator v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20220122223210-06791f6ef855 ## explicit k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2240,13 +2240,13 @@ k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson k8s.io/kube-openapi/pkg/validation/validate -# k8s.io/kube-proxy v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/kube-proxy v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20220122223210-06791f6ef855 k8s.io/kube-proxy/config/v1alpha1 -# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20220122223210-06791f6ef855 k8s.io/kube-scheduler/config/v1beta2 k8s.io/kube-scheduler/config/v1beta3 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/kubectl v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20220122223210-06791f6ef855 ## explicit k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/util @@ -2272,7 +2272,7 @@ k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubelet v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/kubelet v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20220122223210-06791f6ef855 ## explicit k8s.io/kubelet/config/v1alpha1 k8s.io/kubelet/config/v1beta1 @@ -2285,7 +2285,7 @@ k8s.io/kubelet/pkg/apis/pluginregistration/v1 k8s.io/kubelet/pkg/apis/podresources/v1 k8s.io/kubelet/pkg/apis/podresources/v1alpha1 k8s.io/kubelet/pkg/apis/stats/v1alpha1 -# k8s.io/kubernetes v1.23.0 => github.com/openshift/kubernetes v1.22.2-0.20220114054557-60f5a1c6c03d +# k8s.io/kubernetes v1.23.0 => github.com/openshift/kubernetes v1.22.2-0.20220122223210-06791f6ef855 ## explicit k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3044,7 +3044,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse -# k8s.io/legacy-cloud-providers v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/legacy-cloud-providers v0.23.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20220122223210-06791f6ef855 ## explicit k8s.io/legacy-cloud-providers/aws k8s.io/legacy-cloud-providers/azure @@ -3088,7 +3088,7 @@ k8s.io/legacy-cloud-providers/openstack k8s.io/legacy-cloud-providers/vsphere k8s.io/legacy-cloud-providers/vsphere/vclib k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20220122223210-06791f6ef855 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 k8s.io/metrics/pkg/apis/custom_metrics/v1beta2 @@ -3097,9 +3097,9 @@ k8s.io/metrics/pkg/apis/external_metrics/v1beta1 k8s.io/metrics/pkg/client/custom_metrics k8s.io/metrics/pkg/client/custom_metrics/scheme k8s.io/metrics/pkg/client/external_metrics -# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20220122223210-06791f6ef855 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/pod-security-admission v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20220122223210-06791f6ef855 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api k8s.io/pod-security-admission/admission/api/load @@ -3110,10 +3110,10 @@ k8s.io/pod-security-admission/admission/api/validation k8s.io/pod-security-admission/api k8s.io/pod-security-admission/metrics k8s.io/pod-security-admission/policy -# k8s.io/sample-apiserver v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/sample-apiserver v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20220122223210-06791f6ef855 k8s.io/sample-apiserver/pkg/apis/wardle k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1 -# k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b +# k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 ## explicit k8s.io/utils/buffer k8s.io/utils/clock @@ -3236,31 +3236,31 @@ sigs.k8s.io/structured-merge-diff/v4/value sigs.k8s.io/yaml # github.com/google/cadvisor => github.com/google/cadvisor v0.43.0 # github.com/onsi/ginkgo => github.com/openshift/onsi-ginkgo v4.7.0-origin.0+incompatible -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/kubernetes => github.com/openshift/kubernetes v1.22.2-0.20220114054557-60f5a1c6c03d -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20220112121240-50f645e1e0b1 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20220112121240-50f645e1e0b1 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20220122223210-06791f6ef855 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20220122223210-06791f6ef855 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20220122223210-06791f6ef855 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20220122223210-06791f6ef855 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20220122223210-06791f6ef855 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20220122223210-06791f6ef855 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20220122223210-06791f6ef855 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20220122223210-06791f6ef855 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20220122223210-06791f6ef855 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20220122223210-06791f6ef855 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20220122223210-06791f6ef855 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20220122223210-06791f6ef855 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20220122223210-06791f6ef855 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20220122223210-06791f6ef855 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20220122223210-06791f6ef855 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20220122223210-06791f6ef855 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20220122223210-06791f6ef855 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20220122223210-06791f6ef855 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20220122223210-06791f6ef855 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20220122223210-06791f6ef855 +# k8s.io/kubernetes => github.com/openshift/kubernetes v1.22.2-0.20220122223210-06791f6ef855 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20220122223210-06791f6ef855 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20220122223210-06791f6ef855 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20220122223210-06791f6ef855 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20220122223210-06791f6ef855 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20220122223210-06791f6ef855 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20220122223210-06791f6ef855 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20220122223210-06791f6ef855