This commit is contained in:
Alex Collins 2019-03-26 15:35:32 -07:00 committed by GitHub
parent 7d3b6cc8e0
commit 102c24cc29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 14 deletions

10
Gopkg.lock generated
View file

@ -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",

View file

@ -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"

View file

@ -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"