github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

generated: run refactor

Browse Source
This commit is contained in:
Mike Danese
2020-02-08 12:30:21 -05:00
parent 6c274ea72d
commit 25651408ae
399 changed files with 1560 additions and 1507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/integration/garbagecollector/cluster_scoped_owner_test.go
View File

@@ -82,7 +82,7 @@ func TestClusterScopedOwners(t *testing.T) {
Capacity: v1.ResourceList{v1.ResourceStorage: resource.MustParse("1Gi")},
AccessModes: []v1.PersistentVolumeAccessMode{v1.ReadWriteMany},
},
})
}, metav1.CreateOptions{})
if err != nil {
t.Fatal(err)
}
@@ -91,7 +91,7 @@ func TestClusterScopedOwners(t *testing.T) {
Name: "cm-valid",
OwnerReferences: []metav1.OwnerReference{{Kind: "PersistentVolume", APIVersion: "v1", Name: pv.Name, UID: pv.UID}},
},
}); err != nil {
}, metav1.CreateOptions{}); err != nil {
t.Fatal(err)
}
@@ -102,7 +102,7 @@ func TestClusterScopedOwners(t *testing.T) {
Labels: map[string]string{"missing": "true"},
OwnerReferences: []metav1.OwnerReference{{Kind: "PersistentVolume", APIVersion: "v1", Name: "missing-name", UID: types.UID("missing-uid")}},
},
}); err != nil {
}, metav1.CreateOptions{}); err != nil {
t.Fatal(err)
}
@@ -112,7 +112,7 @@ func TestClusterScopedOwners(t *testing.T) {
Name: "cm-invalid",
OwnerReferences: []metav1.OwnerReference{{Kind: "UnknownType", APIVersion: "unknown.group/v1", Name: "invalid-name", UID: types.UID("invalid-uid")}},
},
}); err != nil {
}, metav1.CreateOptions{}); err != nil {
t.Fatal(err)
}

50
test/integration/garbagecollector/garbage_collector_test.go
View File

