github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Update client callers to use explicit versions

Browse Source
This commit is contained in:
Jordan Liggitt
2019-02-22 10:27:46 -05:00
parent 93be54b288
commit d1e865ee34
48 changed files with 215 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/certificates/certificate_controller_test.go
View File

@@ -47,7 +47,7 @@ func TestCertificateController(t *testing.T) {
Reason: "test reason",
Message: "test message",
})
_, err := client.Certificates().CertificateSigningRequests().UpdateApproval(csr)
_, err := client.CertificatesV1beta1().CertificateSigningRequests().UpdateApproval(csr)
if err != nil {
return err
}

8
pkg/controller/namespace/deletion/namespaced_resources_deleter_test.go
View File

@@ -66,7 +66,7 @@ func TestFinalizeNamespaceFunc(t *testing.T) {
},
}
d := namespacedResourcesDeleter{
nsClient: mockClient.Core().Namespaces(),
nsClient: mockClient.CoreV1().Namespaces(),
finalizerToken: v1.FinalizerKubernetes,
}
d.finalizeNamespace(testNamespace)
@@ -180,7 +180,7 @@ func testSyncNamespaceThatIsTerminating(t *testing.T, versions *metav1.APIVersio
fn := func() ([]*metav1.APIResourceList, error) {
return resources, nil
}
d := NewNamespacedResourcesDeleter(mockClient.Core().Namespaces(), dynamicClient, mockClient.Core(), fn, v1.FinalizerKubernetes, true)
d := NewNamespacedResourcesDeleter(mockClient.CoreV1().Namespaces(), dynamicClient, mockClient.CoreV1(), fn, v1.FinalizerKubernetes, true)
if err := d.Delete(testInput.testNamespace.Name); err != nil {
t.Errorf("scenario %s - Unexpected error when synching namespace %v", scenario, err)
}
@@ -219,7 +219,7 @@ func TestRetryOnConflictError(t *testing.T) {
}
namespace := &v1.Namespace{}
d := namespacedResourcesDeleter{
nsClient: mockClient.Core().Namespaces(),
nsClient: mockClient.CoreV1().Namespaces(),
}
_, err := d.retryOnConflictError(namespace, retryOnce)
if err != nil {
@@ -255,7 +255,7 @@ func TestSyncNamespaceThatIsActive(t *testing.T) {
fn := func() ([]*metav1.APIResourceList, error) {
return testResources(), nil
}
d := NewNamespacedResourcesDeleter(mockClient.Core().Namespaces(), nil, mockClient.Core(),
d := NewNamespacedResourcesDeleter(mockClient.CoreV1().Namespaces(), nil, mockClient.CoreV1(),
fn, v1.FinalizerKubernetes, true)
err := d.Delete(testNamespace.Name)
if err != nil {

4
pkg/controller/podautoscaler/horizontal_test.go
View File

@@ -665,9 +665,9 @@ func (tc *testCase) setupController(t *testing.T) (*HorizontalController, inform
defaultDownscalestabilizationWindow := 5 * time.Minute
hpaController := NewHorizontalController(
eventClient.Core(),
eventClient.CoreV1(),
testScaleClient,
testClient.Autoscaling(),
testClient.AutoscalingV1(),
testrestmapper.TestOnlyStaticRESTMapper(legacyscheme.Scheme),
metricsClient,
informerFactory.Autoscaling().V1().HorizontalPodAutoscalers(),

4
pkg/controller/podautoscaler/legacy_horizontal_test.go
View File

@@ -494,9 +494,9 @@ func (tc *legacyTestCase) runTest(t *testing.T) {
defaultDownscaleStabilisationWindow := 5 * time.Minute
hpaController := NewHorizontalController(
eventClient.Core(),
eventClient.CoreV1(),
testScaleClient,
testClient.Autoscaling(),
testClient.AutoscalingV1(),
testrestmapper.TestOnlyStaticRESTMapper(legacyscheme.Scheme),
metricsClient,
informerFactory.Autoscaling().V1().HorizontalPodAutoscalers(),

2
pkg/controller/replicaset/replica_set_test.go
View File

@@ -672,7 +672,7 @@ func TestControllerUpdateStatusWithFailure(t *testing.T) {
fakeClient.AddReactor("*", "*", func(action core.Action) (bool, runtime.Object, error) {
return true, &apps.ReplicaSet{}, fmt.Errorf("Fake error")
})
fakeRSClient := fakeClient.Apps().ReplicaSets("default")
fakeRSClient := fakeClient.AppsV1().ReplicaSets("default")
numReplicas := int32(10)
newStatus := apps.ReplicaSetStatus{Replicas: numReplicas}
updateReplicaSetStatus(fakeRSClient, rs, newStatus)

2
pkg/controller/testutil/test_utils.go
View File

@@ -96,7 +96,7 @@ func (m *FakeNodeHandler) GetUpdatedNodesCopy() []*v1.Node {
// Core returns fake CoreInterface.
func (m *FakeNodeHandler) Core() v1core.CoreV1Interface {
return &FakeLegacyHandler{m.Clientset.Core(), m}
return &FakeLegacyHandler{m.Clientset.CoreV1(), m}
}
// CoreV1 returns fake CoreV1Interface

4
pkg/controller/volume/attachdetach/attach_detach_controller_test.go
View File

@@ -156,7 +156,7 @@ func attachDetachRecoveryTestCase(t *testing.T, extraPods1 []*v1.Pod, extraPods2
stopCh := make(chan struct{})
pods, err := fakeKubeClient.Core().Pods(v1.NamespaceAll).List(metav1.ListOptions{})
pods, err := fakeKubeClient.CoreV1().Pods(v1.NamespaceAll).List(metav1.ListOptions{})
if err != nil {
t.Fatalf("Run failed with error. Expected: <no error> Actual: %v", err)
}
@@ -166,7 +166,7 @@ func attachDetachRecoveryTestCase(t *testing.T, extraPods1 []*v1.Pod, extraPods2
podInformer.GetIndexer().Add(&podToAdd)
podsNum++
}
nodes, err := fakeKubeClient.Core().Nodes().List(metav1.ListOptions{})
nodes, err := fakeKubeClient.CoreV1().Nodes().List(metav1.ListOptions{})
if err != nil {
t.Fatalf("Run failed with error. Expected: <no error> Actual: %v", err)
}