From 97163051499919518ecdf3faa853ff61b3ef86a2 Mon Sep 17 00:00:00 2001 From: Antoine Pelisse Date: Thu, 15 Apr 2021 20:53:19 -0700 Subject: [PATCH] Pin sigs.k8s.io/structured-merged-diff/v3 at v3.0.1 Kubernetes-commit: ecb1af7cce27dc31bc8a47a5fd5cf83fe7dac9c4 --- go.mod | 13 +++++++------ go.sum | 8 ++------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index a5eab45..05d31ff 100644 --- a/go.mod +++ b/go.mod @@ -5,16 +5,17 @@ module k8s.io/kube-controller-manager go 1.13 require ( - k8s.io/apimachinery v0.0.0-20210329191935-937f6a48eb33 - k8s.io/component-base v0.0.0-20210329195147-7c1e350c3797 + k8s.io/apimachinery v0.0.0 + k8s.io/component-base v0.0.0 ) replace ( golang.org/x/crypto => golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 golang.org/x/text => golang.org/x/text v0.3.2 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 - k8s.io/api => k8s.io/api v0.0.0-20210329192540-b13e135d81e8 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210329191935-937f6a48eb33 - k8s.io/client-go => k8s.io/client-go v0.0.0-20210329193311-08715c7129b4 - k8s.io/component-base => k8s.io/component-base v0.0.0-20210329195147-7c1e350c3797 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go + k8s.io/component-base => ../component-base + k8s.io/kube-controller-manager => ../kube-controller-manager ) diff --git a/go.sum b/go.sum index b7ccceb..93ff973 100644 --- a/go.sum +++ b/go.sum @@ -185,10 +185,6 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.0.0-20210329192540-b13e135d81e8/go.mod h1:ZRAcQsPNk4gU8YxE+gQW1OqoeF96zqlXAEnLGsIcnOQ= -k8s.io/apimachinery v0.0.0-20210329191935-937f6a48eb33/go.mod h1:z3HWT24PKvOWfgF+z68R7+Jj761mphku1J34CGG9NDc= -k8s.io/client-go v0.0.0-20210329193311-08715c7129b4/go.mod h1:PYFn5dTdx4qG2kLG9aY4Wy855Nag9HcbU6HyhBep+aU= -k8s.io/component-base v0.0.0-20210329195147-7c1e350c3797/go.mod h1:T23522vweo61fjMl1MsN8Gy1HerR+Z97eovY6rriHYc= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= @@ -198,8 +194,8 @@ k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= -sigs.k8s.io/structured-merge-diff/v3 v3.0.0 h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJYFZUiaOp8E= -sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= +sigs.k8s.io/structured-merge-diff/v3 v3.0.1 h1:ISORLGKzslMY5RWkCSGNy5uDb3OHyEkGEhuSATvSp3A= +sigs.k8s.io/structured-merge-diff/v3 v3.0.1/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=