From 102c24cc294f3700911ff37a24367e6e3554ea63 Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Tue, 26 Mar 2019 15:35:32 -0700 Subject: [PATCH] Fixs deps (#1325) --- Gopkg.lock | 10 +--------- Gopkg.toml | 4 ---- test/e2e/fixture.go | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 9eaa6457bd..e30a4eba90 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1262,14 +1262,7 @@ branch = "release-1.12" digest = "1:39be82077450762b5e14b5268e679a14ac0e9c7d3286e2fcface437556a29e4c" name = "k8s.io/apiextensions-apiserver" - packages = [ - "pkg/apis/apiextensions", - "pkg/apis/apiextensions/v1beta1", - "pkg/client/clientset/clientset", - "pkg/client/clientset/clientset/scheme", - "pkg/client/clientset/clientset/typed/apiextensions/v1beta1", - "pkg/features", - ] + packages = ["pkg/features"] pruneopts = "" revision = "ca1024863b48cf0701229109df75ac5f0bb4907e" @@ -1624,7 +1617,6 @@ "k8s.io/api/core/v1", "k8s.io/api/extensions/v1beta1", "k8s.io/api/rbac/v1", - "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset", "k8s.io/apimachinery/pkg/api/equality", "k8s.io/apimachinery/pkg/api/errors", "k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/Gopkg.toml b/Gopkg.toml index 2366b5f27b..3057f50b21 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -38,10 +38,6 @@ required = [ branch = "release-1.12" name = "k8s.io/api" -[[constraint]] - name = "k8s.io/apiextensions-apiserver" - branch = "release-1.12" - [[constraint]] branch = "release-1.12" name = "k8s.io/code-generator" diff --git a/test/e2e/fixture.go b/test/e2e/fixture.go index 2a21b0927e..be60820445 100644 --- a/test/e2e/fixture.go +++ b/test/e2e/fixture.go @@ -20,7 +20,7 @@ import ( grpc_util "github.com/argoproj/argo-cd/util/grpc" argoexec "github.com/argoproj/pkg/exec" - "github.com/prometheus/common/log" + log "github.com/sirupsen/logrus" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"