@@ -293,14 +293,14 @@ func setupWithServer(t *testing.T, result *kubeapiservertesting.TestServer, work
func createNamespaceOrDie(name string, c clientset.Interface, t *testing.T) *v1.Namespace {
ns := &v1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: name}}
if _, err := c.CoreV1().Namespaces().Create(context.TODO(), ns); err != nil {
if _, err := c.CoreV1().Namespaces().Create(context.TODO(), ns, metav1.CreateOptions{}); err != nil {
t.Fatalf("failed to create namespace: %v", err)
}
falseVar := false
_, err := c.CoreV1().ServiceAccounts(ns.Name).Create(context.TODO(), &v1.ServiceAccount{
ObjectMeta: metav1.ObjectMeta{Name: "default"},
AutomountServiceAccountToken: &falseVar,
})
}, metav1.CreateOptions{})
if err != nil {
t.Fatalf("failed to create service account: %v", err)
}
@@ -329,11 +329,11 @@ func TestCascadingDeletion(t *testing.T) {
rcClient := clientSet.CoreV1().ReplicationControllers(ns.Name)
podClient := clientSet.CoreV1().Pods(ns.Name)
toBeDeletedRC, err := rcClient.Create(context.TODO(), newOwnerRC(toBeDeletedRCName, ns.Name))
toBeDeletedRC, err := rcClient.Create(context.TODO(), newOwnerRC(toBeDeletedRCName, ns.Name), metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create replication controller: %v", err)
}
remainingRC, err := rcClient.Create(context.TODO(), newOwnerRC(remainingRCName, ns.Name))
remainingRC, err := rcClient.Create(context.TODO(), newOwnerRC(remainingRCName, ns.Name), metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create replication controller: %v", err)
}
@@ -348,7 +348,7 @@ func TestCascadingDeletion(t *testing.T) {
// this pod should be cascadingly deleted.
pod := newPod(garbageCollectedPodName, ns.Name, []metav1.OwnerReference{{UID: toBeDeletedRC.ObjectMeta.UID, Name: toBeDeletedRCName}})
_, err = podClient.Create(context.TODO(), pod)
_, err = podClient.Create(context.TODO(), pod, metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create Pod: %v", err)
}
@@ -358,14 +358,14 @@ func TestCascadingDeletion(t *testing.T) {
{UID: toBeDeletedRC.ObjectMeta.UID, Name: toBeDeletedRCName},
{UID: remainingRC.ObjectMeta.UID, Name: remainingRCName},
})
_, err = podClient.Create(context.TODO(), pod)
_, err = podClient.Create(context.TODO(), pod, metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create Pod: %v", err)
}
// this pod shouldn't be cascadingly deleted, because it doesn't have an owner.
pod = newPod(independentPodName, ns.Name, []metav1.OwnerReference{})
_, err = podClient.Create(context.TODO(), pod)
_, err = podClient.Create(context.TODO(), pod, metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create Pod: %v", err)
}
@@ -416,7 +416,7 @@ func TestCreateWithNonExistentOwner(t *testing.T) {
podClient := clientSet.CoreV1().Pods(ns.Name)
pod := newPod(garbageCollectedPodName, ns.Name, []metav1.OwnerReference{{UID: "doesn't matter", Name: toBeDeletedRCName}})
_, err := podClient.Create(context.TODO(), pod)
_, err := podClient.Create(context.TODO(), pod, metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create Pod: %v", err)
}
@@ -443,7 +443,7 @@ func setupRCsPods(t *testing.T, gc *garbagecollector.GarbageCollector, clientSet
rcName := "test.rc." + nameSuffix
rc := newOwnerRC(rcName, namespace)
rc.ObjectMeta.Finalizers = initialFinalizers
rc, err := rcClient.Create(context.TODO(), rc)
rc, err := rcClient.Create(context.TODO(), rc, metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create replication controller: %v", err)
}
@@ -453,7 +453,7 @@ func setupRCsPods(t *testing.T, gc *garbagecollector.GarbageCollector, clientSet
for j := 0; j < 3; j++ {
podName := "test.pod." + nameSuffix + "-" + strconv.Itoa(j)
pod := newPod(podName, namespace, []metav1.OwnerReference{{UID: rc.ObjectMeta.UID, Name: rc.ObjectMeta.Name}})
createdPod, err := podClient.Create(context.TODO(), pod)
createdPod, err := podClient.Create(context.TODO(), pod, metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create Pod: %v", err)
}
@@ -594,7 +594,7 @@ func TestOrphaning(t *testing.T) {
rcClient := clientSet.CoreV1().ReplicationControllers(ns.Name)
// create the RC with the orphan finalizer set
toBeDeletedRC := newOwnerRC(toBeDeletedRCName, ns.Name)
toBeDeletedRC, err := rcClient.Create(context.TODO(), toBeDeletedRC)
toBeDeletedRC, err := rcClient.Create(context.TODO(), toBeDeletedRC, metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create replication controller: %v", err)
}
@@ -605,7 +605,7 @@ func TestOrphaning(t *testing.T) {
for i := 0; i < podsNum; i++ {
podName := garbageCollectedPodName + strconv.Itoa(i)
pod := newPod(podName, ns.Name, []metav1.OwnerReference{{UID: toBeDeletedRC.ObjectMeta.UID, Name: toBeDeletedRCName}})
createdPod, err := podClient.Create(context.TODO(), pod)
createdPod, err := podClient.Create(context.TODO(), pod, metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create Pod: %v", err)
}
@@ -673,11 +673,11 @@ func TestSolidOwnerDoesNotBlockWaitingOwner(t *testing.T) {
podClient := clientSet.CoreV1().Pods(ns.Name)
rcClient := clientSet.CoreV1().ReplicationControllers(ns.Name)
// create the RC with the orphan finalizer set
toBeDeletedRC, err := rcClient.Create(context.TODO(), newOwnerRC(toBeDeletedRCName, ns.Name))
toBeDeletedRC, err := rcClient.Create(context.TODO(), newOwnerRC(toBeDeletedRCName, ns.Name), metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create replication controller: %v", err)
}
remainingRC, err := rcClient.Create(context.TODO(), newOwnerRC(remainingRCName, ns.Name))
remainingRC, err := rcClient.Create(context.TODO(), newOwnerRC(remainingRCName, ns.Name), metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create replication controller: %v", err)
}
@@ -686,7 +686,7 @@ func TestSolidOwnerDoesNotBlockWaitingOwner(t *testing.T) {
{UID: toBeDeletedRC.ObjectMeta.UID, Name: toBeDeletedRC.Name, BlockOwnerDeletion: &trueVar},
{UID: remainingRC.ObjectMeta.UID, Name: remainingRC.Name},
})
_, err = podClient.Create(context.TODO(), pod)
_, err = podClient.Create(context.TODO(), pod, metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create Pod: %v", err)
}
@@ -733,7 +733,7 @@ func TestNonBlockingOwnerRefDoesNotBlock(t *testing.T) {
podClient := clientSet.CoreV1().Pods(ns.Name)
rcClient := clientSet.CoreV1().ReplicationControllers(ns.Name)
// create the RC with the orphan finalizer set
toBeDeletedRC, err := rcClient.Create(context.TODO(), newOwnerRC(toBeDeletedRCName, ns.Name))
toBeDeletedRC, err := rcClient.Create(context.TODO(), newOwnerRC(toBeDeletedRCName, ns.Name), metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create replication controller: %v", err)
}
@@ -750,11 +750,11 @@ func TestNonBlockingOwnerRefDoesNotBlock(t *testing.T) {
})
// adding finalizer that no controller handles, so that the pod won't be deleted
pod2.ObjectMeta.Finalizers = []string{"x/y"}
_, err = podClient.Create(context.TODO(), pod1)
_, err = podClient.Create(context.TODO(), pod1, metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create Pod: %v", err)
}
_, err = podClient.Create(context.TODO(), pod2)
_, err = podClient.Create(context.TODO(), pod2, metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create Pod: %v", err)
}
@@ -799,7 +799,7 @@ func TestDoubleDeletionWithFinalizer(t *testing.T) {
podClient := clientSet.CoreV1().Pods(ns.Name)
pod := newPod("lucy", ns.Name, nil)
pod.ObjectMeta.Finalizers = []string{"x/y"}
if _, err := podClient.Create(context.TODO(), pod); err != nil {
if _, err := podClient.Create(context.TODO(), pod, metav1.CreateOptions{}); err != nil {
t.Fatalf("Failed to create pod: %v", err)
}
if err := podClient.Delete(context.TODO(), pod.Name, getForegroundOptions()); err != nil {
@@ -839,7 +839,7 @@ func TestDoubleDeletionWithFinalizer(t *testing.T) {
// step 3: removes the custom finalizer and checks if the pod was removed
patch := []byte(`[{"op":"remove","path":"/metadata/finalizers"}]`)
if _, err := podClient.Patch(context.TODO(), pod.Name, types.JSONPatchType, patch); err != nil {
if _, err := podClient.Patch(context.TODO(), pod.Name, types.JSONPatchType, patch, metav1.PatchOptions{}); err != nil {
t.Fatalf("Failed to update pod: %v", err)
}
if err := wait.Poll(1*time.Second, 10*time.Second, func() (bool, error) {
@@ -861,7 +861,7 @@ func TestBlockingOwnerRefDoesBlock(t *testing.T) {
podClient := clientSet.CoreV1().Pods(ns.Name)
rcClient := clientSet.CoreV1().ReplicationControllers(ns.Name)
// create the RC with the orphan finalizer set
toBeDeletedRC, err := rcClient.Create(context.TODO(), newOwnerRC(toBeDeletedRCName, ns.Name))
toBeDeletedRC, err := rcClient.Create(context.TODO(), newOwnerRC(toBeDeletedRCName, ns.Name), metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create replication controller: %v", err)
}
@@ -871,7 +871,7 @@ func TestBlockingOwnerRefDoesBlock(t *testing.T) {
})
// adding finalizer that no controller handles, so that the pod won't be deleted
pod.ObjectMeta.Finalizers = []string{"x/y"}
_, err = podClient.Create(context.TODO(), pod)
_, err = podClient.Create(context.TODO(), pod, metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create Pod: %v", err)
}
@@ -995,14 +995,14 @@ func TestMixedRelationships(t *testing.T) {
// Create a core dependent resource.
coreDependent := newConfigMap(ns.Name, names.SimpleNameGenerator.GenerateName("dependent"))
link(t, customOwner, coreDependent)
coreDependent, err = configMapClient.Create(context.TODO(), coreDependent)
coreDependent, err = configMapClient.Create(context.TODO(), coreDependent, metav1.CreateOptions{})
if err != nil {
t.Fatalf("failed to create dependent: %v", err)
}
t.Logf("created core dependent %q", coreDependent.GetName())
// Create a core owner resource.
coreOwner, err := configMapClient.Create(context.TODO(), newConfigMap(ns.Name, names.SimpleNameGenerator.GenerateName("owner")))
coreOwner, err := configMapClient.Create(context.TODO(), newConfigMap(ns.Name, names.SimpleNameGenerator.GenerateName("owner")), metav1.CreateOptions{})
if err != nil {
t.Fatalf("failed to create owner: %v", err)
}
@@ -1108,7 +1108,7 @@ func testCRDDeletion(t *testing.T, ctx *testContext, ns *v1.Namespace, definitio
// Create a core dependent resource.
dependent := newConfigMap(ns.Name, names.SimpleNameGenerator.GenerateName("dependent"))
link(t, owner, dependent)
dependent, err = configMapClient.Create(context.TODO(), dependent)
dependent, err = configMapClient.Create(context.TODO(), dependent, metav1.CreateOptions{})
if err != nil {
t.Fatalf("failed to create dependent: %v", err)
}