From cecf3a2e57ffdfa8f3b36db4ee0c44e59ad656e9 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 | 17 ++++++++--------- go.sum | 8 ++++++++ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 4f104ceea..883a731ae 100644 --- a/go.mod +++ b/go.mod @@ -43,10 +43,10 @@ require ( google.golang.org/grpc v1.40.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/square/go-jose.v2 v2.2.2 - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/component-base v0.0.0 + k8s.io/api v0.0.0-20211124232210-4c321cf829a0 + k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a + k8s.io/client-go v0.0.0-20211124232522-ad95a77727e6 + k8s.io/component-base v0.0.0-20211124233101-2083abd532f6 k8s.io/klog/v2 v2.30.0 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b @@ -57,9 +57,8 @@ require ( ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/apiserver => ../apiserver - k8s.io/client-go => ../client-go - k8s.io/component-base => ../component-base + k8s.io/api => k8s.io/api v0.0.0-20211124232210-4c321cf829a0 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a + k8s.io/client-go => k8s.io/client-go v0.0.0-20211124232522-ad95a77727e6 + k8s.io/component-base => k8s.io/component-base v0.0.0-20211124233101-2083abd532f6 ) diff --git a/go.sum b/go.sum index 1cddf3542..c30ce044e 100644 --- a/go.sum +++ b/go.sum @@ -953,6 +953,14 @@ 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/client-go v0.0.0-20211124232522-ad95a77727e6 h1:bK1qYqtrsUEv1H6FoezselTNtfeZfYV9HxTN7J5ghLs= +k8s.io/client-go v0.0.0-20211124232522-ad95a77727e6/go.mod h1:OLO/3PqG5YcMPnn2OALBWiCvW3M/oEuV2hpW/SdUOQE= +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/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=