From f5043d986ffa66885d08a4dbc3ead897b18d79ab Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Tue, 19 Oct 2021 15:24:23 -0700 Subject: [PATCH] Merge pull request #94165 from soltysh/fix_cp Use separate pathSpec for local and remote to properly handle cleaning paths Kubernetes-commit: 6cbe18544d90c29d6b3e460dffa6d795a88257ae --- go.mod | 16 ++++++++-------- go.sum | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 2af84261..50d1b11d 100644 --- a/go.mod +++ b/go.mod @@ -31,11 +31,11 @@ require ( github.com/stretchr/testify v1.7.0 golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.0.0-20211008163859-2a5dae08c42b - k8s.io/apimachinery v0.0.0-20211012003219-6c3d2b36a98a + k8s.io/api v0.0.0-20211019203412-654d74de91f0 + k8s.io/apimachinery v0.0.0-20211015224548-e6c90c4366be k8s.io/cli-runtime v0.0.0-20211001205205-cb123082bee1 - k8s.io/client-go v0.0.0-20211011163815-7697067af710 - k8s.io/component-base v0.0.0-20211011003846-8870347bee41 + k8s.io/client-go v0.0.0-20211018123648-fa4ee2502f44 + k8s.io/component-base v0.0.0-20211013203926-a54188b7d648 k8s.io/component-helpers v0.0.0-20211007164423-21d2fdede9bf k8s.io/klog/v2 v2.20.0 k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8 @@ -47,12 +47,12 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20211008163859-2a5dae08c42b - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211012003219-6c3d2b36a98a + k8s.io/api => k8s.io/api v0.0.0-20211019203412-654d74de91f0 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211015224548-e6c90c4366be k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20211001205205-cb123082bee1 - k8s.io/client-go => k8s.io/client-go v0.0.0-20211011163815-7697067af710 + k8s.io/client-go => k8s.io/client-go v0.0.0-20211018123648-fa4ee2502f44 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210930223515-ede4574ee351 - k8s.io/component-base => k8s.io/component-base v0.0.0-20211011003846-8870347bee41 + k8s.io/component-base => k8s.io/component-base v0.0.0-20211013203926-a54188b7d648 k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211007164423-21d2fdede9bf k8s.io/metrics => k8s.io/metrics v0.0.0-20211001005724-9be6d708955e ) diff --git a/go.sum b/go.sum index 8fc8a435..5812ceeb 100644 --- a/go.sum +++ b/go.sum @@ -902,17 +902,17 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20211008163859-2a5dae08c42b h1:Nz70nzsUXXw2WjuESe7doPFLamYCkuqPr0h4WNULijE= -k8s.io/api v0.0.0-20211008163859-2a5dae08c42b/go.mod h1:uigk499NtRe0ine9Jz9mxVwAjascSPD/Ojn9xYSyB58= -k8s.io/apimachinery v0.0.0-20211012003219-6c3d2b36a98a h1:Fa8/LoJZy1sBTaigz7uy5FFq+UXaAqQMXBwek4HNQpM= -k8s.io/apimachinery v0.0.0-20211012003219-6c3d2b36a98a/go.mod h1:RAdi3McqM+9tkYHOyceb4XOeJWm9BCAF4BhZki5iiok= +k8s.io/api v0.0.0-20211019203412-654d74de91f0 h1:aPbGiomft0NqSaAXFnZtHJ9brK3sDQIWPUe+WSVeE40= +k8s.io/api v0.0.0-20211019203412-654d74de91f0/go.mod h1:gxyLeNmJe8Y6lCAc+Y67T7IE5xJ+y4NcqmlEgxaNebI= +k8s.io/apimachinery v0.0.0-20211015224548-e6c90c4366be h1:yVOgSJyvwB2pSZxoB0z0V/w1OMbxOQLIz1JzoWL1gzQ= +k8s.io/apimachinery v0.0.0-20211015224548-e6c90c4366be/go.mod h1:RAdi3McqM+9tkYHOyceb4XOeJWm9BCAF4BhZki5iiok= k8s.io/cli-runtime v0.0.0-20211001205205-cb123082bee1 h1:GvF0XFIO0Cuu5Ly8vnav4vMtzlWGoA5igAh33tUbDkw= k8s.io/cli-runtime v0.0.0-20211001205205-cb123082bee1/go.mod h1:qYViNs18B5H9dPd0sBerg0p7e5BNc43CFWpK4/etB3Y= -k8s.io/client-go v0.0.0-20211011163815-7697067af710 h1:sjhDoyTtoJBdLy/j7u+ArsUBDo4nPzroR12DTMLxMMA= -k8s.io/client-go v0.0.0-20211011163815-7697067af710/go.mod h1:23ANvvt/Rdu4xgW4A1+kuplABnO2iM26sMSCe0iy4vc= +k8s.io/client-go v0.0.0-20211018123648-fa4ee2502f44 h1:vKQkQlK/eksPaPSQmT8z2YPDGEIBBY92hgX0V29Ww+w= +k8s.io/client-go v0.0.0-20211018123648-fa4ee2502f44/go.mod h1:Hkih1IX+nNdGj3ME4lb2UtqhWBCgnVqjy1Uc/kha8VM= k8s.io/code-generator v0.0.0-20210930223515-ede4574ee351/go.mod h1:pxmv1vqS30f8CieYQvITL/Z2lV5G6+/Ze3wRjS3HXFo= -k8s.io/component-base v0.0.0-20211011003846-8870347bee41 h1:tvTzEXRVIHckQFJX2Ys8uRbVnfnwuCPVlMoamQAyYfo= -k8s.io/component-base v0.0.0-20211011003846-8870347bee41/go.mod h1:YPDB9OvJp4U0ttMfrwtCM8C2I7nx+m74DgAwYcvpFUo= +k8s.io/component-base v0.0.0-20211013203926-a54188b7d648 h1:HtfYz70xLpOb8CKUYmo5gTzOFwn2bfRFsj3VpAlqkNg= +k8s.io/component-base v0.0.0-20211013203926-a54188b7d648/go.mod h1:Cy3Xro/J76rtVI9QVnV5Ry8vAnv8650Xp9Rgedd5bWc= k8s.io/component-helpers v0.0.0-20211007164423-21d2fdede9bf h1:UTAkNKWDfNPryv8gYYaSlLSWRdHVqoQy5dEoj1aFFC8= k8s.io/component-helpers v0.0.0-20211007164423-21d2fdede9bf/go.mod h1:UOhGtwDJlad/eM2Hw8FTUvJ8d6bKEO9OLAfkrvBwGek= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=