From eb4e15dcfaf20b4ac89a5f4292cd25d03b53effa Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 24 Nov 2021 13:37:31 -0800 Subject: [PATCH] Merge pull request #106660 from liggitt/smd-merge Revert sigs.k8s.io/structured-merge-diff/v4 to v4.1.2 Kubernetes-commit: aff056d8a197f6a404ad5e02210ca662d16c3dbe --- go.mod | 31 +++++++++++++++---------------- go.sum | 15 +++++++++++++++ 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index d25e81a1..3d43c4d9 100644 --- a/go.mod +++ b/go.mod @@ -31,15 +31,15 @@ require ( github.com/stretchr/testify v1.7.0 golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/cli-runtime v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/component-base v0.0.0 - k8s.io/component-helpers v0.0.0 + k8s.io/api v0.0.0-20211124232210-4c321cf829a0 + k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a + k8s.io/cli-runtime v0.0.0-20211124234728-b1888efacd4b + k8s.io/client-go v0.0.0-20211203090723-1218545a5b5b + k8s.io/component-base v0.0.0-20211124233101-2083abd532f6 + k8s.io/component-helpers v0.0.0-20211124233219-ca823cbe37b0 k8s.io/klog/v2 v2.30.0 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 - k8s.io/metrics v0.0.0 + k8s.io/metrics v0.0.0-20211124234608-421ba00d7d2e k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b sigs.k8s.io/kustomize/kustomize/v4 v4.4.1 sigs.k8s.io/kustomize/kyaml v0.13.0 @@ -47,13 +47,12 @@ require ( ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/cli-runtime => ../cli-runtime - k8s.io/client-go => ../client-go - k8s.io/code-generator => ../code-generator - k8s.io/component-base => ../component-base - k8s.io/component-helpers => ../component-helpers - k8s.io/kubectl => ../kubectl - k8s.io/metrics => ../metrics + k8s.io/api => k8s.io/api v0.0.0-20211124232210-4c321cf829a0 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20211124234728-b1888efacd4b + k8s.io/client-go => k8s.io/client-go v0.0.0-20211203090723-1218545a5b5b + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211124231748-1685c0469510 + k8s.io/component-base => k8s.io/component-base v0.0.0-20211124233101-2083abd532f6 + k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211124233219-ca823cbe37b0 + k8s.io/metrics => k8s.io/metrics v0.0.0-20211124234608-421ba00d7d2e ) diff --git a/go.sum b/go.sum index b2e21436..cb4330d7 100644 --- a/go.sum +++ b/go.sum @@ -911,6 +911,19 @@ 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-20211124232210-4c321cf829a0 h1:hTJnV20bAHUQZIzigjK3CvWqQuzeQP/C7AP72fzzEIo= +k8s.io/api v0.0.0-20211124232210-4c321cf829a0/go.mod h1:Iod80qmyxDiUr9X93OyKup/yGuYZGx8VK8nLuWpK9Yc= +k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a h1:IggksFfccO+DgJNByne5JOJ+jfqpcMZRsYkwYGZ6qkA= +k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc= +k8s.io/cli-runtime v0.0.0-20211124234728-b1888efacd4b h1:glNu/1pfat4eaMTf7o12uEDscLOBTpF6OPVtizG4QBk= +k8s.io/cli-runtime v0.0.0-20211124234728-b1888efacd4b/go.mod h1:d+doVIDT01I6lZ+zgMVjJO8hF7Kb1wryqt1eaF/ZHys= +k8s.io/client-go v0.0.0-20211203090723-1218545a5b5b h1:FY6fE4J9DKfN41CpuTMtb3mW81hKe9lW421HkI0Hfss= +k8s.io/client-go v0.0.0-20211203090723-1218545a5b5b/go.mod h1:OLO/3PqG5YcMPnn2OALBWiCvW3M/oEuV2hpW/SdUOQE= +k8s.io/code-generator v0.0.0-20211124231748-1685c0469510/go.mod h1:vQvOhDXhuzqiVfM/YHp+dmg10WDZCchJVObc9MvowsE= +k8s.io/component-base v0.0.0-20211124233101-2083abd532f6 h1:KNhcuiqzpRezT0T4DEHMn+z66atapTnrtI5abzZOC9g= +k8s.io/component-base v0.0.0-20211124233101-2083abd532f6/go.mod h1:inaqiw5wlT5ehYnh4g7i4YyyxIVUDQJ6BzoQplWtc2A= +k8s.io/component-helpers v0.0.0-20211124233219-ca823cbe37b0 h1:VSNak52u69KwI6xdD1txhODgcVo/G4H76A3vn1YDex0= +k8s.io/component-helpers v0.0.0-20211124233219-ca823cbe37b0/go.mod h1:xzjFvbww9k3g+l38ZqevXEW4cmHNm8lWrhg1CWaSFnc= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= @@ -920,6 +933,8 @@ k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= +k8s.io/metrics v0.0.0-20211124234608-421ba00d7d2e h1:jwE891fvaGOX2em1ynkigdXsL42cTVzEprcp4MUQaGU= +k8s.io/metrics v0.0.0-20211124234608-421ba00d7d2e/go.mod h1:J95X63DMYuAXz0luPsQ4lAdpy/QxMKR/o3L8jHaPjaA= 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=