diff --git a/go.mod b/go.mod index e9a2b21eb2c..d60cb63ba1f 100644 --- a/go.mod +++ b/go.mod @@ -49,30 +49,30 @@ require ( replace ( github.com/kcp-dev/kcp/pkg/apis => ./pkg/apis - k8s.io/api => github.com/kcp-dev/kubernetes/staging/src/k8s.io/api v0.0.0-20220711205747-d35199360bc9 - k8s.io/apiextensions-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20220711205747-d35199360bc9 - k8s.io/apimachinery => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20220711205747-d35199360bc9 - k8s.io/apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20220711205747-d35199360bc9 - k8s.io/cli-runtime => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20220711205747-d35199360bc9 - k8s.io/client-go => github.com/kcp-dev/kubernetes/staging/src/k8s.io/client-go v0.0.0-20220711205747-d35199360bc9 - k8s.io/cloud-provider => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20220711205747-d35199360bc9 - k8s.io/cluster-bootstrap => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20220711205747-d35199360bc9 - k8s.io/code-generator => github.com/kcp-dev/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20220711205747-d35199360bc9 - k8s.io/component-base => github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-base v0.0.0-20220711205747-d35199360bc9 - k8s.io/component-helpers => github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20220711205747-d35199360bc9 - k8s.io/controller-manager => github.com/kcp-dev/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20220711205747-d35199360bc9 - k8s.io/cri-api => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20220711205747-d35199360bc9 - k8s.io/csi-translation-lib => github.com/kcp-dev/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20220711205747-d35199360bc9 - k8s.io/kube-aggregator => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20220711205747-d35199360bc9 - k8s.io/kube-controller-manager => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20220711205747-d35199360bc9 - k8s.io/kube-proxy => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20220711205747-d35199360bc9 - k8s.io/kube-scheduler => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20220711205747-d35199360bc9 - k8s.io/kubectl => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20220711205747-d35199360bc9 - k8s.io/kubelet => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20220711205747-d35199360bc9 - k8s.io/kubernetes => github.com/kcp-dev/kubernetes v0.0.0-20220711205747-d35199360bc9 - k8s.io/legacy-cloud-providers => github.com/kcp-dev/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20220711205747-d35199360bc9 - k8s.io/metrics => github.com/kcp-dev/kubernetes/staging/src/k8s.io/metrics v0.0.0-20220711205747-d35199360bc9 - k8s.io/mount-utils => github.com/kcp-dev/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20220711205747-d35199360bc9 - k8s.io/pod-security-admission => github.com/kcp-dev/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20220711205747-d35199360bc9 - k8s.io/sample-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20220711205747-d35199360bc9 + k8s.io/api => github.com/kcp-dev/kubernetes/staging/src/k8s.io/api v0.0.0-20220802143353-1682ec3cded8 + k8s.io/apiextensions-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20220802143353-1682ec3cded8 + k8s.io/apimachinery => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20220802143353-1682ec3cded8 + k8s.io/apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20220802143353-1682ec3cded8 + k8s.io/cli-runtime => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20220802143353-1682ec3cded8 + k8s.io/client-go => github.com/kcp-dev/kubernetes/staging/src/k8s.io/client-go v0.0.0-20220802143353-1682ec3cded8 + k8s.io/cloud-provider => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20220802143353-1682ec3cded8 + k8s.io/cluster-bootstrap => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20220802143353-1682ec3cded8 + k8s.io/code-generator => github.com/kcp-dev/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20220802143353-1682ec3cded8 + k8s.io/component-base => github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-base v0.0.0-20220802143353-1682ec3cded8 + k8s.io/component-helpers => github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20220802143353-1682ec3cded8 + k8s.io/controller-manager => github.com/kcp-dev/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20220802143353-1682ec3cded8 + k8s.io/cri-api => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20220802143353-1682ec3cded8 + k8s.io/csi-translation-lib => github.com/kcp-dev/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20220802143353-1682ec3cded8 + k8s.io/kube-aggregator => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20220802143353-1682ec3cded8 + k8s.io/kube-controller-manager => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20220802143353-1682ec3cded8 + k8s.io/kube-proxy => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20220802143353-1682ec3cded8 + k8s.io/kube-scheduler => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20220802143353-1682ec3cded8 + k8s.io/kubectl => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20220802143353-1682ec3cded8 + k8s.io/kubelet => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20220802143353-1682ec3cded8 + k8s.io/kubernetes => github.com/kcp-dev/kubernetes v0.0.0-20220802143353-1682ec3cded8 + k8s.io/legacy-cloud-providers => github.com/kcp-dev/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20220802143353-1682ec3cded8 + k8s.io/metrics => github.com/kcp-dev/kubernetes/staging/src/k8s.io/metrics v0.0.0-20220802143353-1682ec3cded8 + k8s.io/mount-utils => github.com/kcp-dev/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20220802143353-1682ec3cded8 + k8s.io/pod-security-admission => github.com/kcp-dev/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20220802143353-1682ec3cded8 + k8s.io/sample-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20220802143353-1682ec3cded8 ) diff --git a/go.sum b/go.sum index df87c48f232..accc17e761f 100644 --- a/go.sum +++ b/go.sum @@ -433,50 +433,50 @@ github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kcp-dev/apimachinery v0.0.0-20220708220956-c302aeddfde7 h1:ManYmc0CcVDDQAMJDsab0p7aIWKOxzKTmK8LVyMs1Bs= github.com/kcp-dev/apimachinery v0.0.0-20220708220956-c302aeddfde7/go.mod h1:+HKR4Ohhcq0TzLFnbH/iZkClN2HA6YZT5i1J7waX0OQ= -github.com/kcp-dev/kubernetes v0.0.0-20220711205747-d35199360bc9 h1:Kaz/QcvDhA2THqWfha+TWzwbSzBNV/muCeq6dPI6pE4= -github.com/kcp-dev/kubernetes v0.0.0-20220711205747-d35199360bc9/go.mod h1:9pUxxxfFsSUf6IIC1q1YgfaPah0Gr5KahSHH3TVK8/M= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/api v0.0.0-20220711205747-d35199360bc9 h1:rCpvmHJ5CGxj5rYN34/0jwmrc5+wYfFuQit8bad+f2g= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/api v0.0.0-20220711205747-d35199360bc9/go.mod h1:YaTOAfRXJ+yMgQtYx2JxXdxGGoAonb1tg1rTLU0IT54= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20220711205747-d35199360bc9 h1:kQxks2hhBZ0wUA0CB3nKCZnIynoad37iWtv0sQbCJog= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20220711205747-d35199360bc9/go.mod h1:ZRdTKFvVunQaPxop8dE4nh6TtDb/t1RVE08OIFY3GG8= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20220711205747-d35199360bc9 h1:QRNKvUyI0t5n+4qdWDxE+1Vx/ZebbLGIMtA1bFRQNwY= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20220711205747-d35199360bc9/go.mod h1:O3MicknNAEIDH6QnfbYhov76VLccl2SLhbR1odSgttE= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20220711205747-d35199360bc9 h1:Dvr6Ckvb8Pcsj2Jpq+VOzmtSmOGLG7SwFb98wIpBMJM= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20220711205747-d35199360bc9/go.mod h1:n5wwAoxii9evUcYMMoVAEmxbqW0k+z90vFdCsv1V2Z4= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20220711205747-d35199360bc9 h1:8MALt4e/1OOKvuD3PO+FMKTByz2sLRBWh8Fz66b+tgM= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20220711205747-d35199360bc9/go.mod h1:orQ0u6YFGILUtVi0Udh8ooQXvlLQnm0+tKbmt7ynloQ= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/client-go v0.0.0-20220711205747-d35199360bc9 h1:+C+BHlVts51SLC5PWpy2taR0pFtfOA7634MXPUmZ6bQ= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/client-go v0.0.0-20220711205747-d35199360bc9/go.mod h1:9wQfirZbMt4ylVsssW6p1Q1YUzB3Mk9LgcCzmExzE8A= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20220711205747-d35199360bc9 h1:/6RdBWMgTGFvgjlZi8OHWYc36q6p5rudZHRQaytenx4= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20220711205747-d35199360bc9/go.mod h1:eot0EK8avXDFURVMYfiQSyACC0ZLJQnsmS6pUhK2XuY= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20220711205747-d35199360bc9 h1:UwiMN2EwpLTOpS/W8V1dK8PmVjGo3ia62kPMy64cxnA= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20220711205747-d35199360bc9/go.mod h1:J3nPGbI3hjNEG/PzGqn8u/6u1xZ01RcakjgKLSRJSSU= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20220711205747-d35199360bc9 h1:I/r8YuwP3+BXlXyRyIT8VPyNBpb9+/U6sT6pNV3n3F0= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20220711205747-d35199360bc9/go.mod h1:9DrMgqpSLqBZxi7nUouy/RtSauB1VpaHBaLjJ7G56VU= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-base v0.0.0-20220711205747-d35199360bc9 h1:OrHskY37bjWeAtFjrclQUHZZuO2ZdrHyO/LQAXg7+Ck= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-base v0.0.0-20220711205747-d35199360bc9/go.mod h1:AAzffBuvEhUyfWAdxIV3uNmwRiEoRkJcpHdsxupLoqk= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20220711205747-d35199360bc9 h1:Qun3BIMf1N4D/5Fo6HvKfFcu8qld4NpOUcGwFsdxRwQ= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20220711205747-d35199360bc9/go.mod h1:4n0wN/LrqxbT8q8KYboJKOHDezDQmqBP8JLi7PyAc6k= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20220711205747-d35199360bc9 h1:lA5QPawhvMOAJW8mA8w8pbp3v9szWcVt+7wCja+M8to= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20220711205747-d35199360bc9/go.mod h1:qD4sCXo/+wo05162TFseC/ieRmKSuI87xfd8Jh3KRgo= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20220711205747-d35199360bc9/go.mod h1:VEW+/Dcsea218hAxo+ql7vu4KofSiUN+tKpAI40ash8= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20220711205747-d35199360bc9/go.mod h1:JmoRzun30iLuAdeJvRVYC88aE1JxLGG7zr6o8KOHf+k= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20220711205747-d35199360bc9 h1:Tjpz5frI/pUXGJgXtz9zfXF+khN7TkMnUBbBUVXA7UA= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20220711205747-d35199360bc9/go.mod h1:zbpWxAWASaXTOXddZVlhvaK+pZniHqhJhE1fB8bMiMY= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20220711205747-d35199360bc9 h1:MxY9c3DJoD7OcAW6vlRSOSY//c01vmmT4eFLMoIyn1w= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20220711205747-d35199360bc9/go.mod h1:X+jCm9taSAFLDStCk9jdg5oUyghcYIBL1kTKZ3L8r2U= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20220711205747-d35199360bc9/go.mod h1:BAErEeTBUJ+9mqW2EZa3UC4rzY8575Jscooq57CVrrA= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20220711205747-d35199360bc9/go.mod h1:XWqMgcamrn6LFtdb91dstGlCVFyHqZEK4AkXTU+4/Dw= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20220711205747-d35199360bc9/go.mod h1:4y0AXnfqR55ujLnJ9wp5HrizaSxAgLL8O4+QbZ7BWKM= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20220711205747-d35199360bc9 h1:XAXGR91SqVb21kdwW/7Jy9z+1lVA5myo4jbAb8vyh4k= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20220711205747-d35199360bc9/go.mod h1:4C4GRv5M3KggS3kOszIZ4xpK/lpzfcmKKK9EaSu2r/I= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20220711205747-d35199360bc9/go.mod h1:/EdP2IinGcoX2N4R3NLnerTVQdUdIM5oZdWfZj9t0pk= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/metrics v0.0.0-20220711205747-d35199360bc9/go.mod h1:MsSvi33XlkHqKwpvr1ImmTofTEmtt27d6HRWPk8+7dE= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20220711205747-d35199360bc9 h1:WEokaxNwpZEhOAYIC6RT5Ionb/eJsYgEXNcdXDxU0/E= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20220711205747-d35199360bc9/go.mod h1:4TleGLIXJAUXyxYMKm84WqIE0TgGbRSJXVFD5ESP44Q= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20220711205747-d35199360bc9 h1:hV8Wc4fq2+wB4gM1hhWAXvAXr2K5t1B1Hu5vUxsP5ZM= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20220711205747-d35199360bc9/go.mod h1:YSfevLOikB6fttjc9y/dmcQj0OJEZ/isjLZeDyOVYTs= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20220711205747-d35199360bc9/go.mod h1:ThbRUkxvDku4zITYs5lwmLW+JIXC9Gep0xsdEC2QMkc= +github.com/kcp-dev/kubernetes v0.0.0-20220802143353-1682ec3cded8 h1:itl1x0PiPoJPfXl3eeC5PYeVKCQ8QXGjuWWBRKjwg2o= +github.com/kcp-dev/kubernetes v0.0.0-20220802143353-1682ec3cded8/go.mod h1:9pUxxxfFsSUf6IIC1q1YgfaPah0Gr5KahSHH3TVK8/M= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/api v0.0.0-20220802143353-1682ec3cded8 h1:XDDnN6XEATtmLCmhX6/WRgd0y0+HCP+pMtbDMs8F7jA= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/api v0.0.0-20220802143353-1682ec3cded8/go.mod h1:YaTOAfRXJ+yMgQtYx2JxXdxGGoAonb1tg1rTLU0IT54= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20220802143353-1682ec3cded8 h1:HJHwjO5o9SUsqm9071n+Jyew0d0QfAJUaOFEvg8MsNA= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20220802143353-1682ec3cded8/go.mod h1:ZRdTKFvVunQaPxop8dE4nh6TtDb/t1RVE08OIFY3GG8= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20220802143353-1682ec3cded8 h1:WSo8BRkEr+mgi4h4cZhX0TcsgOZgZWTjGgRNO6+zI9k= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20220802143353-1682ec3cded8/go.mod h1:O3MicknNAEIDH6QnfbYhov76VLccl2SLhbR1odSgttE= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20220802143353-1682ec3cded8 h1:YPpP00OgVNkf0f/HlPOjML0FAQ5rqSm0BzxgFWAgLkU= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20220802143353-1682ec3cded8/go.mod h1:n5wwAoxii9evUcYMMoVAEmxbqW0k+z90vFdCsv1V2Z4= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20220802143353-1682ec3cded8 h1:qgOcDOw9V2Z/sxEkXn9MSwU8CW4E/hjFOowfohIyLQw= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20220802143353-1682ec3cded8/go.mod h1:orQ0u6YFGILUtVi0Udh8ooQXvlLQnm0+tKbmt7ynloQ= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/client-go v0.0.0-20220802143353-1682ec3cded8 h1:ZJc+e0iiBD+YJ7AuEbiyLdzH7sohQzGW8Lxjpho4wLU= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/client-go v0.0.0-20220802143353-1682ec3cded8/go.mod h1:9wQfirZbMt4ylVsssW6p1Q1YUzB3Mk9LgcCzmExzE8A= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20220802143353-1682ec3cded8 h1:SzDNKjpZ5L01zLodEoqq8ddwqPm0g2g77lKA/juaIJs= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20220802143353-1682ec3cded8/go.mod h1:eot0EK8avXDFURVMYfiQSyACC0ZLJQnsmS6pUhK2XuY= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20220802143353-1682ec3cded8 h1:J6fsUCStRYcrPFWlks+FfCH9jASFnlUmGpRL1rzp5aw= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20220802143353-1682ec3cded8/go.mod h1:J3nPGbI3hjNEG/PzGqn8u/6u1xZ01RcakjgKLSRJSSU= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20220802143353-1682ec3cded8 h1:I6+ZJnZHfiBY1/FEUXONqusRst3haQ6+T7rfsCHL4LQ= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20220802143353-1682ec3cded8/go.mod h1:9DrMgqpSLqBZxi7nUouy/RtSauB1VpaHBaLjJ7G56VU= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-base v0.0.0-20220802143353-1682ec3cded8 h1:Liw5eXPHeiVybfrzEbuVjDyqVPFiplPeO4gpdP2cD8Q= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-base v0.0.0-20220802143353-1682ec3cded8/go.mod h1:AAzffBuvEhUyfWAdxIV3uNmwRiEoRkJcpHdsxupLoqk= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20220802143353-1682ec3cded8 h1:0p0s2xn4PDPH3Ygn19VsekKm9z2F7Q4ve2EShFKqMIg= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20220802143353-1682ec3cded8/go.mod h1:4n0wN/LrqxbT8q8KYboJKOHDezDQmqBP8JLi7PyAc6k= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20220802143353-1682ec3cded8 h1:U8YYrI+JV1zhiw7lpG3TlgN9s6ntWgtEwMQZozMOHC8= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20220802143353-1682ec3cded8/go.mod h1:qD4sCXo/+wo05162TFseC/ieRmKSuI87xfd8Jh3KRgo= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20220802143353-1682ec3cded8/go.mod h1:VEW+/Dcsea218hAxo+ql7vu4KofSiUN+tKpAI40ash8= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20220802143353-1682ec3cded8/go.mod h1:JmoRzun30iLuAdeJvRVYC88aE1JxLGG7zr6o8KOHf+k= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20220802143353-1682ec3cded8 h1:HLW1+qn2TDG9EoC644KGWdKpoxWp1zUngXOgsl8D3hw= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20220802143353-1682ec3cded8/go.mod h1:zbpWxAWASaXTOXddZVlhvaK+pZniHqhJhE1fB8bMiMY= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20220802143353-1682ec3cded8 h1:7VfRKP97R7oT0eyVp5U09Rgr0fVqfENRwl/xUnVVkZU= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20220802143353-1682ec3cded8/go.mod h1:X+jCm9taSAFLDStCk9jdg5oUyghcYIBL1kTKZ3L8r2U= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20220802143353-1682ec3cded8/go.mod h1:BAErEeTBUJ+9mqW2EZa3UC4rzY8575Jscooq57CVrrA= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20220802143353-1682ec3cded8/go.mod h1:XWqMgcamrn6LFtdb91dstGlCVFyHqZEK4AkXTU+4/Dw= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20220802143353-1682ec3cded8/go.mod h1:4y0AXnfqR55ujLnJ9wp5HrizaSxAgLL8O4+QbZ7BWKM= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20220802143353-1682ec3cded8 h1:rzI0h4bhc+w+UUM40aq7YqLka+WG4hddTHNPofHuPEw= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20220802143353-1682ec3cded8/go.mod h1:4C4GRv5M3KggS3kOszIZ4xpK/lpzfcmKKK9EaSu2r/I= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20220802143353-1682ec3cded8/go.mod h1:/EdP2IinGcoX2N4R3NLnerTVQdUdIM5oZdWfZj9t0pk= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/metrics v0.0.0-20220802143353-1682ec3cded8/go.mod h1:MsSvi33XlkHqKwpvr1ImmTofTEmtt27d6HRWPk8+7dE= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20220802143353-1682ec3cded8 h1:VtOvFkgPPN3U4Ww4wrk6Kxj75bxQ44Iy+DK/LPOtAJs= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20220802143353-1682ec3cded8/go.mod h1:4TleGLIXJAUXyxYMKm84WqIE0TgGbRSJXVFD5ESP44Q= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20220802143353-1682ec3cded8 h1:nNonmTTY/FZ4i/iWhKBX6gQSAxgBs0q+Pki9SEd9w30= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20220802143353-1682ec3cded8/go.mod h1:YSfevLOikB6fttjc9y/dmcQj0OJEZ/isjLZeDyOVYTs= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20220802143353-1682ec3cded8/go.mod h1:ThbRUkxvDku4zITYs5lwmLW+JIXC9Gep0xsdEC2QMkc= github.com/kcp-dev/logicalcluster v1.0.0/go.mod h1:M0CBFkJTW29XtIP5XIkDfhYQ8LU6HrnseRb4zmgBltE= github.com/kcp-dev/logicalcluster v1.1.0/go.mod h1:M0CBFkJTW29XtIP5XIkDfhYQ8LU6HrnseRb4zmgBltE= github.com/kcp-dev/logicalcluster v1.1.1-0.20220705215104-8e46328c24a5 h1:ygcM+nvb7QBB/o3HZVw5sYu6KH9aXcrZ+A+IjEDAabA= diff --git a/test/e2e/framework/fixture.go b/test/e2e/framework/fixture.go index 7ddec93a13d..e0fd68229de 100644 --- a/test/e2e/framework/fixture.go +++ b/test/e2e/framework/fixture.go @@ -684,15 +684,15 @@ func WriteLogicalClusterConfig(t *testing.T, rawConfig clientcmdapi.Config, clus // syncerConfigFromCluster reads the configuration needed to start an in-process // syncer from the resources applied to a cluster for a deployed syncer. -func syncerConfigFromCluster(t *testing.T, config *rest.Config, namespace, syncerID string) *syncer.SyncerConfig { +func syncerConfigFromCluster(t *testing.T, downstreamConfig *rest.Config, namespace, syncerID string) *syncer.SyncerConfig { ctx, cancelFunc := context.WithCancel(context.Background()) t.Cleanup(cancelFunc) - kubeClient, err := kubernetesclientset.NewForConfig(config) + downstreamKubeClient, err := kubernetesclientset.NewForConfig(downstreamConfig) require.NoError(t, err) // Read the upstream kubeconfig from the syncer secret - secret, err := kubeClient.CoreV1().Secrets(namespace).Get(ctx, syncerID, metav1.GetOptions{}) + secret, err := downstreamKubeClient.CoreV1().Secrets(namespace).Get(ctx, syncerID, metav1.GetOptions{}) require.NoError(t, err) upstreamConfigBytes := secret.Data[workloadcliplugin.SyncerSecretConfigKey] require.NotEmpty(t, upstreamConfigBytes, "upstream config is required") @@ -700,7 +700,7 @@ func syncerConfigFromCluster(t *testing.T, config *rest.Config, namespace, synce require.NoError(t, err, "failed to load upstream config") // Read the arguments from the syncer deployment - deployment, err := kubeClient.AppsV1().Deployments(namespace).Get(ctx, syncerID, metav1.GetOptions{}) + deployment, err := downstreamKubeClient.AppsV1().Deployments(namespace).Get(ctx, syncerID, metav1.GetOptions{}) require.NoError(t, err) containers := deployment.Spec.Template.Spec.Containers require.NotEmpty(t, containers, "expected at least one container in syncer deployment") @@ -721,28 +721,28 @@ func syncerConfigFromCluster(t *testing.T, config *rest.Config, namespace, synce // Read the downstream token from the deployment's service account secret var tokenSecret corev1.Secret - require.Eventually(t, func() bool { - secrets, err := kubeClient.CoreV1().Secrets(namespace).List(ctx, metav1.ListOptions{}) + Eventually(t, func() (bool, string) { + secrets, err := downstreamKubeClient.CoreV1().Secrets(namespace).List(ctx, metav1.ListOptions{}) if err != nil { t.Errorf("failed to list secrets: %v", err) - return false + return false, fmt.Sprintf("failed to list secrets downstream: %v", err) } for _, secret := range secrets.Items { if secret.Annotations[corev1.ServiceAccountNameKey] == syncerID { tokenSecret = secret - return true + return len(secret.Data["token"]) > 0, fmt.Sprintf("token secret %s/%s for service account %s found", namespace, secret.Name, syncerID) } } - return false - }, wait.ForeverTestTimeout, time.Millisecond*100, "token secret for syncer service account not found") + return false, fmt.Sprintf("token secret for service account %s/%s not found", namespace, syncerID) + }, wait.ForeverTestTimeout, time.Millisecond*100, "token secret in namespace %q for syncer service account %q not found", namespace, syncerID) token := tokenSecret.Data["token"] require.NotEmpty(t, token, "token is required") // Compose a new downstream config that uses the token - downstreamConfig := ConfigWithToken(string(token), rest.CopyConfig(config)) + downstreamConfigWithToken := ConfigWithToken(string(token), rest.CopyConfig(downstreamConfig)) return &syncer.SyncerConfig{ UpstreamConfig: upstreamConfig, - DownstreamConfig: downstreamConfig, + DownstreamConfig: downstreamConfigWithToken, ResourcesToSync: sets.NewString(resourcesToSync...), KCPClusterName: kcpClusterName, SyncTargetName: syncTargetName,