From 6f8905ae4ee5dc070f19155b8f24c3fcfa021834 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 31 Jul 2019 05:28:47 -0700 Subject: [PATCH] Merge pull request #80732 from cblecker/fix-tag-protobuf Fix tag for gogo/protobuf Kubernetes-commit: d8900caac8aef61e79ca921a7922d95ae06b16f2 --- Godeps/Godeps.json | 10 +++++----- go.mod | 17 ++++++++--------- go.sum | 4 ++++ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 95716df7..f86d32b5 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -80,7 +80,7 @@ }, { "ImportPath": "github.com/gogo/protobuf", - "Rev": "v0.0.0-20190410021324-65acae22fc9" + "Rev": "65acae22fc9d" }, { "ImportPath": "github.com/golang/groupcache", @@ -288,19 +288,19 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "69e1bce1dad5" + "Rev": "739c7f7721ed" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "641a75999153" + "Rev": "035e418f1ad9" }, { "ImportPath": "k8s.io/client-go", - "Rev": "a9c895e7f2ac" + "Rev": "de47f833b8db" }, { "ImportPath": "k8s.io/code-generator", - "Rev": "14ba7d03f06f" + "Rev": "68819053f471" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 61143ffa..9a33317a 100644 --- a/go.mod +++ b/go.mod @@ -5,10 +5,10 @@ module k8s.io/sample-controller go 1.12 require ( - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/code-generator v0.0.0 + k8s.io/api v0.0.0-20190731142925-739c7f7721ed + k8s.io/apimachinery v0.0.0-20190731142807-035e418f1ad9 + k8s.io/client-go v0.0.0-20190731143132-de47f833b8db + k8s.io/code-generator v0.0.0-20190731142644-68819053f471 k8s.io/klog v0.3.1 ) @@ -19,9 +19,8 @@ replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go - k8s.io/code-generator => ../code-generator - k8s.io/sample-controller => ../sample-controller + k8s.io/api => k8s.io/api v0.0.0-20190731142925-739c7f7721ed + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190731142807-035e418f1ad9 + k8s.io/client-go => k8s.io/client-go v0.0.0-20190731143132-de47f833b8db + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190731142644-68819053f471 ) diff --git a/go.sum b/go.sum index 35a468a1..b83dbbab 100644 --- a/go.sum +++ b/go.sum @@ -138,6 +138,10 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +k8s.io/api v0.0.0-20190731142925-739c7f7721ed/go.mod h1:1KBIEXI7qpsZM6s0w+RthBLGH1IYg7JQlerAl+wN1lw= +k8s.io/apimachinery v0.0.0-20190731142807-035e418f1ad9/go.mod h1:+ntn62igV2hyNj7/0brOvXSMONE2KxcePkSxK7/9FFQ= +k8s.io/client-go v0.0.0-20190731143132-de47f833b8db/go.mod h1:okI7n8hrqjq964OCm2/3osHOsMLC4GEA+cbc/Fgey34= +k8s.io/code-generator v0.0.0-20190731142644-68819053f471/go.mod h1:+ehOMJCZcDSNlbNnRAoe9wNEPwf0h03MUOmDkq6J1FE= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk= 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=