From b8cd614122c9977f98583464d48a97d10a3df85b Mon Sep 17 00:00:00 2001 From: Andy Goldstein Date: Wed, 25 Oct 2017 13:18:35 -0400 Subject: [PATCH] Remove Gopkg.toml required/ignores hacks These were for the upgrade from client-go v4.x to v5.x. Signed-off-by: Andy Goldstein --- Gopkg.lock | 2 +- Gopkg.toml | 49 ------------------------------------------------- 2 files changed, 1 insertion(+), 50 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 9eda69ddc6..2c4cd88d27 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -402,6 +402,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "a53b8261d3ecdb48b3417a4e2ff28ddc2588ead8dc9566351db5dab5c2ce53aa" + inputs-digest = "b1876d8890a8b5c78d38481358f801c4491a6e3c1dd923ba8044c3a6551246e5" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index f57a460333..1f596c434f 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -26,57 +26,8 @@ required = [ "k8s.io/code-generator/cmd/defaulter-gen", "k8s.io/code-generator/cmd/lister-gen", "k8s.io/code-generator/cmd/informer-gen", - - # package moves client-go 4.0 to 5.0 - "k8s.io/api/core/v1", - "k8s.io/api/admissionregistration/v1alpha1", - "k8s.io/api/apps/v1beta1", - "k8s.io/api/authentication/v1", - "k8s.io/api/authentication/v1beta1", - "k8s.io/api/authorization/v1", - "k8s.io/api/authorization/v1beta1", - "k8s.io/api/autoscaling/v1", - "k8s.io/api/autoscaling/v2beta1", - "k8s.io/api/batch/v1", - "k8s.io/api/batch/v2alpha1", - "k8s.io/api/certificates/v1beta1", - "k8s.io/api/extensions/v1beta1", - "k8s.io/api/networking/v1", - "k8s.io/api/policy/v1beta1", - "k8s.io/api/rbac/v1alpha1", - "k8s.io/api/rbac/v1beta1", - "k8s.io/api/settings/v1alpha1", - "k8s.io/api/storage/v1", - "k8s.io/api/storage/v1beta1", - "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1", -] - -ignored = [ - "k8s.io/client-go/pkg/api", - "k8s.io/client-go/pkg/api/v1", - "k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1", - "k8s.io/client-go/pkg/apis/apps/v1beta1", - "k8s.io/client-go/pkg/apis/authentication/v1", - "k8s.io/client-go/pkg/apis/authentication/v1beta1", - "k8s.io/client-go/pkg/apis/authorization/v1", - "k8s.io/client-go/pkg/apis/authorization/v1beta1", - "k8s.io/client-go/pkg/apis/autoscaling/v1", - "k8s.io/client-go/pkg/apis/autoscaling/v2alpha1", - "k8s.io/client-go/pkg/apis/batch/v1", - "k8s.io/client-go/pkg/apis/batch/v2alpha1", - "k8s.io/client-go/pkg/apis/certificates/v1beta1", - "k8s.io/client-go/pkg/apis/extensions/v1beta1", - "k8s.io/client-go/pkg/apis/networking/v1", - "k8s.io/client-go/pkg/apis/policy/v1beta1", - "k8s.io/client-go/pkg/apis/rbac/v1alpha1", - "k8s.io/client-go/pkg/apis/rbac/v1beta1", - "k8s.io/client-go/pkg/apis/settings/v1alpha1", - "k8s.io/client-go/pkg/apis/storage/v1", - "k8s.io/client-go/pkg/apis/storage/v1beta1", - "k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1", ] - [[constraint]] name = "cloud.google.com/go" version = "0.11.0"