mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #110930 from falser101/fix/codeCleanUp
fix:remove Redundant type conversion
This commit is contained in:
commit
c813886dc4
@ -539,7 +539,7 @@ var _ = SIGDescribe("ServerSideApply", func() {
|
|||||||
Resource("deployments").
|
Resource("deployments").
|
||||||
Name("deployment").
|
Name("deployment").
|
||||||
Param("fieldManager", "apply_test").
|
Param("fieldManager", "apply_test").
|
||||||
Body([]byte(obj)).Do(context.TODO()).Get()
|
Body(obj).Do(context.TODO()).Get()
|
||||||
if err == nil {
|
if err == nil {
|
||||||
framework.Failf("Expecting to get conflicts when applying object")
|
framework.Failf("Expecting to get conflicts when applying object")
|
||||||
}
|
}
|
||||||
@ -558,7 +558,7 @@ var _ = SIGDescribe("ServerSideApply", func() {
|
|||||||
Name("deployment").
|
Name("deployment").
|
||||||
Param("force", "true").
|
Param("force", "true").
|
||||||
Param("fieldManager", "apply_test").
|
Param("fieldManager", "apply_test").
|
||||||
Body([]byte(obj)).Do(context.TODO()).Get()
|
Body(obj).Do(context.TODO()).Get()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
framework.Failf("Failed to apply object with force: %v", err)
|
framework.Failf("Failed to apply object with force: %v", err)
|
||||||
}
|
}
|
||||||
|
@ -737,7 +737,7 @@ var _ = SIGDescribe("Garbage collector", func() {
|
|||||||
rcClient := clientSet.CoreV1().ReplicationControllers(f.Namespace.Name)
|
rcClient := clientSet.CoreV1().ReplicationControllers(f.Namespace.Name)
|
||||||
podClient := clientSet.CoreV1().Pods(f.Namespace.Name)
|
podClient := clientSet.CoreV1().Pods(f.Namespace.Name)
|
||||||
rc1Name := "simpletest-rc-to-be-deleted"
|
rc1Name := "simpletest-rc-to-be-deleted"
|
||||||
replicas := int32(estimateMaximumPods(clientSet, 10, 100))
|
replicas := estimateMaximumPods(clientSet, 10, 100)
|
||||||
halfReplicas := int(replicas / 2)
|
halfReplicas := int(replicas / 2)
|
||||||
uniqLabelsDeleted := getUniqLabel("gctest_d", "valid_and_pending_owners_d")
|
uniqLabelsDeleted := getUniqLabel("gctest_d", "valid_and_pending_owners_d")
|
||||||
rc1 := newOwnerRC(f, rc1Name, replicas, uniqLabelsDeleted)
|
rc1 := newOwnerRC(f, rc1Name, replicas, uniqLabelsDeleted)
|
||||||
|
@ -56,7 +56,7 @@ func extinguish(f *framework.Framework, totalNS int, maxAllowedAfterDel int, max
|
|||||||
|
|
||||||
//Wait 10 seconds, then SEND delete requests for all the namespaces.
|
//Wait 10 seconds, then SEND delete requests for all the namespaces.
|
||||||
ginkgo.By("Waiting 10 seconds")
|
ginkgo.By("Waiting 10 seconds")
|
||||||
time.Sleep(time.Duration(10 * time.Second))
|
time.Sleep(10 * time.Second)
|
||||||
deleteFilter := []string{"nslifetest"}
|
deleteFilter := []string{"nslifetest"}
|
||||||
deleted, err := framework.DeleteNamespaces(f.ClientSet, deleteFilter, nil /* skipFilter */)
|
deleted, err := framework.DeleteNamespaces(f.ClientSet, deleteFilter, nil /* skipFilter */)
|
||||||
framework.ExpectNoError(err, "failed to delete namespace(s) containing: %s", deleteFilter)
|
framework.ExpectNoError(err, "failed to delete namespace(s) containing: %s", deleteFilter)
|
||||||
@ -273,7 +273,7 @@ var _ = SIGDescribe("Namespaces [Serial]", func() {
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
framework.ExpectNoError(err, "failed to marshal JSON patch data")
|
framework.ExpectNoError(err, "failed to marshal JSON patch data")
|
||||||
_, err = f.ClientSet.CoreV1().Namespaces().Patch(context.TODO(), namespaceName, types.StrategicMergePatchType, []byte(nspatch), metav1.PatchOptions{})
|
_, err = f.ClientSet.CoreV1().Namespaces().Patch(context.TODO(), namespaceName, types.StrategicMergePatchType, nspatch, metav1.PatchOptions{})
|
||||||
framework.ExpectNoError(err, "failed to patch Namespace")
|
framework.ExpectNoError(err, "failed to patch Namespace")
|
||||||
|
|
||||||
ginkgo.By("get the Namespace and ensuring it has the label")
|
ginkgo.By("get the Namespace and ensuring it has the label")
|
||||||
|
Loading…
Reference in New Issue
Block a user