diff --git a/go.mod b/go.mod index f9b4ec954c65..ec2cfd45d441 100644 --- a/go.mod +++ b/go.mod @@ -80,35 +80,35 @@ replace ( github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20201214145556-6f1013f42f98 github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49 github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20201214135256-d265f469e75b - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210619031154-87cc9a4ade7e + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210702122106-01c9f3f43ffc k8s.io/gengo => k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1 k8s.io/klog => k8s.io/klog v1.0.0 - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.1-0.20210619031154-87cc9a4ade7e - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20210619031154-87cc9a4ade7e - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20210619031154-87cc9a4ade7e + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.1-0.20210702122106-01c9f3f43ffc + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20210702122106-01c9f3f43ffc + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20210702122106-01c9f3f43ffc k8s.io/system-validators => k8s.io/system-validators v1.0.4 ) diff --git a/go.sum b/go.sum index 2ed27fa78153..7cdea3e3b1e3 100644 --- a/go.sum +++ b/go.sum @@ -629,54 +629,54 @@ github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab h1:lB github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49 h1:7NmjUkJtGHpMTE/n8ia6itbCdZ7eYuTCXKc/zsA7OSM= github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49/go.mod h1:9/jG4I6sh+5QublJpZZ4Zs/P4/QCXMsQQ/K/058bSB8= -github.com/openshift/kubernetes v1.20.1-0.20210619031154-87cc9a4ade7e h1:bBcx1YVloOIYmqoUPQ0LP3vBhRJjlwGg7Y5zJkuLEAw= -github.com/openshift/kubernetes v1.20.1-0.20210619031154-87cc9a4ade7e/go.mod h1:WYL8/qQDpjRt1Rh9DNGRWe3V2ovnZnRJMffzC0gC1uc= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210619031154-87cc9a4ade7e h1:WPKKADuKzPhhZVFyJ93ySaRRtGhIyBvHPWgaSfhWBiI= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:12gqmOZJjmP0ciWfqR5ANIxYgDdTchaRCQx+nTGBtm4= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210619031154-87cc9a4ade7e h1:GTSLojL6VUDCgFlKqfOR2nQRB7VjzuFxveAQYu0FqFo= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:Tcd087AOtnbniuSkrQXpXxuN3y5UwtbXXTmLFiJca8s= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210619031154-87cc9a4ade7e h1:uQw3uO1sgUsLQ7Ex3wyJUlXuwRFd6Zoc5aowmCb+LPw= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:3axNrcLyqkBWxqU7Xl8RrLVDvPZOq5XMUHZ7mEFAQTM= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210619031154-87cc9a4ade7e h1:g5/oA1cGZIyRcn5s9JfC49coZXK5OLH+VdcVF/5KOks= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:ED6HfkyjucTiWY56MfTsOW48qtYewvR5IODc4JRMc6k= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210619031154-87cc9a4ade7e h1:b5xwjOm+0OaqUX8FB9p1wV4YIHi1l5T4nDwGuHRVY5k= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:2PkJ8J+3tJgD3gqH85mPwUZ0Z4gjOtdgrauOUoCndO0= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210619031154-87cc9a4ade7e h1:jJezDzlmnMzhsn4c96TJVMF+Rfh/vI/80nOY3AYjlOU= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:MfFvfPRc3qZnRjJYRnD8KZGtlN0XC+zUZu5wu5yfUz0= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210619031154-87cc9a4ade7e h1:1j4SCWcnaCogxUyKv0l2N1/MTKiz8Y8DQ4YHq4yaGJg= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:UbIReMP6onJAgmEZQmjsi9PwQZnuy6mN6cA+NX63KtI= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210619031154-87cc9a4ade7e h1:ukO1LjyvNr50qJHq5vDyFY4dJo9lnItUItg1AqILMxw= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:DwF2HdGOWvyoCRRAYTArqotIiLrKDWnOFYNGSXYv5kc= -github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:IdL3q169r16+fn077pRij9q//URx7OmYa+Wthx/j8KA= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210619031154-87cc9a4ade7e h1:3/HkirXgdq6vuVMBrEqM/2pP++/NSQPP5dSFqeWnYfs= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:+m5WoP0r8VlXaFWELe3Us7JCRVtcZPrgUJ82zGtICDw= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210619031154-87cc9a4ade7e h1:6/q3ah3tHDJXgj3JPyZZOeIZw+XRFOK/JAQp5WTb2uE= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:aYiAP0jm/mzzaAPEbSnjAzpIvB32BWs83YlyYN7vNtc= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210619031154-87cc9a4ade7e h1:fQguWGfDnjRsnkIObwqDAor/DMIwd7p0w+ll2Q0JiTM= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:C4aXxyoP3zkEJSMu98FCHF7lNDSNcBxMe13/JNk3WX8= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210619031154-87cc9a4ade7e h1:FDYwN38Hq8Cug4tOXNEjbS5X5rVF6wkefsvV+M/r95c= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:4xhnGOFiv9lkvENieScdSfcQHzXH9DR6QZRrCH0amMo= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210619031154-87cc9a4ade7e h1:XWnBsMVaJo/LwUL5VLb7T23GHISIt8kz8ZkWprxq/Q0= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:yvSgp4ik96yUXtiMdgyHzrZRI0XNlq8Wfs2Q54+pICU= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210619031154-87cc9a4ade7e h1:fDOjpwnT9scZp8UE8cTqj0SMt6FUzH1ejVTbm8qA8NA= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:1q1yp9zAz75t3BOwP11lXWu9bKOEVr2D+Uuq/0tgaTc= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:G43SCvMMH8h7lJxYjXgy4Ik5i/xLkA5MQm1PHsuKQxc= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210619031154-87cc9a4ade7e h1:fSbIgUv6hsA2SnCF3x5kVT+Gejl2zZd7utnJ+s/er1U= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:T53q06WyCndb2KNmm3lm6MT37ES+AIMi9msiFacQgiM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210619031154-87cc9a4ade7e h1:t+6Zct/sgtmLkiN0GKLe/v2zJT2mwHIWQiVsMyNc/VI= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:1eeLynEfXxcPS3rGxwkUpSbjJ/6LhqhBK6E8tIaNNFs= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210619031154-87cc9a4ade7e h1:iBeORfz/eaYa9SwPiZgxshA4kI0xbW3dAZo7POn6+Jw= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:OpQzy3zR3K/YFh6yaTqUJjNzDLsV4F0mEOITBpXpJv0= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210619031154-87cc9a4ade7e h1:DMyrqXUW1hFNmSbCI71wyLr+owpV2Xy24LyNxsNzxxg= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:ry4feXn7kqXZhCrz+qGy576zyIpYATh0QTINIibRzRk= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210619031154-87cc9a4ade7e h1:5I9WiGUajMGLEIOYa8bLFl+AF7bg3wgC3tA5F5bl0jA= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:SZzO0CnWBCwbiYLkYwThH9vvD4d0Q1plgf0r2WY1S+w= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210619031154-87cc9a4ade7e h1:KnswUb9T8IPJXULvgvYWUVot3PzVLl4Mw1fbzGNsiOw= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:5UY8SSbdbpx1XBR5HUbS/QkW4poh3AJTQvW3443qQmg= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210619031154-87cc9a4ade7e h1:SEqxSntWkJxMJmfiLP9NcUq0CFe7EwQhpQXIqbRCbe8= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:mFeSjsWvLj55xUpwltalvolz49izW7J0N5RfoIHrKKY= -github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210619031154-87cc9a4ade7e h1:rhQU9HUEooH9f6MiOhb6qIq2JghDVOJCQ2sXd/psjOY= -github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210619031154-87cc9a4ade7e/go.mod h1:WtXfFgTtCy2EaR3FvGYUsA+wulDHkF664sjyQrFMPQw= +github.com/openshift/kubernetes v1.20.1-0.20210702122106-01c9f3f43ffc h1:xR89pAlZf7jQ5v/WBPcoVX1SjWdKk8qeJbrE7tpdFjQ= +github.com/openshift/kubernetes v1.20.1-0.20210702122106-01c9f3f43ffc/go.mod h1:WYL8/qQDpjRt1Rh9DNGRWe3V2ovnZnRJMffzC0gC1uc= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210702122106-01c9f3f43ffc h1:M1sjFUoVcynEyxyUK52eyj9zlHAk4b+IGR+MQF8wGNM= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:12gqmOZJjmP0ciWfqR5ANIxYgDdTchaRCQx+nTGBtm4= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210702122106-01c9f3f43ffc h1:mniMMzGO+1X/dyPxNhzHYiKO/vHBpbVUIY5Rp73NX2g= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:Tcd087AOtnbniuSkrQXpXxuN3y5UwtbXXTmLFiJca8s= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210702122106-01c9f3f43ffc h1:9wBioOmStOrxcQ6QwtHNTaguw+4zrV0fwh4kF/hfRtY= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:3axNrcLyqkBWxqU7Xl8RrLVDvPZOq5XMUHZ7mEFAQTM= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210702122106-01c9f3f43ffc h1:6Djf5jaHqQhtWowfqALCZISx4wMRZkDFu0WVdLFYxvs= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:ED6HfkyjucTiWY56MfTsOW48qtYewvR5IODc4JRMc6k= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210702122106-01c9f3f43ffc h1:9fnN6xjMB6S3bk+JmwaUzvpK/1seaRYWBXOU6Mp8DhE= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:2PkJ8J+3tJgD3gqH85mPwUZ0Z4gjOtdgrauOUoCndO0= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210702122106-01c9f3f43ffc h1:ob4CEApszQIeWnIVn9qJPMSnTAz1SgXekmDPR6S1v0w= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:MfFvfPRc3qZnRjJYRnD8KZGtlN0XC+zUZu5wu5yfUz0= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210702122106-01c9f3f43ffc h1:x4uukPlDs/PdJVaLVzgT6lXgblNKEMf3/BzL25EIkFw= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:UbIReMP6onJAgmEZQmjsi9PwQZnuy6mN6cA+NX63KtI= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210702122106-01c9f3f43ffc h1:bMgodqA60blthwUjLZgBNHhS+S7lCwzKD9kcLfAu3Gs= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:DwF2HdGOWvyoCRRAYTArqotIiLrKDWnOFYNGSXYv5kc= +github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:IdL3q169r16+fn077pRij9q//URx7OmYa+Wthx/j8KA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210702122106-01c9f3f43ffc h1:u/AsmQd3+cZDqX1XOAIpXAjNOZpgzKAlSHufKlp90Wc= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:+m5WoP0r8VlXaFWELe3Us7JCRVtcZPrgUJ82zGtICDw= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210702122106-01c9f3f43ffc h1:eLLH0w1zIUzXk+x+uECR3TQjE2oAiZUAP8/kk9BajLg= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:aYiAP0jm/mzzaAPEbSnjAzpIvB32BWs83YlyYN7vNtc= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210702122106-01c9f3f43ffc h1:cbpPp8a63x3DaL80rBv+oevb+R6fL12qRWBgob6681M= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:C4aXxyoP3zkEJSMu98FCHF7lNDSNcBxMe13/JNk3WX8= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210702122106-01c9f3f43ffc h1:L2LeXzMJ17ITZzFeWYcwe4Xm4J+OJ7O+sTzHjClxE6g= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:4xhnGOFiv9lkvENieScdSfcQHzXH9DR6QZRrCH0amMo= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210702122106-01c9f3f43ffc h1:2pz1jcASPW/f+w4kiRjbr0/L0PMFVhngp7dem7gSxIk= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:yvSgp4ik96yUXtiMdgyHzrZRI0XNlq8Wfs2Q54+pICU= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210702122106-01c9f3f43ffc h1:Nd3X/knzTzumjD1kdUfTgHTNKEbOepTVS/FxwRFOt5s= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:1q1yp9zAz75t3BOwP11lXWu9bKOEVr2D+Uuq/0tgaTc= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:G43SCvMMH8h7lJxYjXgy4Ik5i/xLkA5MQm1PHsuKQxc= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210702122106-01c9f3f43ffc h1:S4AZOurffmUhAIlIyZ9qJR0IqtH/tJu45LfdEmo5FE0= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:T53q06WyCndb2KNmm3lm6MT37ES+AIMi9msiFacQgiM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210702122106-01c9f3f43ffc h1:NhyHM/sovpOgXqTQWxFm5Sw9VDPPtjLf9qUU7ew7mBg= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:1eeLynEfXxcPS3rGxwkUpSbjJ/6LhqhBK6E8tIaNNFs= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210702122106-01c9f3f43ffc h1:6aCa1oEs4I6WuggKIjFQ6NlGFT8QXfGrrS44sNhxM/w= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:OpQzy3zR3K/YFh6yaTqUJjNzDLsV4F0mEOITBpXpJv0= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210702122106-01c9f3f43ffc h1:A7vf/HOBibSLR43Vxt5LuAosgyA4bAnYt3MpZULqC+w= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:ry4feXn7kqXZhCrz+qGy576zyIpYATh0QTINIibRzRk= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210702122106-01c9f3f43ffc h1:4S89OeaVe8ceOF64eL4rd3e9pr1LXzlKrYrzJLvTiFM= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:SZzO0CnWBCwbiYLkYwThH9vvD4d0Q1plgf0r2WY1S+w= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210702122106-01c9f3f43ffc h1:tvWzCvewVSAUC4zSb1zcpxqbI9CQ5UxrU1IvhwiLhZg= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:5UY8SSbdbpx1XBR5HUbS/QkW4poh3AJTQvW3443qQmg= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210702122106-01c9f3f43ffc h1:HI9sfCn09+IuNqCPweS/VUDrTcUDJqZvH+962bijKAk= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:mFeSjsWvLj55xUpwltalvolz49izW7J0N5RfoIHrKKY= +github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210702122106-01c9f3f43ffc h1:8aGtnrl473r2hxYE7ItIHYDHYaOClSLF3CL1mPMlMZM= +github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210702122106-01c9f3f43ffc/go.mod h1:WtXfFgTtCy2EaR3FvGYUsA+wulDHkF664sjyQrFMPQw= github.com/openshift/library-go v0.0.0-20201214135256-d265f469e75b h1:zKZCcZgL3jf02/jf/ldUg8TvudOFcPGIdf8kFkWh5MI= github.com/openshift/library-go v0.0.0-20201214135256-d265f469e75b/go.mod h1:udseDnqxn5ON8i+NBjDp00fBTK0JRu1/6Y6tf6EivDE= github.com/openshift/onsi-ginkgo v4.7.0-origin.0+incompatible h1:6XSBotNi58b4MwVV4F9o/jd4BaQd+uJyz+s5TR0/ot8= diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/atomic_writer.go b/vendor/k8s.io/kubernetes/pkg/volume/util/atomic_writer.go index c6fb49192e86..e6fe7ff9d5bc 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/util/atomic_writer.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/util/atomic_writer.go @@ -373,6 +373,7 @@ func (w *AtomicWriter) newTimestampDir() (string, error) { // writePayloadToDir writes the given payload to the given directory. The // directory must exist. func (w *AtomicWriter) writePayloadToDir(payload map[string]FileProjection, dir string) error { + isNotWindows := runtime.GOOS != "windows" for userVisiblePath, fileProjection := range payload { content := fileProjection.Data mode := os.FileMode(fileProjection.Mode) @@ -400,9 +401,11 @@ func (w *AtomicWriter) writePayloadToDir(payload map[string]FileProjection, dir if fileProjection.FsUser == nil { continue } - if err := os.Chown(fullPath, int(*fileProjection.FsUser), -1); err != nil { - klog.Errorf("%s: unable to change file %s with owner %v: %v", w.logContext, fullPath, int(*fileProjection.FsUser), err) - return err + if isNotWindows { + if err := os.Chown(fullPath, int(*fileProjection.FsUser), -1); err != nil { + klog.Errorf("%s: unable to change file %s with owner %v: %v", w.logContext, fullPath, int(*fileProjection.FsUser), err) + return err + } } } diff --git a/vendor/k8s.io/kubernetes/test/e2e/apimachinery/BUILD b/vendor/k8s.io/kubernetes/test/e2e/apimachinery/BUILD index 0fdede5c377e..39f4263edd90 100644 --- a/vendor/k8s.io/kubernetes/test/e2e/apimachinery/BUILD +++ b/vendor/k8s.io/kubernetes/test/e2e/apimachinery/BUILD @@ -83,6 +83,8 @@ go_library( "//staging/src/k8s.io/client-go/dynamic:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", + "//staging/src/k8s.io/client-go/tools/cache:go_default_library", + "//staging/src/k8s.io/client-go/tools/watch:go_default_library", "//staging/src/k8s.io/client-go/util/cert:go_default_library", "//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library", "//staging/src/k8s.io/client-go/util/keyutil:go_default_library", diff --git a/vendor/k8s.io/kubernetes/test/e2e/apimachinery/resource_quota.go b/vendor/k8s.io/kubernetes/test/e2e/apimachinery/resource_quota.go index 3e0571c9e694..db79f6f989ba 100644 --- a/vendor/k8s.io/kubernetes/test/e2e/apimachinery/resource_quota.go +++ b/vendor/k8s.io/kubernetes/test/e2e/apimachinery/resource_quota.go @@ -338,8 +338,8 @@ var _ = SIGDescribe("ResourceQuota", func() { ginkgo.By("Ensuring resource quota status captures configMap creation") usedResources = v1.ResourceList{} usedResources[v1.ResourceQuotas] = resource.MustParse(strconv.Itoa(c + 1)) - // we expect there to be two configmaps because each namespace will receive - // a ca.crt configmap by default. + // we expect there to be three configmaps because each namespace will receive + // a ca.crt configmap and an openshift-service-ca.crt configmap by default. // ref:https://github.com/kubernetes/kubernetes/pull/68812 usedResources[v1.ResourceConfigMaps] = resource.MustParse(hardConfigMaps) err = waitForResourceQuota(f.ClientSet, f.Namespace.Name, quotaName, usedResources) @@ -1478,7 +1478,10 @@ func newTestResourceQuota(name string) *v1.ResourceQuota { hard[v1.ResourceQuotas] = resource.MustParse("1") hard[v1.ResourceCPU] = resource.MustParse("1") hard[v1.ResourceMemory] = resource.MustParse("500Mi") - hard[v1.ResourceConfigMaps] = resource.MustParse("2") + // Update configmap quota from 2 to 3 to account for the addition of + // openshift-service-ca.crt configmap to every namespace to allow + // BoundServiceAccountTokenVolume to be enabled in 4.8. + hard[v1.ResourceConfigMaps] = resource.MustParse("3") hard[v1.ResourceSecrets] = resource.MustParse("10") hard[v1.ResourcePersistentVolumeClaims] = resource.MustParse("10") hard[v1.ResourceRequestsStorage] = resource.MustParse("10Gi") diff --git a/vendor/k8s.io/kubernetes/test/e2e/apimachinery/watch.go b/vendor/k8s.io/kubernetes/test/e2e/apimachinery/watch.go index 25911bfe7346..ec92fc0cfa6e 100644 --- a/vendor/k8s.io/kubernetes/test/e2e/apimachinery/watch.go +++ b/vendor/k8s.io/kubernetes/test/e2e/apimachinery/watch.go @@ -27,6 +27,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" + cachetools "k8s.io/client-go/tools/cache" + watchtools "k8s.io/client-go/tools/watch" "k8s.io/kubernetes/test/e2e/framework" "github.com/onsi/ginkgo" @@ -336,6 +338,11 @@ var _ = SIGDescribe("Watchers", func() { iterations := 100 + ginkgo.By("getting a starting resourceVersion") + configmaps, err := c.CoreV1().ConfigMaps(ns).List(context.TODO(), metav1.ListOptions{}) + framework.ExpectNoError(err, "Failed to list configmaps in the namespace %s", ns) + resourceVersion := configmaps.ResourceVersion + ginkgo.By("starting a background goroutine to produce watch events") donec := make(chan struct{}) stopc := make(chan struct{}) @@ -345,11 +352,16 @@ var _ = SIGDescribe("Watchers", func() { produceConfigMapEvents(f, stopc, 5*time.Millisecond) }() + listWatcher := &cachetools.ListWatch{ + WatchFunc: func(listOptions metav1.ListOptions) (watch.Interface, error) { + return c.CoreV1().ConfigMaps(ns).Watch(context.TODO(), listOptions) + }, + } + ginkgo.By("creating watches starting from each resource version of the events produced and verifying they all receive resource versions in the same order") wcs := []watch.Interface{} - resourceVersion := "0" for i := 0; i < iterations; i++ { - wc, err := c.CoreV1().ConfigMaps(ns).Watch(context.TODO(), metav1.ListOptions{ResourceVersion: resourceVersion}) + wc, err := watchtools.NewRetryWatcher(resourceVersion, listWatcher) framework.ExpectNoError(err, "Failed to watch configmaps in the namespace %s", ns) wcs = append(wcs, wc) resourceVersion = waitForNextConfigMapEvent(wcs[0]).ResourceVersion @@ -436,11 +448,14 @@ func waitForEvent(w watch.Interface, expectType watch.EventType, expectObject ru func waitForNextConfigMapEvent(watch watch.Interface) *v1.ConfigMap { select { - case event := <-watch.ResultChan(): + case event, ok := <-watch.ResultChan(): + if !ok { + framework.Failf("Watch closed unexpectedly") + } if configMap, ok := event.Object.(*v1.ConfigMap); ok { return configMap } - framework.Failf("expected config map") + framework.Failf("expected config map, got %T", event.Object) case <-time.After(10 * time.Second): framework.Failf("timed out waiting for watch event") } diff --git a/vendor/modules.txt b/vendor/modules.txt index c38e61bc77fa..b23d14030a7a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1379,7 +1379,7 @@ gopkg.in/warnings.v0 gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c gopkg.in/yaml.v3 -# k8s.io/api v0.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210619031154-87cc9a4ade7e +# k8s.io/api v0.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210702122106-01c9f3f43ffc ## explicit k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1427,7 +1427,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.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210619031154-87cc9a4ade7e +# k8s.io/apiextensions-apiserver v0.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210702122106-01c9f3f43ffc ## explicit k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1471,7 +1471,7 @@ k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition k8s.io/apiextensions-apiserver/test/integration k8s.io/apiextensions-apiserver/test/integration/fixtures -# k8s.io/apimachinery v0.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210619031154-87cc9a4ade7e +# k8s.io/apimachinery v0.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210702122106-01c9f3f43ffc ## explicit k8s.io/apimachinery/pkg/api/apitesting k8s.io/apimachinery/pkg/api/equality @@ -1535,7 +1535,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.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210619031154-87cc9a4ade7e +# k8s.io/apiserver v0.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210702122106-01c9f3f43ffc ## explicit k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1676,7 +1676,7 @@ 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.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210619031154-87cc9a4ade7e +# k8s.io/cli-runtime v0.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210702122106-01c9f3f43ffc ## explicit k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/kustomize @@ -1690,7 +1690,7 @@ k8s.io/cli-runtime/pkg/kustomize/k8sdeps/transformer/patch k8s.io/cli-runtime/pkg/kustomize/k8sdeps/validator k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210619031154-87cc9a4ade7e +# k8s.io/client-go v0.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210702122106-01c9f3f43ffc ## explicit k8s.io/client-go/discovery k8s.io/client-go/discovery/cached @@ -1941,7 +1941,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-20210619031154-87cc9a4ade7e +# k8s.io/cloud-provider v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210702122106-01c9f3f43ffc k8s.io/cloud-provider k8s.io/cloud-provider/api k8s.io/cloud-provider/node/helpers @@ -1949,12 +1949,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-20210619031154-87cc9a4ade7e +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210702122106-01c9f3f43ffc 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.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210619031154-87cc9a4ade7e +# k8s.io/component-base v0.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210702122106-01c9f3f43ffc ## explicit k8s.io/component-base/cli/flag k8s.io/component-base/cli/globalflag @@ -1977,25 +1977,25 @@ k8s.io/component-base/metrics/testutil k8s.io/component-base/term 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-20210619031154-87cc9a4ade7e +# k8s.io/component-helpers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210702122106-01c9f3f43ffc ## explicit k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/auth/rbac/reconciliation k8s.io/component-helpers/auth/rbac/validation k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity -# k8s.io/controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210619031154-87cc9a4ade7e +# k8s.io/controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210702122106-01c9f3f43ffc k8s.io/controller-manager/pkg/clientbuilder -# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210619031154-87cc9a4ade7e +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210702122106-01c9f3f43ffc k8s.io/cri-api/pkg/apis 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-20210619031154-87cc9a4ade7e +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210702122106-01c9f3f43ffc k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins # k8s.io/klog/v2 v2.4.0 ## explicit k8s.io/klog/v2 -# k8s.io/kube-aggregator v0.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210619031154-87cc9a4ade7e +# k8s.io/kube-aggregator v0.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210702122106-01c9f3f43ffc k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install k8s.io/kube-aggregator/pkg/apis/apiregistration/v1 @@ -2039,11 +2039,11 @@ 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-20210619031154-87cc9a4ade7e +# k8s.io/kube-proxy v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210702122106-01c9f3f43ffc 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-20210619031154-87cc9a4ade7e +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210702122106-01c9f3f43ffc k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210619031154-87cc9a4ade7e +# k8s.io/kubectl v0.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210702122106-01c9f3f43ffc ## explicit k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/util @@ -2067,7 +2067,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.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210619031154-87cc9a4ade7e +# k8s.io/kubelet v0.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210702122106-01c9f3f43ffc ## explicit k8s.io/kubelet/config/v1alpha1 k8s.io/kubelet/config/v1beta1 @@ -2079,7 +2079,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.20.0 => github.com/openshift/kubernetes v1.20.1-0.20210619031154-87cc9a4ade7e +# k8s.io/kubernetes v1.20.0 => github.com/openshift/kubernetes v1.20.1-0.20210702122106-01c9f3f43ffc ## explicit k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -2817,7 +2817,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.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210619031154-87cc9a4ade7e +# k8s.io/legacy-cloud-providers v0.20.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210702122106-01c9f3f43ffc ## explicit k8s.io/legacy-cloud-providers/aws k8s.io/legacy-cloud-providers/azure @@ -2860,7 +2860,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-20210619031154-87cc9a4ade7e +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210702122106-01c9f3f43ffc k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 k8s.io/metrics/pkg/apis/custom_metrics/v1beta2 @@ -2869,9 +2869,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-20210619031154-87cc9a4ade7e +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210702122106-01c9f3f43ffc k8s.io/mount-utils -# k8s.io/sample-apiserver v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210619031154-87cc9a4ade7e +# k8s.io/sample-apiserver v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210702122106-01c9f3f43ffc k8s.io/sample-apiserver/pkg/apis/wardle k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1 # k8s.io/utils v0.0.0-20201110183641-67b214c5f920 @@ -2929,34 +2929,34 @@ sigs.k8s.io/yaml # github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20201214145556-6f1013f42f98 # github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49 # github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20201214135256-d265f469e75b -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210619031154-87cc9a4ade7e +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210702122106-01c9f3f43ffc # k8s.io/gengo => k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 # k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1 # k8s.io/klog => k8s.io/klog v1.0.0 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.1-0.20210619031154-87cc9a4ade7e -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20210619031154-87cc9a4ade7e -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20210619031154-87cc9a4ade7e +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.1-0.20210702122106-01c9f3f43ffc +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20210702122106-01c9f3f43ffc +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20210702122106-01c9f3f43ffc # k8s.io/system-validators => k8s.io/system-validators v1.0.4