github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-13 06:04:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40732 from sttts/sttts-update-client-go-2

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 38772, 38797, 40732, 40740)

Sync client-go – third try

Follow-up of https://github.com/kubernetes/kubernetes/pull/40692 & https://github.com/kubernetes/kubernetes/pull/40699.

Approval and lgtm from https://github.com/kubernetes/kubernetes/pull/40692.
This commit is contained in:
Kubernetes Submit Queue
2017-01-31 11:00:49 -08:00
committed by GitHub
parent 1cd06fbcf0 a16843108a
commit e40da1eee9
92 changed files with 2677 additions and 2289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/BUILD
View File

@@ -194,7 +194,6 @@ go_library(
"//vendor:k8s.io/client-go/pkg/api/v1",
"//vendor:k8s.io/client-go/pkg/apis/extensions/v1beta1",
"//vendor:k8s.io/client-go/pkg/apis/policy/v1beta1",
"//vendor:k8s.io/client-go/pkg/util/intstr",
"//vendor:k8s.io/client-go/rest",
"//vendor:k8s.io/client-go/tools/cache",
"//vendor:k8s.io/client-go/transport",

2
test/e2e/disruption.go
View File

@@ -23,12 +23,12 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/pkg/api/v1"
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
policy "k8s.io/client-go/pkg/apis/policy/v1beta1"
"k8s.io/client-go/pkg/util/intstr"
"k8s.io/kubernetes/test/e2e/framework"
)